svn commit: trunk/buildroot/package/busybox

vapier at uclibc.org vapier at uclibc.org
Thu Nov 10 02:59:26 UTC 2005


Author: vapier
Date: 2005-11-09 18:59:20 -0800 (Wed, 09 Nov 2005)
New Revision: 12200

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

Modified:
   trunk/buildroot/package/busybox/Config.in
   trunk/buildroot/package/busybox/busybox.mk


Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in	2005-11-10 02:52:42 UTC (rev 12199)
+++ trunk/buildroot/package/busybox/Config.in	2005-11-10 02:59:20 UTC (rev 12200)
@@ -18,6 +18,19 @@
 
 	  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 @@
 	  file, and will specify their config file location with this option.
 
 	  Most people will just use the default BusyBox configuration file.
-

Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk	2005-11-10 02:52:42 UTC (rev 12199)
+++ trunk/buildroot/package/busybox/busybox.mk	2005-11-10 02:59:20 UTC (rev 12200)
@@ -53,8 +53,12 @@
 		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
 




More information about the uClibc-cvs mailing list