From d3874686d927e8e0051bee8bb2fcb7042b329ac0 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 13 Jun 2008 15:28:31 +0000 Subject: create a platform config-* file if there is none already when running kernel_menuconfig or kernel_oldconfig git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11460 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/.target.mk.swp | Bin 0 -> 16384 bytes include/kernel-build.mk | 1 + include/target.mk | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 include/.target.mk.swp diff --git a/include/.target.mk.swp b/include/.target.mk.swp new file mode 100644 index 000000000..d41d2ccd4 Binary files /dev/null and b/include/.target.mk.swp differ diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 75c2bcf01..b6d2cf5ef 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -77,6 +77,7 @@ define BuildKernel $(MAKE) -C image compile TARGET_BUILD= oldconfig menuconfig: $(STAMP_PREPARED) FORCE + [ -e "$(LINUX_CONFIG)" ] || touch "$(LINUX_CONFIG)" $(LINUX_CONFCMD) > $(LINUX_DIR)/.config touch $(LINUX_CONFIG) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@ diff --git a/include/target.mk b/include/target.mk index be9f128cd..8b123959d 100644 --- a/include/target.mk +++ b/include/target.mk @@ -109,7 +109,7 @@ GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLAT GENERIC_FILES_DIR := $(GENERIC_PLATFORM_DIR)/files$(shell [ -d "$(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) GENERIC_LINUX_CONFIG?=$(firstword $(wildcard $(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER) $(GENERIC_PLATFORM_DIR)/config-default)) -LINUX_CONFIG?=$(firstword $(wildcard $(foreach subdir,$(PLATFORM_DIR) $(PLATFORM_SUBDIR),$(subdir)/config-$(KERNEL_PATCHVER) $(subdir)/config-default))) +LINUX_CONFIG?=$(firstword $(wildcard $(foreach subdir,$(PLATFORM_DIR) $(PLATFORM_SUBDIR),$(subdir)/config-$(KERNEL_PATCHVER) $(subdir)/config-default)) $(PLATFORM_DIR)/config-$(KERNEL_PATCHVER)) LINUX_SUBCONFIG?=$(firstword $(wildcard $(PLATFORM_SUBDIR)/config-$(KERNEL_PATCHVER) $(PLATFORM_SUBDIR)/config-default)) ifeq ($(LINUX_CONFIG),$(LINUX_SUBCONFIG)) LINUX_SUBCONFIG:= -- cgit v1.2.3