Rename the output directories

In the output directory, we now have

 - build/    where all the packages are built
 - images/   where the final kernel and rootfs images are stored
 - staging/  the staging directory (containing the development files
             and libraries compiled for the target)
 - target/   which contains the target root filesystem
 - host/     which contains all the host programs
 - stamps/   which contains the stamps files

Therefore, the build_ARCH and toolchain_build_ARCH have been
removed. People willing to use the same Buildroot sources to compile
for different architectures are invited to use the O= command line
option for out-of-tree compilation.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2009-07-31 10:31:39 +02:00
parent fd3800c197
commit 3b2a803d28
3 changed files with 9 additions and 10 deletions

View File

@ -88,7 +88,7 @@ source "target/device/Config.in.mirrors"
config BR2_STAGING_DIR config BR2_STAGING_DIR
string "Toolchain and header file location?" string "Toolchain and header file location?"
default "$(BUILD_DIR)/staging_dir" default "$(BASE_DIR)/staging"
help help
This is the location where the toolchain will be installed. The This is the location where the toolchain will be installed. The
toolchain will not work if it is moved from this location. toolchain will not work if it is moved from this location.
@ -97,7 +97,7 @@ config BR2_STAGING_DIR
will be used. will be used.
Most people will leave this set to the default value of Most people will leave this set to the default value of
"$(BUILD_DIR)/staging_dir". "$(BASE_DIR)/staging".
config BR2_FPU_SUFFIX config BR2_FPU_SUFFIX
bool "Add '_nofpu' suffix for softfloat toolchains" bool "Add '_nofpu' suffix for softfloat toolchains"

View File

@ -235,20 +235,20 @@ ifeq ($(DL_DIR),)
DL_DIR:=$(BASE_DIR)/dl DL_DIR:=$(BASE_DIR)/dl
endif endif
BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)$(ARCH_FPU_SUFFIX) BUILD_DIR:=$(BASE_DIR)/build
GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX)) GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX))
STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR)) STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR))
# packages compiled for the host goes here # packages compiled for the host goes here
HOST_DIR:=$(BUILD_DIR)/host_dir HOST_DIR:=$(BASE_DIR)/host
# stamp (dependency) files go here # stamp (dependency) files go here
STAMP_DIR:=$(BUILD_DIR)/stamps STAMP_DIR:=$(BASE_DIR)/stamps
BINARIES_DIR:=$(BASE_DIR)/binaries/ BINARIES_DIR:=$(BASE_DIR)/images
TARGET_DIR:=$(BUILD_DIR)/target_dir TARGET_DIR:=$(BASE_DIR)/target
# define values for prepatched source trees for toolchains # define values for prepatched source trees for toolchains
VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE)) VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE))

View File

@ -112,7 +112,7 @@ COND_ARCH_FPU_SUFFIX:=
endif endif
ifeq ($(BR2_TOOLCHAIN_SOURCE),y) ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX) TOOL_BUILD_DIR=$(BASE_DIR)/toolchain
# Quotes are needed for spaces et al in path components. # Quotes are needed for spaces et al in path components.
TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)" TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
@ -124,8 +124,7 @@ KERNEL_CROSS=$(TARGET_CROSS)
else else
TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
#TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) TOOL_BUILD_DIR=$(BASE_DIR)/toolchain
TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)
TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX) #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX) IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)