diff options
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 6 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.19.4.bb | 3 | ||||
-rwxr-xr-x | meta/recipes-core/busybox/files/busybox-udhcpc | 25 |
3 files changed, 3 insertions, 31 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index f5bf247834..78239a233e 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -20,16 +20,15 @@ FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" | |||
20 | FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*" | 20 | FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*" |
21 | FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" | 21 | FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" |
22 | FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" | 22 | FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" |
23 | FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc ${sysconfdir}/init.d/busybox-udhcpc" | 23 | FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" |
24 | 24 | ||
25 | INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-udhcpc ${PN}-mdev" | 25 | INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev" |
26 | 26 | ||
27 | INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" | 27 | INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" |
28 | INITSCRIPT_NAME_${PN}-syslog = "syslog" | 28 | INITSCRIPT_NAME_${PN}-syslog = "syslog" |
29 | INITSCRIPT_NAME_${PN}-mdev = "mdev" | 29 | INITSCRIPT_NAME_${PN}-mdev = "mdev" |
30 | INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." | 30 | INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." |
31 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" | 31 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" |
32 | INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" | ||
33 | CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" | 32 | CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" |
34 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" | 33 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" |
35 | 34 | ||
@@ -188,7 +187,6 @@ do_install () { | |||
188 | install -d ${D}${datadir}/udhcpc | 187 | install -d ${D}${datadir}/udhcpc |
189 | install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default | 188 | install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default |
190 | install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script | 189 | install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script |
191 | install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/ | ||
192 | fi | 190 | fi |
193 | if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then | 191 | if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then |
194 | install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} | 192 | install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} |
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb index 7bdfbda538..ced50c55da 100644 --- a/meta/recipes-core/busybox/busybox_1.19.4.bb +++ b/meta/recipes-core/busybox/busybox_1.19.4.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r11" | 2 | PR = "r12" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
5 | file://B921600.patch \ | 5 | file://B921600.patch \ |
@@ -14,7 +14,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
14 | file://busybox-cron \ | 14 | file://busybox-cron \ |
15 | file://busybox-httpd \ | 15 | file://busybox-httpd \ |
16 | file://busybox-udhcpd \ | 16 | file://busybox-udhcpd \ |
17 | file://busybox-udhcpc \ | ||
18 | file://default.script \ | 17 | file://default.script \ |
19 | file://simple.script \ | 18 | file://simple.script \ |
20 | file://hwclock.sh \ | 19 | file://hwclock.sh \ |
diff --git a/meta/recipes-core/busybox/files/busybox-udhcpc b/meta/recipes-core/busybox/files/busybox-udhcpc deleted file mode 100755 index 2c43f8da2e..0000000000 --- a/meta/recipes-core/busybox/files/busybox-udhcpc +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # (c) 2010-2011 Wind River Systems, Inc. | ||
4 | # | ||
5 | # Busybox udhcpc init script | ||
6 | # | ||
7 | # script to start the udpchc DHCP client on boots where | ||
8 | # the parameter 'ip=dhcp' was included in the kernel parameters | ||
9 | |||
10 | # ensure the required binaries are present | ||
11 | [ -x /sbin/udhcpc ] || exit 1 | ||
12 | [ -x /bin/grep ] || exit 1 | ||
13 | [ -x /bin/mount ] || exit 1 | ||
14 | |||
15 | # ensure /proc is mounted | ||
16 | if ! mount | grep -q "/proc "; then | ||
17 | exit 2 | ||
18 | fi | ||
19 | |||
20 | rc=0 | ||
21 | if grep -q -E "\bip=dhcp\b" /proc/cmdline; then | ||
22 | /sbin/udhcpc -D -s /usr/share/udhcpc/default.script | ||
23 | rc=$? | ||
24 | fi | ||
25 | exit $rc | ||