Rename BASE_DIR to OUTPUT_DIR
PATCH 1/1 Rename BASE_DIR to OUTPUT_DIR
To reflect the new output directory hierarchy rename the Makefile variable BASE_DIR to OUTPUT_DIR.
--- Config.in | 4 ++-- Makefile | 14 +++++++------- package/Makefile.in | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-)
Config.in +2 -2
@@ -88,7 +88,7 @@ source "target/device/Config.in.mirrors" config BR2_STAGING_DIR string "Toolchain and header file location?" - default "$(BASE_DIR)/staging" + default "$(OUTPUT_DIR)/staging" help This is the location where the toolchain will be installed. The toolchain will not work if it is moved from this location.
@@ -97,7 +97,7 @@ config BR2_STAGING_DIR will be used. Most people will leave this set to the default value of - "$(BASE_DIR)/staging". + "$(OUTPUT_DIR)/staging". config BR2_FPU_SUFFIX bool "Add '_nofpu' suffix for softfloat toolchains"
Makefile +7 -7
@@ -227,28 +227,28 @@ else MAKEOVERRIDES = endif -BASE_DIR := $(shell mkdir -p $(O) && cd $(O) && pwd) -$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) +OUTPUT_DIR := $(shell mkdir -p $(O) && cd $(O) && pwd) +$(if $(OUTPUT_DIR),, $(error output directory "$(O)" does not exist)) DL_DIR=$(call qstrip,$(BR2_DL_DIR)) ifeq ($(DL_DIR),) DL_DIR:=$(TOPDIR)/dl endif -BUILD_DIR:=$(BASE_DIR)/build +BUILD_DIR:=$(OUTPUT_DIR)/build GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX)) STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR)) # packages compiled for the host goes here -HOST_DIR:=$(BASE_DIR)/host +HOST_DIR:=$(OUTPUT_DIR)/host # stamp (dependency) files go here -STAMP_DIR:=$(BASE_DIR)/stamps +STAMP_DIR:=$(OUTPUT_DIR)/stamps -BINARIES_DIR:=$(BASE_DIR)/images -TARGET_DIR:=$(BASE_DIR)/target +BINARIES_DIR:=$(OUTPUT_DIR)/images +TARGET_DIR:=$(OUTPUT_DIR)/target # define values for prepatched source trees for toolchains VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE))
package/Makefile.in +2 -2
@@ -112,7 +112,7 @@ COND_ARCH_FPU_SUFFIX:= endif ifeq ($(BR2_TOOLCHAIN_SOURCE),y) -TOOLCHAIN_DIR=$(BASE_DIR)/toolchain +TOOLCHAIN_DIR=$(OUTPUT_DIR)/toolchain # Quotes are needed for spaces et al in path components. TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
@@ -124,7 +124,7 @@ KERNEL_CROSS=$(TARGET_CROSS) else TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) -TOOLCHAIN_DIR=$(BASE_DIR)/toolchain +TOOLCHAIN_DIR=$(OUTPUT_DIR)/toolchain TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX) IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
Signature · 1 line
1.6.3.3
PATCH 1/1 Rename BASE_DIR to OUTPUT_DIR
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Roth <[email protected]> writes:
Michael> To reflect the new output directory hierarchy rename the Makefile Michael> variable BASE_DIR to OUTPUT_DIR.
Michael> Signed-off-by: Michael Roth <[email protected]>
Hmm, this will presumably break downloads for people trying to reuse their existing .config? (E.G. DL_DIR gets to point to /dl).
I agree that BASE_DIR isn't the most telling name for what it does, but I'm not sure it's worth the trouble.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 Rename BASE_DIR to OUTPUT_DIR
Am Wednesday 23 September 2009 12:22:03 schrieb Peter Korsgaard:
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Roth <[email protected]> writes:
Michael> To reflect the new output directory hierarchy rename the
MakefileMichael> variableBASE_DIRtoOUTPUT_DIR.Michael> Signed-off-by: Michael Roth <[email protected]>
Hmm, this will presumably break downloads for people trying to reuse their existing .config? (E.G.
DL_DIRgets to point to /dl).
Hmm... Yes, I think you're right.
Quoted 2 lines
I agree that
BASE_DIRisn't the most telling name for what it does, but I'm not sure it's worth the trouble.
OTOH: The introduced change to the directory hierarchy "broke" the download directory from '$(TOPDIR)/dl' to '$(TOPDIR)/output/dl'.
Maybe the directory hierarchy change introduced some other inconvenience so maybe a big fat warning that some things changed in the documentation is the way to go?
Or, maybe a hook in 'make oldconfig' could fix that?
Michael Roth
PATCH 1/1 Rename BASE_DIR to OUTPUT_DIR
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Roth <[email protected]> writes:
Hi,
Quoted 2 lines
Quoted 2 lines
Hmm, this will presumably break downloads for people trying to reuse their existing .config? (E.G.
DL_DIRgets to point to /dl).
Michael> Hmm... Yes, I think you're right.
Quoted 2 lines
Quoted 2 lines
I agree that
BASE_DIRisn't the most telling name for what it does, but I'm not sure it's worth the trouble.
Michael> OTOH: The introduced change to the directory hierarchy "broke" Michael> the download directory from '$(TOPDIR)/dl' to Michael> '$(TOPDIR)/output/dl'.
Yes, but the difference is that that change didn't cause a build failure, only a slight inconvenience.
The same with staging moving from build_*/staging_dir -> staging, the old location still works.
Michael> Maybe the directory hierarchy change introduced some other Michael> inconvenience so maybe a big fat warning that some things Michael> changed in the documentation is the way to go?
Yes, we'll probably need that anyway.
Michael> Or, maybe a hook in 'make oldconfig' could fix that?
I would prefer to not add extra code complexity for this (relative minor) cleanup.
Signature · 1 line
Bye, Peter Korsgaard