[Buildroot] [PATCH 11/21 RFC] core: do not hard-code inclusion of br2-external in Kconfig
Yann E. MORIN
yann.morin.1998 at free.fr
Tue May 26 23:42:06 UTC 2015
Move the inclusion of br2-external's Config.in to the generated kconfig
snippet.
This will ultimately allow us to use more than one br2-external tree.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Cc: Peter Korsgaard <jacmet at uclibc.org>
Cc: Thomas De Schampheleire <patrickdepinguin at gmail.com>
Cc: Arnout Vandecappelle <arnout at mind.be>
---
Config.in | 7 -------
Makefile | 8 +++++++-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Config.in b/Config.in
index 7c2575e..491051e 100644
--- a/Config.in
+++ b/Config.in
@@ -635,11 +635,4 @@ source "package/Config.in.host"
source "Config.in.legacy"
-menu "User-provided options"
- depends on BR2_EXTERNAL != "support/dummy-external"
-
-source "$BR2_EXTERNAL/Config.in"
-
-endmenu
-
source "$BR2_BUILD_DIR/.br2-external.in"
diff --git a/Makefile b/Makefile
index 4ddef1b..ad43972 100644
--- a/Makefile
+++ b/Makefile
@@ -798,7 +798,13 @@ endif
.PHONY: $(BUILD_DIR)/.br2-external.in
$(BUILD_DIR)/.br2-external.in: $(BUILD_DIR)
- @touch $@
+ $(Q)( \
+ printf "#\n# Automatically generated file; DO NOT EDIT.\n#\n\n"; \
+ printf 'menu "User-provided options"\n'; \
+ printf '\tdepends on BR2_EXTERNAL != "support/dummy-external"\n\n'; \
+ printf 'source "%s/Config.in"\n\n' $$(cd $(BR2_EXTERNAL) >/dev/null 2>&1 && pwd); \
+ printf 'endmenu\n'; \
+ ) >$@
# printvars prints all the variables currently defined in our Makefiles
printvars:
--
1.9.1
More information about the buildroot
mailing list