From bf3faab5c4408de6b6bfa147c59a06ae08554161 Mon Sep 17 00:00:00 2001 From: Elizabeth Liner Date: Thu, 14 Apr 2016 11:32:58 -0500 Subject: [PATCH] Adding in support for custom configurations This change will add in the custom _defconfig's to the buildroot makefile so that when a _defconfig is in the custom directory it is recognized correctly, and is able to be used. --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 63502d04ec4..9900c88b023 100644 --- a/Makefile +++ b/Makefile @@ -845,6 +845,10 @@ defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(BR2_EXTERNAL)/configs/$@ \ $< --defconfig=$(BR2_EXTERNAL)/configs/$@ $(CONFIG_CONFIG_IN) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(wildcard $(BR2_EXTERNAL)/configs/*/%_defconfig) outputmakefile + @$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(wildcard $(BR2_EXTERNAL)/configs/*/$@) \ + $< --defconfig=$(wildcard $(BR2_EXTERNAL)/configs/*/$@) $(CONFIG_CONFIG_IN) + savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ @@ -983,6 +987,12 @@ ifneq ($(wildcard $(BR2_EXTERNAL)/configs/*_defconfig),) @echo 'User-provided configs:' @$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL)/configs/*_defconfig))), \ printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) +endif +ifneq ($(wildcard $(BR2_EXTERNAL)/custom/configs/*_defconfig),) + @echo + @echo 'User-provided custom configs:' + @$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL)/custom/configs/*_defconfig))), \ + printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) endif @echo