[Buildroot] [PATCH v3 07/10] busybox: update-all-config shouldn't update default busybox config
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Thu Nov 8 08:36:13 UTC 2012
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout at mind.be>
The new update-all-config target will update the busybox config file
if BR2_PACKAGE_BUSYBOX_CONFIG is set, even if it is set to the
default value in package/busybox/busybox-xxx.config.
To avoid this, set the default BR2_PACKAGE_BUSYBOX_CONFIG to empty,
and select a default to use in the .mk file.
Note that busybox-update-config will still overwrite the default
file in package/busybox/busybox-xxx.config - presumably it's
intentional.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
v3: Add comment explaining the magic in BUSYBOX_CONFIG_VERSION.
I don't remember anymore if we decided during the developer days
whether this patch was a good idea or not, and I can't find it in
the report. So I leave it up to Peter to decide.
---
package/busybox/Config.in | 7 ++-----
package/busybox/busybox.mk | 10 ++++++----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index dedcf18..0b77872 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -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"
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index fb67b71..a1a4b86 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -6,9 +6,12 @@
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))
+# Keep only the first two numbers of the version, e.g. 1.20.2 -> 1.20
+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
@@ -42,9 +45,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 - - - - -
@@ -221,6 +223,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_CONFIGS_TARGETS += busybox-update-config
endif
--
1.7.10.4
More information about the buildroot
mailing list