diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-03-14 17:14:43 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-19 14:37:45 +0000 |
commit | 2a7afb661a45ea4f557059eaaad3f91682970477 (patch) | |
tree | 94c1a32f15d2d736a3b2a38e6ea9853a3feb83f1 /meta/recipes-core | |
parent | 35c4c79fa423715c8aaf9a6db0f18bee700af457 (diff) | |
download | poky-2a7afb661a45ea4f557059eaaad3f91682970477.tar.gz |
base-passwd: upgrade to 3.5.24
Includes minor formatting cleanups.
(From OE-Core rev: 5c0be0af8090839588c04ffdba8fd5d75321126c)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd-3.5.24/nobash.patch (renamed from meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd-3.5.24/root-home.patch (renamed from meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.5.24.bb (renamed from meta/recipes-core/base-passwd/base-passwd_3.5.22.bb) | 16 |
3 files changed, 8 insertions, 8 deletions
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 index 6371576440..6371576440 100644 --- 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 | |||
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 index eab77f124f..eab77f124f 100644 --- 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 | |||
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 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 @@ | |||
1 | SUMMARY = "Base system master password/group files." | 1 | SUMMARY = "Base system master password/group files." |
2 | 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." | 2 | 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." |
3 | SECTION = "base" | 3 | SECTION = "base" |
4 | PR = "r9" | 4 | PR = "r0" |
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" |
7 | 7 | ||
@@ -9,18 +9,13 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ | |||
9 | file://nobash.patch \ | 9 | file://nobash.patch \ |
10 | file://root-home.patch" | 10 | file://root-home.patch" |
11 | 11 | ||
12 | SRC_URI[md5sum] = "47f22ab6b572d0133409ff6ad1fab402" | 12 | SRC_URI[md5sum] = "8f6b9420c50e90edaff41eb2fb7e9e16" |
13 | SRC_URI[sha256sum] = "d34acb35a9f9f221e7e4f642b9ef4b22083dd77bb2fc7216756f445316d842fc" | 13 | SRC_URI[sha256sum] = "196083d6f675190d4e2cede0a5fa6b3c91088705c5386f76292fec8e74b6369e" |
14 | 14 | ||
15 | S = "${WORKDIR}/base-passwd" | 15 | S = "${WORKDIR}/base-passwd" |
16 | 16 | ||
17 | inherit autotools | 17 | inherit autotools |
18 | 18 | ||
19 | PACKAGES =+ "${PN}-update" | ||
20 | FILES_${PN}-update = "${sbindir}/* ${datadir}/${PN}" | ||
21 | |||
22 | ALLOW_EMPTY_${PN} = "1" | ||
23 | |||
24 | SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst" | 19 | SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst" |
25 | 20 | ||
26 | do_install () { | 21 | do_install () { |
@@ -85,6 +80,11 @@ fi | |||
85 | 80 | ||
86 | addtask do_package after do_populate_sysroot | 81 | addtask do_package after do_populate_sysroot |
87 | 82 | ||
83 | ALLOW_EMPTY_${PN} = "1" | ||
84 | |||
85 | PACKAGES =+ "${PN}-update" | ||
86 | FILES_${PN}-update = "${sbindir}/* ${datadir}/${PN}" | ||
87 | |||
88 | pkg_postinst_${PN}-update () { | 88 | pkg_postinst_${PN}-update () { |
89 | #!/bin/sh | 89 | #!/bin/sh |
90 | if [ -n "$D" ]; then | 90 | if [ -n "$D" ]; then |