Commit 3b2a803d authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent fd3800c1

Config.in

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ source "target/device/Config.in.mirrors" 


config BR2_STAGING_DIR

	string "Toolchain and header file location?"

	default "$(BUILD_DIR)/staging_dir"

	default "$(BASE_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

	  "$(BUILD_DIR)/staging_dir".

	  "$(BASE_DIR)/staging".



config BR2_FPU_SUFFIX

	bool "Add '_nofpu' suffix for softfloat toolchains"

Makefile

+5 −5
Original line number Diff line number Diff line
@@ -235,20 +235,20 @@ ifeq ($(DL_DIR),) 
DL_DIR:=$(BASE_DIR)/dl

endif



BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)$(ARCH_FPU_SUFFIX)

BUILD_DIR:=$(BASE_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:=$(BUILD_DIR)/host_dir

HOST_DIR:=$(BASE_DIR)/host



# stamp (dependency) files go here

STAMP_DIR:=$(BUILD_DIR)/stamps

STAMP_DIR:=$(BASE_DIR)/stamps



BINARIES_DIR:=$(BASE_DIR)/binaries/

TARGET_DIR:=$(BUILD_DIR)/target_dir

BINARIES_DIR:=$(BASE_DIR)/images

TARGET_DIR:=$(BASE_DIR)/target



# define values for prepatched source trees for toolchains

VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE))

package/Makefile.in

+2 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ COND_ARCH_FPU_SUFFIX:= 
endif



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.

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

TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))

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_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)

TOOL_BUILD_DIR=$(BASE_DIR)/toolchain

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).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)