From cf3796f66318074737bbf9e0b43da8063f9fe43a Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Tue, 6 Jul 2010 11:00:03 +0800 Subject: base-passwd: upgrade to 3.5.22 [Patches] UPDATE _nobash.patch_: use /bin/sh instead of /bin/bash. disable root password as we have no /etc/shadow KEEP _root-home.patch_: set home of root to /home/root instead of /root DISABLE _mysql.patch_: poky doesn't have mysql pacakge. no need to set password for it then. but keep for a while REMOVE _configure.patch_: in upstream now [Recipe] - add license checksum - reduce line wraps Signed-off-by: Kevin Tian --- .../base-passwd/base-passwd-3.5.22/mysql.patch | 13 +++++ .../base-passwd/base-passwd-3.5.22/nobash.patch | 20 ++++++++ .../base-passwd/base-passwd-3.5.22/root-home.patch | 11 +++++ .../base-passwd/base-passwd-3.5.9/configure.patch | 23 --------- .../base-passwd/base-passwd-3.5.9/mysql.patch | 8 --- .../base-passwd/base-passwd-3.5.9/nobash.patch | 13 ----- .../base-passwd/base-passwd-3.5.9/root-home.patch | 8 --- meta/packages/base-passwd/base-passwd_3.5.22.bb | 50 +++++++++++++++++++ meta/packages/base-passwd/base-passwd_3.5.9.bb | 57 ---------------------- 9 files changed, 94 insertions(+), 109 deletions(-) create mode 100644 meta/packages/base-passwd/base-passwd-3.5.22/mysql.patch create mode 100644 meta/packages/base-passwd/base-passwd-3.5.22/nobash.patch create mode 100644 meta/packages/base-passwd/base-passwd-3.5.22/root-home.patch delete mode 100644 meta/packages/base-passwd/base-passwd-3.5.9/configure.patch delete mode 100644 meta/packages/base-passwd/base-passwd-3.5.9/mysql.patch delete mode 100644 meta/packages/base-passwd/base-passwd-3.5.9/nobash.patch delete mode 100644 meta/packages/base-passwd/base-passwd-3.5.9/root-home.patch create mode 100644 meta/packages/base-passwd/base-passwd_3.5.22.bb delete mode 100644 meta/packages/base-passwd/base-passwd_3.5.9.bb (limited to 'meta/packages') diff --git a/meta/packages/base-passwd/base-passwd-3.5.22/mysql.patch b/meta/packages/base-passwd/base-passwd-3.5.22/mysql.patch new file mode 100644 index 000000000..8bfd75792 --- /dev/null +++ b/meta/packages/base-passwd/base-passwd-3.5.22/mysql.patch @@ -0,0 +1,13 @@ +# set correct uid/gid for mysql, from OE (8836cd807198c224ed23b05fa4f708f096881b27). +# however poky doesn't include mysql so far. Remove it from patch list, but keep +# this patch for a while +# +# comment added by Kevin Tian , 2010-07-06 +--- base-passwd/group.master.orig 2005-07-08 06:36:07.717990112 +0200 ++++ base-passwd/group.master 2005-07-08 06:36:32.000000000 +0200 +@@ -36,4 +36,5 @@ + staff:*:50: + games:*:60: + users:*:100: ++mysql:*:64001: + nogroup:*:65534: diff --git a/meta/packages/base-passwd/base-passwd-3.5.22/nobash.patch b/meta/packages/base-passwd/base-passwd-3.5.22/nobash.patch new file mode 100644 index 000000000..52650166f --- /dev/null +++ b/meta/packages/base-passwd/base-passwd-3.5.22/nobash.patch @@ -0,0 +1,20 @@ +# 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 +# + +--- 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/packages/base-passwd/base-passwd-3.5.22/root-home.patch b/meta/packages/base-passwd/base-passwd-3.5.22/root-home.patch new file mode 100644 index 000000000..87c4655a0 --- /dev/null +++ b/meta/packages/base-passwd/base-passwd-3.5.22/root-home.patch @@ -0,0 +1,11 @@ +# poky uses /home/root instead of /root. +# +# comment added by Kevin Tian , 2010-07-06 +--- 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/packages/base-passwd/base-passwd-3.5.9/configure.patch b/meta/packages/base-passwd/base-passwd-3.5.9/configure.patch deleted file mode 100644 index a9adb1e9e..000000000 --- a/meta/packages/base-passwd/base-passwd-3.5.9/configure.patch +++ /dev/null @@ -1,23 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- base-passwd/configure.in~configure -+++ base-passwd/configure.in -@@ -1,5 +1,6 @@ - dnl Initialize the autoconf process --AC_INIT(update-passwd.c) -+AC_INIT -+AC_CONFIG_SRCDIR([update-passwd.c]) - AC_CONFIG_HEADER(config.h) - AC_PREFIX_DEFAULT(/usr) - -@@ -12,5 +13,6 @@ - AC_CHECK_FUNCS(putgrent) - - dnl Finally output everything --AC_OUTPUT(Makefile) -+AC_CONFIG_FILES([Makefile]) -+AC_OUTPUT - diff --git a/meta/packages/base-passwd/base-passwd-3.5.9/mysql.patch b/meta/packages/base-passwd/base-passwd-3.5.9/mysql.patch deleted file mode 100644 index b641f4123..000000000 --- a/meta/packages/base-passwd/base-passwd-3.5.9/mysql.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- base-passwd/group.master.orig 2005-07-08 06:36:07.717990112 +0200 -+++ base-passwd/group.master 2005-07-08 06:36:32.000000000 +0200 -@@ -36,4 +36,5 @@ - staff:*:50: - games:*:60: - users:*:100: -+mysql:*:64001: - nogroup:*:65534: diff --git a/meta/packages/base-passwd/base-passwd-3.5.9/nobash.patch b/meta/packages/base-passwd/base-passwd-3.5.9/nobash.patch deleted file mode 100644 index 2bde9bf33..000000000 --- a/meta/packages/base-passwd/base-passwd-3.5.9/nobash.patch +++ /dev/null @@ -1,13 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- 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/packages/base-passwd/base-passwd-3.5.9/root-home.patch b/meta/packages/base-passwd/base-passwd-3.5.9/root-home.patch deleted file mode 100644 index 85d96b618..000000000 --- a/meta/packages/base-passwd/base-passwd-3.5.9/root-home.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- 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/packages/base-passwd/base-passwd_3.5.22.bb b/meta/packages/base-passwd/base-passwd_3.5.22.bb new file mode 100644 index 000000000..f0ca8e628 --- /dev/null +++ b/meta/packages/base-passwd/base-passwd_3.5.22.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "Base system password/group 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" + +S = "${WORKDIR}/base-passwd" + +inherit autotools + +do_install () { + install -d -m 755 ${D}${sbindir} + install -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 -p -m 644 passwd.master ${D}${datadir}/base-passwd/ + install -p -m 644 group.master ${D}${datadir}/base-passwd/ + + install -d -m 755 ${D}${docdir}/${PN} + install -p -m 644 debian/changelog ${D}${docdir}/${PN}/ + gzip -9 ${D}${docdir}/${PN}/* + install -p -m 644 README ${D}${docdir}/${PN}/ + install -p -m 644 debian/copyright ${D}${docdir}/${PN}/ +} + +do_install_append_openmn() { + echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master +} + + +pkg_postinst () { + set -e + + if [ ! -e $D${sysconfdir}/passwd ] ; then + cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd + fi + + if [ ! -e $D${sysconfdir}/group ] ; then + cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group + fi + exit 0 +} diff --git a/meta/packages/base-passwd/base-passwd_3.5.9.bb b/meta/packages/base-passwd/base-passwd_3.5.9.bb deleted file mode 100644 index 46333ebd5..000000000 --- a/meta/packages/base-passwd/base-passwd_3.5.9.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "Base system password/group files." -SECTION = "base" -PR = "r2" -LICENSE = "GPLv2+" - -SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ - file://configure.patch \ - file://nobash.patch \ - file://root-home.patch \ - file://mysql.patch" - -S = "${WORKDIR}/base-passwd" - -inherit autotools - -do_install () { - install -d -m 755 ${D}${sbindir} - install -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 -p -m 644 passwd.master \ - ${D}${datadir}/base-passwd/ - install -p -m 644 group.master \ - ${D}${datadir}/base-passwd/ - - install -d -m 755 ${D}${docdir}/${PN} - install -p -m 644 debian/changelog ${D}${docdir}/${PN}/ - gzip -9 ${D}${docdir}/${PN}/* - install -p -m 644 README ${D}${docdir}/${PN}/ - install -p -m 644 debian/copyright ${D}${docdir}/${PN}/ -} - - -do_install_append_openmn() { - echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master -} - - -pkg_postinst () { - set -e - - if [ ! -e $D${sysconfdir}/passwd ] ; then - cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd - fi - - if [ ! -e $D${sysconfdir}/group ] ; then - cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group - fi - exit 0 -} -- cgit v1.2.3