busybox: remove mdev support

mdev: add separate mdev package creating standalone executable
 * adjust mdev.conf to create /dev/buzzer link
 * change slugos-image.bb to include standalone mdev

5 files changed, 20 insertions, 111 deletions

diff --git a/packages/busybox/busybox-1.2.1/mdev.conf b/packages/busybox/busybox-1.2.1/mdev.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/busybox/busybox-1.2.1/mdev.conf
+++ /dev/null
diff --git a/packages/busybox/busybox-1.2.1/mdevdelnodes.patch b/packages/busybox/busybox-1.2.1/mdevdelnodes.patch
deleted file mode 100644
index b63a703a89..0000000000
--- a/packages/busybox/busybox-1.2.1/mdevdelnodes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Patch from Chris Steel to fix mdev deleting device nodes.
-
---- busybox/util-linux/mdev.c	2006/08/03 15:41:12	15767
-+++ busybox/util-linux/mdev.c	2006/08/10 01:09:37	15795
-@@ -37,18 +37,19 @@
- 	 * because sscanf() will stop at the first nondigit, which \n is.  We
- 	 * also depend on path having writeable space after it. */
- 
--	strcat(path, "/dev");
--	fd = open(path, O_RDONLY);
--	len = read(fd, temp + 1, 64);
--	*temp++ = 0;
--	close(fd);
--	if (len < 1) return;
-+	if (!delete) {
-+		strcat(path, "/dev");
-+		fd = open(path, O_RDONLY);
-+		len = read(fd, temp + 1, 64);
-+		*temp++ = 0;
-+		close(fd);
-+		if (len < 1) return;
-+	}
- 
- 	/* Determine device name, type, major and minor */
- 
- 	device_name = strrchr(path, '/') + 1;
- 	type = path[5]=='c' ? S_IFCHR : S_IFBLK;
--	if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
- 
- 	/* If we have a config file, look up permissions for this device */
- 
-@@ -164,6 +165,7 @@
- 
- 	umask(0);
- 	if (!delete) {
-+		if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
- 		if (mknod(device_name, mode | type, makedev(major, minor)) && errno != EEXIST)
- 			bb_perror_msg_and_die("mknod %s failed", device_name);
- 
diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig
index 2985e0fbca..c35b4f7f70 100644
--- a/packages/busybox/busybox-1.2.1/slugos/defconfig
+++ b/packages/busybox/busybox-1.2.1/slugos/defconfig
@@ -12,7 +12,7 @@ HAVE_DOT_CONFIG=y
 #
 # CONFIG_NITPICK is not set
 # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
@@ -287,24 +287,12 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 # Finding Utilities
 #
 # CONFIG_FIND is not set
-# CONFIG_FEATURE_FIND_PRINT0 is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
+CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_GREP=y
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
 CONFIG_FEATURE_GREP_CONTEXT=y
 # CONFIG_XARGS is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
 
 #
 # Init Utilities
@@ -355,19 +343,16 @@ CONFIG_MKE2FS=y
 # Linux Module Utilities
 #
 # CONFIG_INSMOD is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 # CONFIG_RMMOD is not set
 # CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
 # CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_2_6_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
 # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
 
 #
@@ -375,8 +360,6 @@ CONFIG_MKE2FS=y
 #
 CONFIG_DMESG=y
 # CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
 CONFIG_FDISK=y
@@ -390,7 +373,6 @@ CONFIG_FEATURE_OSF_LABEL=y
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
 CONFIG_HEXDUMP=y
 CONFIG_HWCLOCK=y
@@ -399,9 +381,9 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 # CONFIG_IPCRM is not set
 # CONFIG_IPCS is not set
 # CONFIG_LOSETUP is not set
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-CONFIG_FEATURE_MDEV_EXEC=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
 CONFIG_MKSWAP=y
 # CONFIG_FEATURE_MKSWAP_V0 is not set
 CONFIG_MORE=y
@@ -416,8 +398,6 @@ CONFIG_RDATE=y
 # CONFIG_SWITCH_ROOT is not set
 # CONFIG_UMOUNT is not set
 # CONFIG_FEATURE_UMOUNT_ALL is not set
-# CONFIG_FEATURE_MOUNT_LOOP is not set
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
 
 #
 # Miscellaneous Utilities
@@ -506,11 +486,6 @@ CONFIG_FEATURE_IFUPDOWN_IPV6=y
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
 # CONFIG_FEATURE_INETD_RPC is not set
 # CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
 # CONFIG_IPADDR is not set
 # CONFIG_IPLINK is not set
 # CONFIG_IPROUTE is not set
@@ -548,7 +523,7 @@ CONFIG_TRACEROUTE=y
 #
 # CONFIG_APP_UDHCPD is not set
 CONFIG_APP_UDHCPC=y
-# CONFIG_APP_DUMPLEASES is not set
+CONFIG_APP_DUMPLEASES=y
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
 # CONFIG_VCONFIG is not set
diff --git a/packages/busybox/busybox-1.2.1/slugos/mdev.conf b/packages/busybox/busybox-1.2.1/slugos/mdev.conf
deleted file mode 100644
index 31acaf83a3..0000000000
--- a/packages/busybox/busybox-1.2.1/slugos/mdev.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-null 0:0 777
-zero 0:0 666
-console 0:5 0600
-kmem 0:9 000
-mem 0:9 0640
-port 0:9 0640
-ptmx 0:5 666
-tty 0:5 0660
-ttyS* 0:20 640
-ucode_dl root:root 600 @sleep 1 && cat /lib/firmware/NPE-B > /dev/ucode_dl
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 2c3d5c4cb7..2c004f5167 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -10,14 +10,13 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1.6"
+PR = "r1.7"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://dhcp-hostname.patch;patch=1 \
 	   file://ifupdown-spurious-environ.patch;patch=1 \
 	   file://udhcpscript.patch;patch=1 \
 	   file://wget-long-options.patch;patch=1 \
-	   file://mdevdelnodes.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \
@@ -27,35 +26,29 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://default.script \
 	   file://syslog.conf \
 	   file://mount.busybox \
-	   file://umount.busybox \
-	   file://busybox-mdev.sh \
-	   file://mdev.conf \
-	   "
+	   file://umount.busybox"
 
 SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
 
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-mdev"
+PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
 
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
-FILES_${PN}-mdev = "${sysconfdir}/init.d/busybox-mdev.sh ${sysconfdir}/mdev.conf"
 
 FILES_${PN} += " ${datadir}/udhcpc"
 
-INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd ${PN}-mdev"
+INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
 INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
 INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
-INITSCRIPT_NAME_${PN}-mdev = "busybox-mdev.sh"
-INITSCRIPT_PARAMS_${PN}-mdev = "start 04 S ."
 INITSCRIPT_NAME_${PN} = "syslog"
 CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
 
-inherit cml1 update-rc.d  
-
 # This disables the syslog startup links in openslug (see openslug-init)
-# INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ." #out-of-date?
+INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
+
+inherit cml1 update-rc.d
 
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
@@ -122,7 +115,7 @@ do_install () {
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then 
-		# Move dhcpc back to /sbin/udhcpc
+		# Move dhcpc back to /usr/sbin/udhcpc
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
 
@@ -132,15 +125,6 @@ do_install () {
 		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
 	fi
 
-	if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
-		# Move mdev back to /sbin/mdev
-		install -d ${D}${base_sbindir}
-		mv ${D}/busybox${base_sbindir}/mdev ${D}${base_sbindir}/
-
-		install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/
-		install -m 0755 ${WORKDIR}/busybox-mdev.sh ${D}${sysconfdir}/init.d/
-	fi
-
 	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
 }