Convert busybox to the device declaration method

Busybox used to declare and create files even if the package was not
enabled through the device table. Remove the entries for busybox in the
device table and move them to the package declaration.

Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Thomas De Schampheleire <[email protected]>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index d18b6d0b13b22861763acc8bcb1ae67caec24773..59448d5a2f6d05877fa3f21ec8c178283630db8a 100644 (file)
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -28,6 +28,11 @@ ifndef BUSYBOX_CONFIG_FILE
        BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
 endif
 
+define BUSYBOX_PERMISSIONS
+/bin/busybox                    f 4755 0 0 - - - - -
+/usr/share/udhcpc/default.script f 755  0 0 - - - - -
+endef
+
 # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
 define BUSYBOX_INSTALL_MDEV_SCRIPT

diff --git a/target/generic/device_table.txt b/target/generic/device_table.txt
index 12f35b2755d1e4e69e1a0aa1da3519ecb0cb5bca..d3e394ba99b356adeab69fc469b85dc5139d9559 100644 (file)
--- a/target/generic/device_table.txt
+++ b/target/generic/device_table.txt
@@ -10,13 +10,11 @@
 /tmp                                   d       1777    0       0       -       -       -       -       -
 /etc                                   d       755     0       0       -       -       -       -       -
 /home/default                          d       2755    1000    1000    -       -       -       -       -
-/bin/busybox                           f       4755    0       0       -       -       -       -       -
 /etc/shadow                            f       600     0       0       -       -       -       -       -
 /etc/passwd                            f       644     0       0       -       -       -       -       -
 /etc/network/if-up.d                   d       755     0       0       -       -       -       -       -
 /etc/network/if-pre-up.d               d       755     0       0       -       -       -       -       -
 /etc/network/if-down.d                 d       755     0       0       -       -       -       -       -
 /etc/network/if-post-down.d            d       755     0       0       -       -       -       -       -
-/usr/share/udhcpc/default.script       f       755     0       0       -       -       -       -       -
 # uncomment this to allow starting x as non-root
 #/usr/X11R6/bin/Xfbdev                 f       4755    0       0       -       -       -       -       -