diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-06-16 01:56:04 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-06-16 01:56:04 +0000 |
| commit | e6a68af9e901df02e28f221dcf7c7d9462a9bd02 (patch) | |
| tree | 7a8919b2830b1c51b5dfe7742261a08168b118a2 /include/kernel-build.mk | |
| parent | 46da1409881bee5a1b11691d286f773f38374bd9 (diff) | |
prepare for the transition to linux 2.6.22 - make it possible to override the kernel version in the target makefile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7644 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/kernel-build.mk')
| -rw-r--r-- | include/kernel-build.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 71b9d8000..83d0d5e6e 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -11,9 +11,11 @@ include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/prereq.mk -LINUX_CONFIG ?= ./config/default +GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-$(shell [ -f "$(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER)" ] && echo "$(KERNEL_PATCHVER)" || echo template ) +LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) +LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default --include $(TOPDIR)/target/linux/generic-$(KERNEL)/config-template +-include $(GENERIC_LINUX_CONFIG) -include $(LINUX_CONFIG) ifneq ($(CONFIG_ATM),) @@ -166,9 +168,9 @@ prepare: $(LINUX_DIR)/.configured compile: $(LINUX_DIR)/.modules menuconfig: $(LINUX_DIR)/.prepared FORCE $(call Kernel/Configure) - $(SCRIPT_DIR)/config.pl '+' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_CONFIG) > $(LINUX_DIR)/.config + $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig - $(SCRIPT_DIR)/config.pl '>' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_DIR)/.config > $(LINUX_CONFIG) + $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG) install: $(LINUX_DIR)/.image |