From 396744b032567b0d7fcc6e3d56c37143efde368e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 6 Jul 2016 20:36:08 +0200 Subject: [PATCH] br2-external: source external-defconfig As reported by Patrick Williams, there is not way to source an external Makefile from BR2_EXTERNAL when BR2_HAVE_DOT_CONFIG is not set. This is a problem for the support of merged defconfigs which should be handled outside of Buildroot. Add a new required file in BR2_EXTERNAL named external-defconfig.mk. If BR2_EXTERNAL is not set, source a dummy external-defconfig.mk. [1] http://lists.busybox.net/pipermail/buildroot/2016-July/166955.html [2] http://patchwork.ozlabs.org/patch/641838/ Signed-off-by: Romain Naour --- TODO: add some Documentation --- Makefile | 2 ++ support/dummy-external/external-defconfig.mk | 0 2 files changed, 2 insertions(+) create mode 100644 support/dummy-external/external-defconfig.mk diff --git a/Makefile b/Makefile index 027f21c903..6a1434958f 100644 --- a/Makefile +++ b/Makefile @@ -868,6 +868,8 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile $(CONFIG_CONFIG_IN) @$(SED) '/BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) +include $(BR2_EXTERNAL)/external-defconfig.mk + .PHONY: defconfig savedefconfig ################################################################################ diff --git a/support/dummy-external/external-defconfig.mk b/support/dummy-external/external-defconfig.mk new file mode 100644 index 0000000000..e69de29bb2