From 5c0be0af8090839588c04ffdba8fd5d75321126c Mon Sep 17 00:00:00 2001
From: Scott Garman <scott.a.garman@intel.com>
Date: Wed, 14 Mar 2012 17:14:43 -0700
Subject: [PATCH] base-passwd: upgrade to 3.5.24

Includes minor formatting cleanups.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../nobash.patch                                 |  0
 .../root-home.patch                              |  0
 ...se-passwd_3.5.22.bb => base-passwd_3.5.24.bb} | 16 ++++++++--------
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename meta/recipes-core/base-passwd/{base-passwd-3.5.22 => base-passwd-3.5.24}/nobash.patch (100%)
 rename meta/recipes-core/base-passwd/{base-passwd-3.5.22 => base-passwd-3.5.24}/root-home.patch (100%)
 rename meta/recipes-core/base-passwd/{base-passwd_3.5.22.bb => base-passwd_3.5.24.bb} (95%)

diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.24/nobash.patch
similarity index 100%
rename from meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch
rename to meta/recipes-core/base-passwd/base-passwd-3.5.24/nobash.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.24/root-home.patch
similarity index 100%
rename from meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch
rename to meta/recipes-core/base-passwd/base-passwd-3.5.24/root-home.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb
similarity index 95%
rename from meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
rename to meta/recipes-core/base-passwd/base-passwd_3.5.24.bb
index ae3864c0a6..6eeee5cd5b 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Base system master password/group files."
 DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group).  The update-passwd tool is also provided to keep the system databases synchronized with these master files."
 SECTION = "base"
-PR = "r9"
+PR = "r0"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
@@ -9,18 +9,13 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
            file://nobash.patch \
            file://root-home.patch"
 
-SRC_URI[md5sum] = "47f22ab6b572d0133409ff6ad1fab402"
-SRC_URI[sha256sum] = "d34acb35a9f9f221e7e4f642b9ef4b22083dd77bb2fc7216756f445316d842fc"
+SRC_URI[md5sum] = "8f6b9420c50e90edaff41eb2fb7e9e16"
+SRC_URI[sha256sum] = "196083d6f675190d4e2cede0a5fa6b3c91088705c5386f76292fec8e74b6369e"
 
 S = "${WORKDIR}/base-passwd"
 
 inherit autotools
 
-PACKAGES =+ "${PN}-update"
-FILES_${PN}-update = "${sbindir}/* ${datadir}/${PN}"
-
-ALLOW_EMPTY_${PN} = "1"
-
 SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst"
 
 do_install () {
@@ -85,6 +80,11 @@ fi
 
 addtask do_package after do_populate_sysroot
 
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGES =+ "${PN}-update"
+FILES_${PN}-update = "${sbindir}/* ${datadir}/${PN}"
+
 pkg_postinst_${PN}-update () {
 #!/bin/sh
 if [ -n "$D" ]; then
-- 
2.40.1