diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-06-30 21:49:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-30 21:49:25 +0000 |
| commit | 35aad8dc949e724dc28267ecb00069b3031058bb (patch) | |
| tree | 0d4cd5162b80efb5e67b4c26531986e7123c4fb3 | |
| parent | 24524856f9ecd2cf3c71f39ab4c354a9a2ef100d (diff) | |
| download | upstream-35aad8dc949e724dc28267ecb00069b3031058bb.tar.gz upstream-35aad8dc949e724dc28267ecb00069b3031058bb.tar.bz2 upstream-35aad8dc949e724dc28267ecb00069b3031058bb.zip | |
merge the kernel config parts at dump time, so that overrides that disable certain features work
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7812 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel-build.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 83d0d5e6eb..4088422088 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -15,8 +15,13 @@ GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-$(shell [ -f "$(GENERIC_PLA LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default --include $(GENERIC_LINUX_CONFIG) --include $(LINUX_CONFIG) +ifneq ($(DUMP),) + TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(BOARD)-$(KERNEL) + $(TMP_CONFIG): $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) + $(SCRIPT_DIR)/config.pl + $^ > $@ + -include $(TMP_CONFIG) + .SILENT: $(TMP_CONFIG) +endif ifneq ($(CONFIG_ATM),) FEATURES += atm |