[uClibc-cvs] svn commit: trunk/buildroot: package/busybox target/device/AMD/DBAu15 etc...

[andersen at uclibc.org]

Author: andersen
Date: 2005-04-12 14:32:45 -0600 (Tue, 12 Apr 2005)
New Revision: 10082

Log:
Make busybox config file location a config option


Modified:
   trunk/buildroot/package/busybox/Config.in
   trunk/buildroot/package/busybox/busybox.mk
   trunk/buildroot/target/device/AMD/DBAu1500/Makefile.in
   trunk/buildroot/target/device/Soekris/Makefile.in


Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in	2005-04-12 19:40:23 UTC (rev 10081)
+++ trunk/buildroot/package/busybox/Config.in	2005-04-12 20:32:45 UTC (rev 10082)
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_BUSYBOX
-	bool "busybox"
+	bool "BusyBox"
 	default y
 	help
 	  The Swiss Army Knife of embedded Linux.  It slices, it dices, it
@@ -10,10 +10,21 @@
 	  Most people will answer Y.
 
 config BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	bool "Use the daily snapshot of busybox?"
+	bool "Use the daily snapshot of BusyBox?"
 	depends BR2_PACKAGE_BUSYBOX
 	default y
 	help
-	  Use the latest busybox CVS snapshot instead of release.
+	  Use the latest BusyBox daily snapshot instead of release.
 
 	  For fun, you should say Y.
+
+config BR2_PACKAGE_BUSYBOX_CONFIG
+	string "BusyBox configuration file to use?"
+	depends BR2_PACKAGE_BUSYBOX
+	default "package/busybox/busybox.config"
+	help
+	  Some people may wish to use their own modified BusyBox configuration
+	  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-04-12 19:40:23 UTC (rev 10081)
+++ trunk/buildroot/package/busybox/busybox.mk	2005-04-12 20:32:45 UTC (rev 10082)
@@ -16,8 +16,10 @@
 BUSYBOX_SITE:=http://www.busybox.net/downloads
 endif
 BUSYBOX_UNZIP=bzcat
-BUSYBOX_CONFIG_FILE=package/busybox/busybox.config
 
+BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
+#"
+
 $(DL_DIR)/$(BUSYBOX_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
 

Modified: trunk/buildroot/target/device/AMD/DBAu1500/Makefile.in
===================================================================
--- trunk/buildroot/target/device/AMD/DBAu1500/Makefile.in	2005-04-12 19:40:23 UTC (rev 10081)
+++ trunk/buildroot/target/device/AMD/DBAu1500/Makefile.in	2005-04-12 20:32:45 UTC (rev 10082)
@@ -1,6 +1,6 @@
 ALCHEMY_DBAU1500_PATH=target/device/AMD/DBAu1500
 
-BUSYBOX_CONFIG=$(ALCHEMY_DBAU1500_PATH)/busybox.config
+BR2_PACKAGE_BUSYBOX_CONFIG=$(ALCHEMY_DBAU1500_PATH)/busybox.config
 UCLIBC_CONFIG_FILE=$(ALCHEMY_DBAU1500_PATH)/uClibc.config.$(ARCH)
 
 TARGET_SKELETON=$(ALCHEMY_DBAU1500_PATH)/skel.tar.gz

Modified: trunk/buildroot/target/device/Soekris/Makefile.in
===================================================================
--- trunk/buildroot/target/device/Soekris/Makefile.in	2005-04-12 19:40:23 UTC (rev 10081)
+++ trunk/buildroot/target/device/Soekris/Makefile.in	2005-04-12 20:32:45 UTC (rev 10082)
@@ -1,7 +1,7 @@
 # Override the default uClibc configuration
 ifeq ($(strip $(BR2_TARGET_SOEKRIS_NET4521)),y)
 UCLIBC_CONFIG_FILE:=target/device/Soekris/net4521/uClibc.config
-BUSYBOX_CONFIG:=target/device/Soekris/net4521/busybox.config
+BR2_PACKAGE_BUSYBOX_CONFIG:=target/device/Soekris/net4521/busybox.config
 
 ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
 include target/device/Soekris/net4521/linux.mk