summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFloris Bos <bos@je-eigen-domein.nl>2015-04-28 16:34:33 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-05-21 23:50:34 +0200
commit73e8345c9873477c1998e1b9ed8e522031191250 (patch)
tree14213920c52753b82c7f25bd08d345500867b22d
parent87bd1e3724d6ffbe868a6c38fdb2b56ae20cabbd (diff)
downloadbuildroot-73e8345c9873477c1998e1b9ed8e522031191250.tar.gz
buildroot-73e8345c9873477c1998e1b9ed8e522031191250.zip
busybox: add option to specify config fragments
Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/busybox/Config.in6
-rw-r--r--package/busybox/busybox.mk1
2 files changed, 7 insertions, 0 deletions
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index b4f949f3ef..6847a60e83 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -20,6 +20,12 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
Most people will just use the default BusyBox configuration file.
+config BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES
+ string "Additional BusyBox configuration fragment files"
+ help
+ A space-separated list of configuration fragment files,
+ that will be merged to the main BusyBox configuration file.
+
config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
bool "Show packages that are also provided by busybox"
help
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 1ce508a6b5..090e174690 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -46,6 +46,7 @@ ifndef BUSYBOX_CONFIG_FILE
endif
BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
+BUSYBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES))
BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
OpenPOWER on IntegriCloud