[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-95-g8de304b61

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  8de304b612a44d32b58ef55d3d5a7eed54e96798 (commit)
      from  f781a85459cbd8c7bb4cb0a914ccc2ee9f7cb92d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8de304b612a44d32b58ef55d3d5a7eed54e96798
Author: Sébastien Szymanski <seb...@ar...>
Date:   Wed Jul 10 14:34:49 2019 +0200

    [BSP] Add support for custom output directory
    
    BR supports building out of tree with O= command line variable.

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6cecc24ee..ea99edd3a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,13 @@ ARMADEUS_BASE_DIR:=$(shell pwd)
 endif
 
 BUILDROOT_DIR = $(ARMADEUS_BASE_DIR)/buildroot
-BASE_DIR = $(BUILDROOT_DIR)/output
+ifneq ("$(origin O)", "command line")
+BASE_DIR := $(BUILDROOT_DIR)/output
+BUILDROOT_CONFIG_DIR := $(BUILDROOT_DIR)
+else
+BASE_DIR := $(patsubst %/,%,$(patsubst %.,%,$(O)))
+BUILDROOT_CONFIG_DIR := $(BASE_DIR)
+endif
 
 ifneq ($(BUILDROOT_DL_DIR),)
 # To be removed with BR 2014.02
@@ -18,11 +24,11 @@ else
  ifneq ($(BR2_DL_DIR),)
  ARMADEUS_DL_DIR := $(BR2_DL_DIR)
  else
- ARMADEUS_DL_DIR := $(shell grep "BR2_DL_DIR=" $(BUILDROOT_DIR)/.config 2>/dev/null | cut -d \" -f 2 | sed 's;$$(BASE_DIR);$(BASE_DIR);')
+ ARMADEUS_DL_DIR := $(shell grep "BR2_DL_DIR=" $(BUILDROOT_CONFIG_DIR)/.config 2>/dev/null | cut -d \" -f 2 | sed 's;$$(BASE_DIR);$(BASE_DIR);')
  endif
 endif
 
--include $(BUILDROOT_DIR)/.config
+-include $(BUILDROOT_CONFIG_DIR)/.config
 # avoid to lost env variable because .config contains BR2_DL_DIR
 BR2_DL_DIR = $(ARMADEUS_DL_DIR)
 
@@ -66,14 +72,14 @@ ARMADEUS_QT_VERSION:=QT_NOT_INSTALLED
 endif
 
 ARMADEUS_PATCH_DIR=$(ARMADEUS_BASE_DIR)/patches
-BUILDROOT_OUTPUT_DIR:=$(BUILDROOT_DIR)/output
+BUILDROOT_OUTPUT_DIR:=$(BASE_DIR)
 BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/build
 BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/toolchain
 BUILDROOT_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/build
 ifneq ($(BR2_HOST_DIR),)
 BUILDROOT_HOST_DIR:=$(shell echo $(BR2_HOST_DIR))
 else
-BUILDROOT_HOST_DIR:=$(BUILDROOT_DIR)/output/host
+BUILDROOT_HOST_DIR:=$(BUILDROOT_OUTPUT_DIR)/host
 endif
 ARMADEUS_BINARIES:=$(BUILDROOT_OUTPUT_DIR)/images
 ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_OUTPUT_DIR)/target


hooks/post-receive
-- 
armadeus