add an option for installing symlinks for supported busybox applets #536

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index c9b0badf3b443976b5f92a48d12da84a247490ce..5c7bf01840bcb7d8d843c2e42045f71de4a74c64 100644 (file)
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -18,6 +18,19 @@ config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 
          For fun, you should say Y.
 
+config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
+       bool "Install symlinks for BusyBox applets"
+       depends BR2_PACKAGE_BUSYBOX
+       default y
+       help
+         If you want to automatically install symlinks for all the
+         supported applets to the busybox binary, then answer Y.
+
+         This may overwrite files from other packages if your
+         busybox includes replacement applets for the package.
+
+         If you wish to just install /bin/busybox, then answer N.
+
 config BR2_PACKAGE_BUSYBOX_CONFIG
        string "BusyBox configuration file to use?"
        depends BR2_PACKAGE_BUSYBOX
@@ -27,4 +40,3 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
          file, and will specify their config file location with this option.
 
          Most people will just use the default BusyBox configuration file.
-

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index fe166aa6a24c76f5017785c7e49fdca20c48d0e1..9d15509c7d58ca0e5a57a5a8d56b035db2993de2 100644 (file)
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -53,8 +53,12 @@ $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
                EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
 
 $(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
+ifeq ($(BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS),y)
        $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
                EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
+else
+       install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
+endif
        # Just in case
        -chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script