diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-06 16:27:37 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-06 16:27:37 +0000 |
| commit | 17c7b6c3fdc48301e50d22cc6138ede16bd1be24 (patch) | |
| tree | a5d41b991a151e72663527a96fbc6c494565d65c /include | |
| parent | 5389989abaa52926b22f9f030d1481df1e73d745 (diff) | |
strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8653 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/kernel-build.mk | 3 | ||||
| -rw-r--r-- | include/kernel.mk | 4 | ||||
| -rw-r--r-- | include/toplevel.mk | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 0d3b40e16..69e602ade 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -110,7 +110,8 @@ define BuildKernel ifeq ($(DUMP),1) dumpinfo: - @echo 'Target: $(BOARD)-$(KERNEL)' + @echo 'Target: $(BOARD)' + @echo 'Target-Kernel: $(KERNEL)' @echo 'Target-Name: $(BOARDNAME) [$(KERNEL)]' @echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))' @echo 'Target-Arch: $(ARCH)' diff --git a/include/kernel.mk b/include/kernel.mk index a0f256b99..559b37e4a 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -30,9 +30,9 @@ else KERNEL_CROSS:=$(TARGET_CROSS) endif - PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) + PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD) PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) - KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(KERNEL)-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) + KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) diff --git a/include/toplevel.mk b/include/toplevel.mk index e45626422..8faf8e143 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -122,7 +122,7 @@ distclean: rm -rf tmp build_dir staging_dir dl .config* ifeq ($(findstring v,$(DEBUG)),) - .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target prepare-tmpinfo + .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo endif .PHONY: help FORCE .NOTPARALLEL: |