@@ -40,15 +40,12 @@ config BR2_BUSYBOX_VERSION
config BR2_PACKAGE_BUSYBOX_CONFIG
string "BusyBox configuration file to use?"
- default "package/busybox/busybox-1.20.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
- default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X
- default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
- default "package/busybox/busybox-1.20.x.config" if BR2_BUSYBOX_VERSION_1_20_X
+ default ""
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.
+ If left empty, a default configuration file is used.
config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
bool "Show packages that are also provided by busybox"
@@ -6,9 +6,11 @@
ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
BUSYBOX_VERSION = snapshot
+BUSYBOX_CONFIG_VERSION = 1.20
BUSYBOX_SITE = http://www.busybox.net/downloads/snapshots
else
BUSYBOX_VERSION = $(call qstrip,$(BR2_BUSYBOX_VERSION))
+BUSYBOX_CONFIG_VERSION = $(subst $(space),.,$(wordlist 1,2,$(subst .,$(space),$(BUSYBOX_VERSION))))
BUSYBOX_SITE = http://www.busybox.net/downloads
endif
BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
@@ -27,9 +29,8 @@ BUSYBOX_MAKE_OPTS = \
CONFIG_PREFIX="$(TARGET_DIR)" \
SKIP_STRIP=y
-ifndef BUSYBOX_CONFIG_FILE
- BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
-endif
+BUSYBOX_CONFIG = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
+BUSYBOX_CONFIG_FILE = $(or $(wildcard $(BUSYBOX_CONFIG)),package/busybox/busybox-$(BUSYBOX_CONFIG_VERSION).x.config)
define BUSYBOX_PERMISSIONS
/bin/busybox f 4755 0 0 - - - - -
@@ -218,6 +219,6 @@ busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch
busybox-update-config: busybox-configure
cp -f $(BUSYBOX_BUILD_CONFIG) $(BUSYBOX_CONFIG_FILE)
-ifneq ($(BUSYBOX_CONFIG_FILE),)
+ifneq ($(BUSYBOX_CONFIG),)
UPDATE_ALL_CONFIG_TARGETS += busybox-update-config
endif