소스 검색

Make busybox config file location a config option

Eric Andersen 20 년 전
부모
커밋
9fc890fc1f
4개의 변경된 파일19개의 추가작업 그리고 6개의 파일을 삭제
  1. 14 3
      package/busybox/Config.in
  2. 3 1
      package/busybox/busybox.mk
  3. 1 1
      target/device/AMD/DBAu1500/Makefile.in
  4. 1 1
      target/device/Soekris/Makefile.in

+ 14 - 3
package/busybox/Config.in

@@ -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 @@ config BR2_PACKAGE_BUSYBOX
 	  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.
+

+ 3 - 1
package/busybox/busybox.mk

@@ -16,7 +16,9 @@ BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
 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)

+ 1 - 1
target/device/AMD/DBAu1500/Makefile.in

@@ -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

+ 1 - 1
target/device/Soekris/Makefile.in

@@ -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