From 5c0be0af8090839588c04ffdba8fd5d75321126c Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Wed, 14 Mar 2012 17:14:43 -0700 Subject: base-passwd: upgrade to 3.5.24 Includes minor formatting cleanups. Signed-off-by: Scott Garman --- .../base-passwd/base-passwd-3.5.22/nobash.patch | 23 ------ .../base-passwd/base-passwd-3.5.22/root-home.patch | 16 ---- .../base-passwd/base-passwd-3.5.24/nobash.patch | 23 ++++++ .../base-passwd/base-passwd-3.5.24/root-home.patch | 16 ++++ .../recipes-core/base-passwd/base-passwd_3.5.22.bb | 94 ---------------------- .../recipes-core/base-passwd/base-passwd_3.5.24.bb | 94 ++++++++++++++++++++++ 6 files changed, 133 insertions(+), 133 deletions(-) delete mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch delete mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch create mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.24/nobash.patch create mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.24/root-home.patch delete mode 100644 meta/recipes-core/base-passwd/base-passwd_3.5.22.bb create mode 100644 meta/recipes-core/base-passwd/base-passwd_3.5.24.bb (limited to 'meta') 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.22/nobash.patch deleted file mode 100644 index 637157644..000000000 --- a/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch +++ /dev/null @@ -1,23 +0,0 @@ -use /bin/sh instead of /bin/bash, since the latter may not be included in -some images such as minimal - -comment added by Kevin Tian , 2010-07-06 - -remove "*" for root since we don't have a /etc/shadow so far. - -by Kevin Tian , 2010-07-06 - -Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher - -Upstream-Status: Invalid [configuration] - -Signed-off-by: Scott Garman - ---- base-passwd/passwd.master~nobash -+++ base-passwd/passwd.master -@@ -1,4 +1,4 @@ --root:*:0:0:root:/root:/bin/bash -+root::0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh 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.22/root-home.patch deleted file mode 100644 index eab77f124..000000000 --- a/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch +++ /dev/null @@ -1,16 +0,0 @@ -we use /home/root instead of /root - -Comment added by Kevin Tian , 2010-07-06 - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Scott Garman - ---- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 -+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 -@@ -1,4 +1,4 @@ --root::0:0:root:/root:/bin/sh -+root::0:0:root:/home/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.24/nobash.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.24/nobash.patch new file mode 100644 index 000000000..637157644 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd-3.5.24/nobash.patch @@ -0,0 +1,23 @@ +use /bin/sh instead of /bin/bash, since the latter may not be included in +some images such as minimal + +comment added by Kevin Tian , 2010-07-06 + +remove "*" for root since we don't have a /etc/shadow so far. + +by Kevin Tian , 2010-07-06 + +Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher + +Upstream-Status: Invalid [configuration] + +Signed-off-by: Scott Garman + +--- base-passwd/passwd.master~nobash ++++ base-passwd/passwd.master +@@ -1,4 +1,4 @@ +-root:*:0:0:root:/root:/bin/bash ++root::0:0:root:/root:/bin/sh + daemon:*:1:1:daemon:/usr/sbin:/bin/sh + bin:*:2:2:bin:/bin:/bin/sh + sys:*:3:3:sys:/dev:/bin/sh diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.24/root-home.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.24/root-home.patch new file mode 100644 index 000000000..eab77f124 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd-3.5.24/root-home.patch @@ -0,0 +1,16 @@ +we use /home/root instead of /root + +Comment added by Kevin Tian , 2010-07-06 + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Scott Garman + +--- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 ++++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 +@@ -1,4 +1,4 @@ +-root::0:0:root:/root:/bin/sh ++root::0:0:root:/home/root:/bin/sh + daemon:*:1:1:daemon:/usr/sbin:/bin/sh + bin:*:2:2:bin:/bin:/bin/sh + sys:*:3:3:sys:/dev:/bin/sh diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb deleted file mode 100644 index ae3864c0a..000000000 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb +++ /dev/null @@ -1,94 +0,0 @@ -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" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" - -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" - -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 () { - install -d -m 755 ${D}${sbindir} - install -o root -g root -p -m 755 update-passwd ${D}${sbindir}/ - install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8 - install -p -m 644 man/update-passwd.8 ${D}${mandir}/man8/ - install -p -m 644 man/update-passwd.pl.8 \ - ${D}${mandir}/pl/man8/update-passwd.8 - gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/* - install -d -m 755 ${D}${datadir}/base-passwd - install -o root -g root -p -m 644 passwd.master ${D}${datadir}/base-passwd/ - install -o root -g root -p -m 644 group.master ${D}${datadir}/base-passwd/ - - install -d -m 755 ${D}${docdir}/${BPN} - install -p -m 644 debian/changelog ${D}${docdir}/${BPN}/ - gzip -9 ${D}${docdir}/${BPN}/* - install -p -m 644 README ${D}${docdir}/${BPN}/ - install -p -m 644 debian/copyright ${D}${docdir}/${BPN}/ -} - -base_passwd_sstate_postinst() { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - # Staging does not copy ${sysconfdir} files into the - # target sysroot, so we need to do so manually. We - # put these files in the target sysroot so they can - # be used by recipes which use custom user/group - # permissions. - install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir} - install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/passwd.master ${STAGING_DIR_TARGET}${sysconfdir}/passwd - install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/group.master ${STAGING_DIR_TARGET}${sysconfdir}/group - fi -} - -python populate_packages_prepend() { - # Add in the preinst function for ${PN} - # We have to do this here as prior to this, passwd/group.master - # would be unavailable. We need to create these files at preinst - # time before the files from the package may be available, hence - # storing the data from the files in the preinst directly. - - f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') - passwd = "".join(f.readlines()) - f.close() - f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') - group = "".join(f.readlines()) - f.close() - - preinst = """#!/bin/sh -if [ ! -e $D${sysconfdir}/passwd ]; then - cat << EOF > $D${sysconfdir}/passwd -""" + passwd + """EOF -fi -if [ ! -e $D${sysconfdir}/group ]; then - cat << EOF > $D${sysconfdir}/group -""" + group + """EOF -fi -""" - d.setVar('pkg_preinst_${PN}', preinst) -} - -addtask do_package after do_populate_sysroot - -pkg_postinst_${PN}-update () { -#!/bin/sh -if [ -n "$D" ]; then - exit 0 -fi -${sbindir}/update-passwd -} diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb new file mode 100644 index 000000000..6eeee5cd5 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb @@ -0,0 +1,94 @@ +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 = "r0" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ + file://nobash.patch \ + file://root-home.patch" + +SRC_URI[md5sum] = "8f6b9420c50e90edaff41eb2fb7e9e16" +SRC_URI[sha256sum] = "196083d6f675190d4e2cede0a5fa6b3c91088705c5386f76292fec8e74b6369e" + +S = "${WORKDIR}/base-passwd" + +inherit autotools + +SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst" + +do_install () { + install -d -m 755 ${D}${sbindir} + install -o root -g root -p -m 755 update-passwd ${D}${sbindir}/ + install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8 + install -p -m 644 man/update-passwd.8 ${D}${mandir}/man8/ + install -p -m 644 man/update-passwd.pl.8 \ + ${D}${mandir}/pl/man8/update-passwd.8 + gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/* + install -d -m 755 ${D}${datadir}/base-passwd + install -o root -g root -p -m 644 passwd.master ${D}${datadir}/base-passwd/ + install -o root -g root -p -m 644 group.master ${D}${datadir}/base-passwd/ + + install -d -m 755 ${D}${docdir}/${BPN} + install -p -m 644 debian/changelog ${D}${docdir}/${BPN}/ + gzip -9 ${D}${docdir}/${BPN}/* + install -p -m 644 README ${D}${docdir}/${BPN}/ + install -p -m 644 debian/copyright ${D}${docdir}/${BPN}/ +} + +base_passwd_sstate_postinst() { + if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] + then + # Staging does not copy ${sysconfdir} files into the + # target sysroot, so we need to do so manually. We + # put these files in the target sysroot so they can + # be used by recipes which use custom user/group + # permissions. + install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir} + install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/passwd.master ${STAGING_DIR_TARGET}${sysconfdir}/passwd + install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/group.master ${STAGING_DIR_TARGET}${sysconfdir}/group + fi +} + +python populate_packages_prepend() { + # Add in the preinst function for ${PN} + # We have to do this here as prior to this, passwd/group.master + # would be unavailable. We need to create these files at preinst + # time before the files from the package may be available, hence + # storing the data from the files in the preinst directly. + + f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') + passwd = "".join(f.readlines()) + f.close() + f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') + group = "".join(f.readlines()) + f.close() + + preinst = """#!/bin/sh +if [ ! -e $D${sysconfdir}/passwd ]; then + cat << EOF > $D${sysconfdir}/passwd +""" + passwd + """EOF +fi +if [ ! -e $D${sysconfdir}/group ]; then + cat << EOF > $D${sysconfdir}/group +""" + group + """EOF +fi +""" + d.setVar('pkg_preinst_${PN}', preinst) +} + +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 + exit 0 +fi +${sbindir}/update-passwd +} -- cgit v1.2.3