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 <kevin.tian@intel.com>
This commit is contained in:
Kevin Tian 2010-07-06 11:00:03 +08:00 committed by Saul Wold
parent fae8d5e985
commit cf3796f663
7 changed files with 44 additions and 59 deletions

View File

@ -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 <kevin.tian@intel.com>, 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:

View File

@ -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 <kevin.tian@intel.com>, 2010-07-06
#
# remove "*" for root since we don't have a /etc/shadow so far.
#
# by Kevin Tian <kevin.tian@intel.com>, 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

View File

@ -1,3 +1,6 @@
# poky uses /home/root instead of /root.
#
# comment added by Kevin Tian <kevin.tian@intel.com>, 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 @@

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -1,13 +1,12 @@
DESCRIPTION = "Base system password/group files."
SECTION = "base"
PR = "r2"
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://configure.patch \
file://nobash.patch \
file://root-home.patch \
file://mysql.patch"
file://root-home.patch"
S = "${WORKDIR}/base-passwd"
@ -16,19 +15,14 @@ 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 -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/*
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 -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}/
@ -37,7 +31,6 @@ do_install () {
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
}