From 397fe5cc0b091c997794d755d27a72848ad210ea Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Sep 2009 15:49:30 +0200 Subject: Remove the "project" feature The "project" feature was designed to allow to several projects to be built inside the same Buildroot source tree and allowing the toolchain and non-configurable packages to be shared between the different projects on the same architecture. While being interesting in theory, this feature adds a level of complexity to Buildroot, both from an user perspective and from a developer perspective, while one of the main Buildroot strengh is to be simple. Moreover, this feature is only seldomly used by our users. From a user-level perspective, this for example allows to remove the project_build_ARCH directory, which was very confusing. The autotools-stamps directory is also removed, since these stamps are back at their normal location. Description of the changes involved : * project/, directory removed * Makefile - Don't include project/Makefile.in and project/project.mk anymore - Grab a copy of the contents of project/Makefile.in at the location it was imported, but remove the definition related to PROJECT_BUILD_DIR. The TARGET_DIR is now in $(BUILD_DIR)/target_dir - Remove the creation/removal of the $(PROJECT_BUILD_DIR) and $(PROJECT_BUILD_DIR)/autotools-stamps directories - Don't make world depends on target-host-info. This target was defined by project/project.mk to customize /etc/issue, /etc/hostname and create /etc/br-version depending on the project definitions. We can of course imagine re-adding such a feature later. - Replace PROJECT_BUILD_DIR by BUILD_DIR everywhere - Remove the update, log and lognr.$(PROJECT) target, they were specific to the project feature. * package/Makefile.autotools.in - Replace PROJECT_BUILD_DIR by BUILD_DIR for the location of the configure cache - Move the INSTALL_TARGET and HOOK_POST_INSTALL stamps to the same directory as the other stamps (i.e, in the package directory). * package/Makefile.in - Replace PROJECT_BUILD_DIR by BUILD_DIR for the location of the configure cache * package/at/at.mk, package/busybox/busybox.mk, package/busybox/initramfs.mk, package/customize/customize.mk, package/linux-fusion/linux-fusion.mk, package/ltp-testsuite/ltp-testsuite.mk, package/nfs-utils/nfs-utils.mk, target/cpio/cpioroot.mk, target/cramfs/cramfs.mk, target/device/Atmel/DataFlashBoot/DataflashBoot.mk, target/device/Atmel/Makefile.in, target/device/Atmel/at91bootstrap/at91bootstrap.mk, target/device/KwikByte/Makefile.in, target/ext2/ext2root.mk, target/initramfs/initramfs.mk, target/iso9660/iso9660.mk, target/jffs2/jffs2root.mk, target/linux/Makefile.in, target/romfs/romfs.mk, target/squashfs/squashfsroot.mk, target/tar/tarroot.mk, target/ubifs/ubifsroot.mk - Replace PROJECT_BUILD_DIR by BUILD_DIR * target/device/Config.in - Do not include project/Config.in anymore * target/linux/Makefile.in.advanced - Replace PROJECT_BUILD_DIR by BUILD_DIR - Store the stamps file in $(STAMP_DIR) instead of $(PROJECT_BUILD_DIR)/autotools-stamps * target/u-boot/Makefile.in - Replace PROJECT_BUILD_DIR by BUILD_DIR - Remove $(PROJECT) from the U-Boot target binary name - Remove the insertion in the configuration of the project name as the hostname - The u-boot-autoscript target now generates $(U_BOOT_AUTOSCRIPT).img instead of $(U_BOOT_AUTOSCRIPT).$(PROJECT) * toolchain/gcc/gcc-uclibc-3.x.mk toolchain/gcc/gcc-uclibc-4.x.mk - Move the stamps files to $(STAMP_DIR) Signed-off-by: Thomas Petazzoni --- Makefile | 115 +++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 82 insertions(+), 33 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f2e349f27..8adaff4c4 100644 --- a/Makefile +++ b/Makefile @@ -217,10 +217,76 @@ BASE_TARGETS:=uclibc endif TARGETS:= -# setup our paths -include project/Makefile.in +# Strip off the annoying quoting +ARCH:=$(call qstrip,$(BR2_ARCH)) +ifeq ($(ARCH),xtensa) +ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name)) +endif +WGET:=$(call qstrip,$(BR2_WGET)) $(SPIDER) $(QUIET) +SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET) +SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET) +BZR_CO:=$(call qstrip,$(BR2_BZR_CO)) $(QUIET) +BZR_UP:=$(call qstrip,$(BR2_BZR_UP)) $(QUIET) +GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET) +ZCAT:=$(call qstrip,$(BR2_ZCAT)) +BZCAT:=$(call qstrip,$(BR2_BZCAT)) +TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf + +# Buildroot supports building out of tree similarly to the Linux kernel. +# To use, add O= to the make command line (make O=/tmp/build) +BASE_DIR:=$(shell pwd) +ifdef O +ifeq ("$(origin O)", "command line") +BASE_DIR := $(shell mkdir -p $(O) && cd $(O) && pwd) +$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) + +# other packages might also support Linux-style out of tree builds +# with the O= syntax (E.G. Busybox does). As make automatically +# forwards command line variable definitions those packages get very +# confused. Fix this by telling make to not do so +MAKEOVERRIDES = +endif +endif + +TOPDIR_PREFIX:=$(call qstrip,$(BR2_TOPDIR_PREFIX))_ +TOPDIR_SUFFIX:=_$(call qstrip,$(BR2_TOPDIR_SUFFIX)) +ifeq ($(TOPDIR_PREFIX),_) +TOPDIR_PREFIX:= +endif +ifeq ($(TOPDIR_SUFFIX),_) +TOPDIR_SUFFIX:= +endif + +DL_DIR=$(call qstrip,$(BR2_DL_DIR)) +ifeq ($(DL_DIR),) +DL_DIR:=$(BASE_DIR)/dl +endif + +BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) -BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config +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 + +# stamp (dependency) files go here +STAMP_DIR:=$(BUILD_DIR)/stamps + +BINARIES_DIR:=$(BASE_DIR)/binaries/ +TARGET_DIR:=$(BUILD_DIR)/target_dir + +# define values for prepatched source trees for toolchains +VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE)) +VENDOR_SUFFIX:=$(call qstrip,$(BR2_VENDOR_SUFFIX)) +VENDOR_BINUTILS_RELEASE:=$(call qstrip,$(BR2_VENDOR_BINUTILS_RELEASE)) +VENDOR_GCC_RELEASE:=$(call qstrip,$(BR2_VENDOR_GCC_RELEASE)) +VENDOR_UCLIBC_RELEASE:=$(call qstrip,$(BR2_VENDOR_UCLIBC_RELEASE)) +VENDOR_GDB_RELEASE:=$(call qstrip,$(BR2_VENDOR_GDB_RELEASE)) +VENDOR_PATCH_DIR:=$(call qstrip,$(BR2_VENDOR_PATCH_DIR)) + +BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config include toolchain/Makefile.in include package/Makefile.in @@ -237,8 +303,6 @@ all: world # In this section, we need .config include .config.cmd -include project/*.mk - # We also need the various per-package makefiles, which also add # each selected package to TARGETS if that package was selected # in the .config file. @@ -290,20 +354,18 @@ $(BR2_DEPENDS_DIR): .config cp -dpRf $(CONFIG)/buildroot-config $@ dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ - $(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \ - $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR) + $(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(BASE_TARGETS): dirs -world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL) +world: dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL) .PHONY: all world dirs clean dirclean distclean source \ $(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \ $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \ $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ - $(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \ - $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR) + $(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR) ############################################################# # @@ -311,8 +373,7 @@ world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL) # dependencies anywhere else # ############################################################# -$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(PROJECT_BUILD_DIR) \ - $(PROJECT_BUILD_DIR)/autotools-stamps $(BINARIES_DIR) $(STAMP_DIR): +$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR): @mkdir -p $@ $(STAGING_DIR): @@ -330,7 +391,7 @@ endif endif @mkdir -p $(STAGING_DIR)/usr/include -$(PROJECT_BUILD_DIR)/.root: +$(BUILD_DIR)/.root: mkdir -p $(TARGET_DIR) if ! [ -d "$(TARGET_DIR)/bin" ]; then \ if [ -d "$(TARGET_SKELETON)" ]; then \ @@ -345,10 +406,10 @@ $(PROJECT_BUILD_DIR)/.root: -find $(TARGET_DIR) -type f -name .empty -print0 | xargs -0 rm -rf touch $@ -$(TARGET_DIR): $(PROJECT_BUILD_DIR)/.root +$(TARGET_DIR): $(BUILD_DIR)/.root erase-fakeroots: - rm -f $(PROJECT_BUILD_DIR)/.fakeroot* + rm -f $(BUILD_DIR)/.fakeroot* target-finalize: ifeq ($(BR2_HAVE_DEVFILES),y) @@ -372,7 +433,7 @@ ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"") endif ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) -LOCALE_WHITELIST=$(PROJECT_BUILD_DIR)/locales.nopurge +LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge LOCALE_NOPURGE=$(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST)) target-purgelocales: @@ -403,21 +464,21 @@ external-deps: # ############################################################# clean: $(TARGETS_CLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR) + rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(BUILD_DIR)/.root $(STAMP_DIR) dirclean: $(TARGETS_DIRCLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR) + rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(BUILD_DIR)/.root $(STAMP_DIR) distclean: ifeq ($(DL_DIR),$(BASE_DIR)/dl) rm -rf $(DL_DIR) endif - rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) \ + rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(BUILD_DIR) $(BINARIES_DIR) \ .config.cmd $(MAKE) -C $(CONFIG) clean sourceball: - rm -rf $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) + rm -rf $(BUILD_DIR) $(BUILD_DIR) $(BINARIES_DIR) set -e; \ cd ..; \ rm -f buildroot.tar.bz2; \ @@ -530,28 +591,16 @@ distclean: clean endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y) flush: - rm -f $(PROJECT_BUILD_DIR)/tgt-config.cache + rm -f $(BUILD_DIR)/tgt-config.cache %_defconfig: $(CONFIG)/conf cp $(shell find ./target/ -name $@) .config -@$(MAKE) oldconfig -update: - cp .config $(BOARD_PATH)/$(PROJECT)_defconfig - configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config prepatch: gcc-patched binutils-patched gdb-patched uclibc-patched -.lognr.$(PROJECT): - @echo "0" > .lognr.$(PROJECT) - -log: .lognr.$(PROJECT) - @expr `cat .lognr.$(PROJECT)` + 1 > .lognr.$(PROJECT) - @echo Creating $(PROJECT)-`cat .lognr.$(PROJECT)`.log - @$(MAKE) > $(PROJECT)-`cat .lognr.$(PROJECT)`.log 2>&1 - - cross: $(BASE_TARGETS) help: -- cgit v1.2.3 From 18183726d4ab327b217a9ead3a8e88cb434257f6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 31 Jul 2009 10:19:50 +0200 Subject: Remove the BOARD/LOCAL feature This can be achieved by adding a new target in target/device/, and I will later propose a mechanism to add external boards and packages, so that our users not willing to get their target-specific or package-specific things merged can keep them cleanly separated from Buildroot tree. Signed-off-by: Thomas Petazzoni --- Makefile | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8adaff4c4..cfa57788c 100644 --- a/Makefile +++ b/Makefile @@ -32,14 +32,6 @@ noconfig_targets:=menuconfig xconfig config oldconfig randconfig \ defconfig allyesconfig allnoconfig release tags \ source-check help - -# Use shell variables, if defined -ifneq ($(BUILDROOT_LOCAL),) -BR2_LOCAL:=$(BUILDROOT_LOCAL) -else -BR2_LOCAL:=$(TOPDIR)/local -endif - # Strip quotes and then whitespaces qstrip=$(strip $(subst ",,$(1))) #")) @@ -52,20 +44,13 @@ space:=$(empty) $(empty) # $(shell find . -name *_defconfig |sed 's/.*\///') # Pull in the user's configuration file ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) -ifeq ($(BOARD),) -# if "make BOARD=xyz" command -include .config -else -# if "make" command --include $(BR2_LOCAL)/$(BOARD)/$(BOARD).config -endif endif # Override BR2_DL_DIR if shell variable defined ifneq ($(BUILDROOT_DL_DIR),) BR2_DL_DIR:=$(BUILDROOT_DL_DIR) endif -LOCAL:=$(BR2_LOCAL) # To put more focus on warnings, be less verbose as default # Use 'make V=1' to see the full commands -- cgit v1.2.3 From a07d6b9d56955bfe0165b5f4ea6d3ed7a92ecff6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 31 Jul 2009 10:24:32 +0200 Subject: By default, put the output in an output/ directory Instead of putting all the build-related stuff as a mess in the Buildroot sources, group them in an output/ directory. Signed-off-by: Thomas Petazzoni --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cfa57788c..8b07786bb 100644 --- a/Makefile +++ b/Makefile @@ -217,21 +217,18 @@ ZCAT:=$(call qstrip,$(BR2_ZCAT)) BZCAT:=$(call qstrip,$(BR2_BZCAT)) TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf -# Buildroot supports building out of tree similarly to the Linux kernel. -# To use, add O= to the make command line (make O=/tmp/build) -BASE_DIR:=$(shell pwd) -ifdef O -ifeq ("$(origin O)", "command line") -BASE_DIR := $(shell mkdir -p $(O) && cd $(O) && pwd) -$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) - +ifneq ("$(origin O)", "command line") +O:=output +else # other packages might also support Linux-style out of tree builds # with the O= syntax (E.G. Busybox does). As make automatically # forwards command line variable definitions those packages get very # confused. Fix this by telling make to not do so MAKEOVERRIDES = endif -endif + +BASE_DIR := $(shell mkdir -p $(O) && cd $(O) && pwd) +$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) TOPDIR_PREFIX:=$(call qstrip,$(BR2_TOPDIR_PREFIX))_ TOPDIR_SUFFIX:=_$(call qstrip,$(BR2_TOPDIR_SUFFIX)) -- cgit v1.2.3 From fd3800c1979d9d76e2c4f802c2d279290c102218 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 31 Jul 2009 10:26:28 +0200 Subject: Remove BR2_TOPDIR_PREFIX and BR2_TOPDIR_SUFFIX The same effect can be done using out-of-tree build with O= Signed-off-by: Thomas Petazzoni --- Config.in | 18 ------------------ Makefile | 11 +---------- package/Makefile.in | 6 +++--- 3 files changed, 4 insertions(+), 31 deletions(-) (limited to 'Makefile') diff --git a/Config.in b/Config.in index 146bb17a8..257364396 100644 --- a/Config.in +++ b/Config.in @@ -106,24 +106,6 @@ config BR2_FPU_SUFFIX the "_nofpu" suffix will be added to the toolchain build directory name and to any rootfs image name -config BR2_TOPDIR_PREFIX - string "Custom build dir prefix" - default "" - help - Add a custom string to the beginning of the build directories. - - build_ARCH -> [PREFIX]_build_ARCH - toolchain_build_ARCH -> [PREFIX]_toolchain_build_ARCH - -config BR2_TOPDIR_SUFFIX - string "Custom build dir suffix" - default "" - help - Add a custom string to the end of the build directories. - - build_ARCH -> build_ARCH_[SUFFIX] - toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX] - config BR2_GNU_BUILD_SUFFIX string "GNU build hostname suffix" default "pc-linux-gnu" diff --git a/Makefile b/Makefile index 8b07786bb..d49320046 100644 --- a/Makefile +++ b/Makefile @@ -230,21 +230,12 @@ endif BASE_DIR := $(shell mkdir -p $(O) && cd $(O) && pwd) $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) -TOPDIR_PREFIX:=$(call qstrip,$(BR2_TOPDIR_PREFIX))_ -TOPDIR_SUFFIX:=_$(call qstrip,$(BR2_TOPDIR_SUFFIX)) -ifeq ($(TOPDIR_PREFIX),_) -TOPDIR_PREFIX:= -endif -ifeq ($(TOPDIR_SUFFIX),_) -TOPDIR_SUFFIX:= -endif - DL_DIR=$(call qstrip,$(BR2_DL_DIR)) ifeq ($(DL_DIR),) DL_DIR:=$(BASE_DIR)/dl endif -BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) +BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)$(ARCH_FPU_SUFFIX) GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX)) diff --git a/package/Makefile.in b/package/Makefile.in index 0ae5bdbea..093108dbd 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -112,7 +112,7 @@ COND_ARCH_FPU_SUFFIX:= endif ifeq ($(BR2_TOOLCHAIN_SOURCE),y) -TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) +TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX) # 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,8 @@ 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)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) +#TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) +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)" #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX) IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX) -- cgit v1.2.3 From 3b2a803d2842e45a28b58afde6835dc40edb4c52 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 31 Jul 2009 10:31:39 +0200 Subject: 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 --- Config.in | 4 ++-- Makefile | 10 +++++----- package/Makefile.in | 5 ++--- 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Config.in b/Config.in index 257364396..9897a1754 100644 --- a/Config.in +++ b/Config.in @@ -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" diff --git a/Makefile b/Makefile index d49320046..c7697c982 100644 --- a/Makefile +++ b/Makefile @@ -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)) diff --git a/package/Makefile.in b/package/Makefile.in index 093108dbd..1c2192488 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -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) -- cgit v1.2.3