[oe-commits] Bernhard Reutner-Fischer : busybox: provide -passwd and -shadow packages

git version control git at git.openembedded.org
Wed Feb 16 17:56:20 UTC 2011


Module: openembedded.git
Branch: shr/testing2011.1
Commit: 91977cedaf6328bc5ffb6f92003cdd63b4dd0daa
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=91977cedaf6328bc5ffb6f92003cdd63b4dd0daa

Author: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
Date:   Tue Jan  4 04:02:02 2011 +0000

busybox: provide -passwd and -shadow packages

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/busybox/busybox.inc      |   26 ++++++++++++++++++++++++++
 recipes/busybox/busybox_1.1x.inc |    2 ++
 recipes/busybox/files/passwd     |   11 +++++++++++
 recipes/busybox/files/shadow     |   11 +++++++++++
 4 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 8d2a88c..53bbfca 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -23,6 +23,8 @@ SRC_URI = "\
   file://hwclock-default \
   file://ifupdown-spurious-environ.patch \
   file://mount.busybox \
+  file://passwd \
+  file://shadow \
   file://syslog \
   file://syslog.conf \
   file://udhcpscript.patch \
@@ -34,6 +36,7 @@ SRC_URI_append_nylon = " file://xargs-double-size.patch"
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 PACKAGES =+ "${PN}-mountall ${PN}-httpd ${PN}-syslog ${PN}-udhcpd"
+PACKAGES =+ "${PN}-passwd ${PN}-shadow"
 
 # We need this RRECOMMENDS_${PN} because libc dlopens libgcc
 # and shlib mechanism can not detect it because its not
@@ -67,6 +70,8 @@ CONFFILES_${PN}-syslog = "${sysconfdir}/default/busybox-syslog"
 INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
 
 RDEPENDS_${PN}-httpd += "${PN}"
+RDEPENDS_${PN}-passwd += "${PN}"
+RDEPENDS_${PN}-shadow += "${PN}-passwd"
 RDEPENDS_${PN}-syslog += "${PN}"
 RDEPENDS_${PN}-udhcpd += "${PN}"
 
@@ -180,6 +185,12 @@ do_install () {
 		fi
 	fi
 
+	if grep -q "CONFIG_PASSWD=y" ${WORKDIR}/defconfig; then
+	    install -m 0644 ${WORKDIR}/passwd ${D}${sysconfdir}/passwd.${PN}
+	    if grep -q "CONFIG_FEATURE_SHADOWPASSWDS=y" ${WORKDIR}/defconfig; then
+	        install -m 0640 ${WORKDIR}/shadow ${D}${sysconfdir}/shadow.${PN}
+            fi
+	fi
 	if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
 		install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
 	        sed -i -e 's,/etc/default/busybox-syslog,${sysconfdir}/default/busybox-syslog,' \
@@ -267,6 +278,21 @@ pkg_prerm_${PN}-mountall () {
 	update-alternatives --remove default_mountall mountall.${PN}
 }
 
+pkg_postinst_${PN}-passwd () {
+	update-alternatives --install ${sysconfdir}/passwd default_passwd passwd.${PN} 50
+}
+pkg_prerm_${PN}-passwd () {
+	update-alternatives --remove default_passwd passwd.${PN}
+}
+
+pkg_postinst_${PN}-shadow () {
+	update-alternatives --install ${sysconfdir}/shadow default_shadow shadow.${PN} 50
+}
+pkg_prerm_${PN}-shadow () {
+	update-alternatives --remove default_shadow shadow.${PN}
+}
+
+
 pkg_postinst_${PN}-syslog () {
 	update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50
 
diff --git a/recipes/busybox/busybox_1.1x.inc b/recipes/busybox/busybox_1.1x.inc
index e7394cb..1078aac 100644
--- a/recipes/busybox/busybox_1.1x.inc
+++ b/recipes/busybox/busybox_1.1x.inc
@@ -17,6 +17,8 @@ SRC_URI = "\
   file://hwclock-default \
   file://mount.busybox \
   file://mountall \
+  file://passwd \
+  file://shadow \
   file://syslog \
   file://syslog.conf \
   file://umount.busybox \
diff --git a/recipes/busybox/files/passwd b/recipes/busybox/files/passwd
new file mode 100644
index 0000000..64c9ab6
--- /dev/null
+++ b/recipes/busybox/files/passwd
@@ -0,0 +1,11 @@
+root:x:0:0:root:/root:/bin/sh
+daemon:x:1:1:daemon:/usr/sbin:/bin/sh
+bin:x:2:2:bin:/bin:/bin/sh
+sys:x:3:3:sys:/dev:/bin/sh
+sync:x:4:65534:sync:/bin:/bin/sync
+man:x:6:12:man:/var/cache/man:/bin/sh
+mail:x:8:8:mail:/var/mail:/bin/sh
+www-data:x:33:33:www-data:/var/www:/bin/sh
+backup:x:34:34:backup:/var/backups:/bin/sh
+irc:x:39:39:ircd:/var/run/ircd:/bin/sh
+nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
diff --git a/recipes/busybox/files/shadow b/recipes/busybox/files/shadow
new file mode 100644
index 0000000..25df693
--- /dev/null
+++ b/recipes/busybox/files/shadow
@@ -0,0 +1,11 @@
+root::14741:0:99999:7:::
+daemon:*:14741:0:99999:7:::
+bin:*:14741:0:99999:7:::
+sys:*:14741:0:99999:7:::
+sync:*:14741:0:99999:7:::
+man:*:14741:0:99999:7:::
+mail:*:14741:0:99999:7:::
+www-data:*:14741:0:99999:7:::
+backup:*:14741:0:99999:7:::
+irc:*:14741:0:99999:7:::
+nobody:*:14741:0:99999:7:::





More information about the Openembedded-commits mailing list