Hi,
This patch helps to use build suffix on build_dir paths if it is defined else
use subtarget. Defining model names on build suffix helps in building one or
more pre-defined configurations (.config) of same platform in same build path
without doing a clean. This preserves each models target build and Linux build
in separate directories.
Signed-off-by: Tathagata Das <tathag...@alumnux.com>
---
diff -Naur a/include/kernel.mk b/include/kernel.mk
--- a/include/kernel.mk 2012-04-05 13:10:50.000000000 +0530
+++ b/include/kernel.mk 2012-04-06 16:09:18.000000000 +0530
@@ -33,7 +33,7 @@
PATCH_DIR ?= ./patches$(if $(wildcard
./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
FILES_DIR ?= $(foreach dir,$(wildcard ./files
./files-$(KERNEL_PATCHVER)),"$(dir)")
endif
- KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if
$(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+ KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if
$(BUILD_SUFFIX),_$(BUILD_SUFFIX),$(if $(SUBTARGET),_$(SUBTARGET)))
LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null))
diff -Naur a/rules.mk b/rules.mk
--- a/rules.mk 2012-04-05 13:10:50.000000000 +0530
+++ b/rules.mk 2012-04-06 16:09:07.000000000 +0530
@@ -82,7 +82,7 @@
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux
DIR_SUFFIX:=_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if
$(BUILD_SUFFIX),_$(BUILD_SUFFIX))
- STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)
+
STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if
$(BUILD_SUFFIX),_$(BUILD_SUFFIX))
BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)
TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)
PACKAGE_DIR:=$(BIN_DIR)/packages
@@ -94,7 +94,7 @@
endif
REAL_GNU_TARGET_NAME=$(GNU_TARGET_NAME)
BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(GNU_TARGET_NAME)$(if
$(BUILD_SUFFIX),_$(BUILD_SUFFIX))
- STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(GNU_TARGET_NAME)
+ STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(GNU_TARGET_NAME)$(if
$(BUILD_SUFFIX),_$(BUILD_SUFFIX))
BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(GNU_TARGET_NAME)
TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(GNU_TARGET_NAME)
PACKAGE_DIR:=$(BIN_DIR)/packages
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
