From 5cab5935d6924e0aca5da4b682bb83e54f20bc1d Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sat, 31 Aug 2013 13:26:40 +0300 Subject: base-passwd: upgrade to 3.5.28 Disable docs creation for now it uses po4a and sgmltools-lite which are not currently part of OE-Core Signed-off-by: Saul Wold --- .../base-passwd-3.5.26/add_shutdown.patch | 19 ----- .../base-passwd/base-passwd-3.5.26/input.patch | 22 ----- .../base-passwd/base-passwd-3.5.26/nobash.patch | 23 ----- .../base-passwd-3.5.28/add_shutdown.patch | 19 +++++ .../base-passwd-3.5.28/disable-docs.patch | 24 ++++++ .../base-passwd/base-passwd-3.5.28/input.patch | 22 +++++ .../base-passwd/base-passwd-3.5.28/nobash.patch | 23 +++++ .../recipes-core/base-passwd/base-passwd_3.5.26.bb | 95 --------------------- .../recipes-core/base-passwd/base-passwd_3.5.28.bb | 98 ++++++++++++++++++++++ 9 files changed, 186 insertions(+), 159 deletions(-) delete mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.26/add_shutdown.patch delete mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.26/input.patch delete mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.26/nobash.patch create mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.28/add_shutdown.patch create mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.28/disable-docs.patch create mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.28/input.patch create mode 100644 meta/recipes-core/base-passwd/base-passwd-3.5.28/nobash.patch delete mode 100644 meta/recipes-core/base-passwd/base-passwd_3.5.26.bb create mode 100644 meta/recipes-core/base-passwd/base-passwd_3.5.28.bb (limited to 'meta') diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.26/add_shutdown.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.26/add_shutdown.patch deleted file mode 100644 index eb75559c49..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd-3.5.26/add_shutdown.patch +++ /dev/null @@ -1,19 +0,0 @@ - -We need to have a shutdown group to allow the shutdown icon -to work correctly. Any users that want to use shutdown like -the xuser should be added to this group. - -Upstream-Status: Inapporpriate [Embedded] - -Signed-off-by: Saul Wold -Index: base-passwd-3.5.26/group.master -=================================================================== ---- base-passwd-3.5.26.orig/group.master -+++ base-passwd-3.5.26/group.master -@@ -36,5 +36,6 @@ sasl:*:45: - plugdev:*:46: - staff:*:50: - games:*:60: -+shutdown:*:70: - users:*:100: - nogroup:*:65534: diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.26/input.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.26/input.patch deleted file mode 100644 index f1bfc2f604..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd-3.5.26/input.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add an input group for the /dev/input/* devices. - -Upstream-Status: Invalid [configuration] - -Signed-off-by: Darren Hart - ---- - group.master | 1 + - 1 file changed, 1 insertion(+) - -Index: base-passwd-3.5.26/group.master -=================================================================== ---- base-passwd-3.5.26.orig/group.master -+++ base-passwd-3.5.26/group.master -@@ -12,6 +12,7 @@ uucp:*:10: - man:*:12: - proxy:*:13: - kmem:*:15: -+input:*:19: - dialout:*:20: - fax:*:21: - voice:*:22: diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.26/nobash.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.26/nobash.patch deleted file mode 100644 index 6371576440..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd-3.5.26/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.28/add_shutdown.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.28/add_shutdown.patch new file mode 100644 index 0000000000..eb75559c49 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd-3.5.28/add_shutdown.patch @@ -0,0 +1,19 @@ + +We need to have a shutdown group to allow the shutdown icon +to work correctly. Any users that want to use shutdown like +the xuser should be added to this group. + +Upstream-Status: Inapporpriate [Embedded] + +Signed-off-by: Saul Wold +Index: base-passwd-3.5.26/group.master +=================================================================== +--- base-passwd-3.5.26.orig/group.master ++++ base-passwd-3.5.26/group.master +@@ -36,5 +36,6 @@ sasl:*:45: + plugdev:*:46: + staff:*:50: + games:*:60: ++shutdown:*:70: + users:*:100: + nogroup:*:65534: diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.28/disable-docs.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.28/disable-docs.patch new file mode 100644 index 0000000000..14c08b7484 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd-3.5.28/disable-docs.patch @@ -0,0 +1,24 @@ +Disable documentation for now as it uses tools currently not supported +by OE-Core. It uses sgmltools and po4a. + +Upstream-Status: Inappropriate [OE-Core specific] +Signed-off-by: Saul Wold + +Index: base-passwd-3.5.28/Makefile.in +=================================================================== +--- base-passwd-3.5.28.orig/Makefile.in ++++ base-passwd-3.5.28/Makefile.in +@@ -25,13 +25,10 @@ gen_configure = config.cache config.stat + confdefhs.h config.h Makefile + + all: update-passwd +- $(MAKE) -C doc all +- $(MAKE) -C man all + + install: all + mkdir -p $(DESTDIR)$(sbindir) + $(INSTALL) update-passwd $(DESTDIR)$(sbindir)/ +- $(MAKE) -C man install + + update-passwd.o: version.h + diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.28/input.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.28/input.patch new file mode 100644 index 0000000000..f1bfc2f604 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd-3.5.28/input.patch @@ -0,0 +1,22 @@ +Add an input group for the /dev/input/* devices. + +Upstream-Status: Invalid [configuration] + +Signed-off-by: Darren Hart + +--- + group.master | 1 + + 1 file changed, 1 insertion(+) + +Index: base-passwd-3.5.26/group.master +=================================================================== +--- base-passwd-3.5.26.orig/group.master ++++ base-passwd-3.5.26/group.master +@@ -12,6 +12,7 @@ uucp:*:10: + man:*:12: + proxy:*:13: + kmem:*:15: ++input:*:19: + dialout:*:20: + fax:*:21: + voice:*:22: diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.28/nobash.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.28/nobash.patch new file mode 100644 index 0000000000..6371576440 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd-3.5.28/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.26.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.26.bb deleted file mode 100644 index 4d94dcca65..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.26.bb +++ /dev/null @@ -1,95 +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 = "r2" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" - -SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ - file://add_shutdown.patch \ - file://nobash.patch \ - file://input.patch" - -SRC_URI[md5sum] = "74245e5c21dc74d9675c77cd8dfa02e6" -SRC_URI[sha256sum] = "258a78317aa563143d10375c6e1e63a60898e503887f00fffd70b6b297c1b429" - -inherit autotools - -SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst" - -do_install () { - install -d -m 755 ${D}${sbindir} - install -o root -g root -p -m 755 ${B}/update-passwd ${D}${sbindir}/ - install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8 - install -p -m 644 ${S}/man/update-passwd.8 ${D}${mandir}/man8/ - install -p -m 644 ${S}/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 - sed -i 's#:/root:#:${ROOT_HOME}:#' ${S}/passwd.master - install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ - install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ - - install -d -m 755 ${D}${docdir}/${BPN} - install -p -m 644 ${S}/debian/changelog ${D}${docdir}/${BPN}/ - gzip -9 ${D}${docdir}/${BPN}/* - install -p -m 644 ${S}/README ${D}${docdir}/${BPN}/ - install -p -m 644 ${S}/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 -mkdir -p $D${sysconfdir} -if [ ! -e $D${sysconfdir}/passwd ]; then -\tcat << EOF > $D${sysconfdir}/passwd -""" + passwd + """EOF -fi -if [ ! -e $D${sysconfdir}/group ]; then -\tcat << 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 -} diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.28.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.28.bb new file mode 100644 index 0000000000..a3e664a378 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.28.bb @@ -0,0 +1,98 @@ +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" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" + +DEPENDS = "docbook-utils-native linuxdoc-tools-native" + +SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ + file://add_shutdown.patch \ + file://nobash.patch \ + file://input.patch \ + file://disable-docs.patch \ + " + +SRC_URI[md5sum] = "9b535ace7ea3073435e7a6d38d62980a" +SRC_URI[sha256sum] = "06e757a02ec0a77ea38dd3c5b35493b589f81c4b053ee38df1d32e458ee86b67" + +inherit autotools + +SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst" + +do_install () { + install -d -m 755 ${D}${sbindir} + install -o root -g root -p -m 755 ${B}/update-passwd ${D}${sbindir}/ + install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8 + install -p -m 644 ${S}/man/update-passwd.8 ${D}${mandir}/man8/ + install -p -m 644 ${S}/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 + sed -i 's#:/root:#:${ROOT_HOME}:#' ${S}/passwd.master + install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ + install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ + + install -d -m 755 ${D}${docdir}/${BPN} + install -p -m 644 ${S}/debian/changelog ${D}${docdir}/${BPN}/ + gzip -9 ${D}${docdir}/${BPN}/* + install -p -m 644 ${S}/README ${D}${docdir}/${BPN}/ + install -p -m 644 ${S}/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 +mkdir -p $D${sysconfdir} +if [ ! -e $D${sysconfdir}/passwd ]; then +\tcat << EOF > $D${sysconfdir}/passwd +""" + passwd + """EOF +fi +if [ ! -e $D${sysconfdir}/group ]; then +\tcat << 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