فهرست منبع

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

Mike Frysinger 20 سال پیش
والد
کامیت
dba033e7a4
2فایلهای تغییر یافته به همراه17 افزوده شده و 1 حذف شده
  1. 13 1
      package/busybox/Config.in
  2. 4 0
      package/busybox/busybox.mk

+ 13 - 1
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.
-

+ 4 - 0
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