[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-707-g0d6da68

[Julien B a. A. <ar...@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  0d6da68b255bcc8e5394dc4ee9ea22aba2448404 (commit)
       via  5504073dd52b2a64d11ead2694c1c58483eeacf1 (commit)
      from  384d99c7e7ab221292a10b4e77b453c1364766cf (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 0d6da68b255bcc8e5394dc4ee9ea22aba2448404
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Apr 21 10:56:10 2015 +0200

    [BUILDROOT] Fixes ARMADEUS_DL_DIR (again)

commit 5504073dd52b2a64d11ead2694c1c58483eeacf1
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Apr 17 15:22:19 2015 +0200

    [BUILDROOT] All APF6 defconfigs: add BR2_DL_DIR definition

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

Summary of changes:
 Makefile                                    |    6 +++---
 Makefile.in                                 |    7 +++----
 buildroot/configs/apf6_defconfig            |    1 +
 buildroot/configs/apf6failsafe_defconfig    |    1 +
 buildroot/configs/apf6legacy_defconfig      |    1 +
 buildroot/configs/apf6mediacenter_defconfig |    1 +
 buildroot/configs/apf6xenomai_defconfig     |    1 +
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index f682d01..9166a72 100644
--- a/Makefile
+++ b/Makefile
@@ -38,11 +38,11 @@ BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
 #BUILDROOT_DIR is defined in ./Makefile.in
 PATCH_DIR = patches
 ifeq ($(ARMADEUS_DL_DIR),)
-BUILDROOT_FILE_PATH:=downloads
+BUILDROOT_FILE_PATH = $(BUILDROOT_DIR)/downloads
 else
-BUILDROOT_FILE_PATH:=$(ARMADEUS_DL_DIR)
+BUILDROOT_FILE_PATH = $(ARMADEUS_DL_DIR)
 endif
-TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore --strip-component=1 -xf
+TAR_OPTIONS = --exclude=.svn --exclude=.git --exclude=.gitignore --strip-component=1 -xf
 BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/support/scripts/apply-patches.sh
 ARMADEUS_ENV_FILE:=$(ARMADEUS_TOPDIR)/armadeus_env.sh
 WGET = wget --passive-ftp --tries=3
diff --git a/Makefile.in b/Makefile.in
index f346531..381b271 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,8 +8,8 @@ ifeq ($(ARMADEUS_BASE_DIR),)
 ARMADEUS_BASE_DIR:=$(shell pwd)
 endif
 
-BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
-BASE_DIR := $(ARMADEUS_BASE_DIR)/buildroot/output
+BUILDROOT_DIR = $(ARMADEUS_BASE_DIR)/buildroot
+BASE_DIR = $(BUILDROOT_DIR)/output
 
 ifneq ($(BUILDROOT_DL_DIR),)
 # To be removed with BR 2014.02
@@ -18,10 +18,9 @@ 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);$(BUILDROOT_DIR);')
+ ARMADEUS_DL_DIR := $(shell grep "BR2_DL_DIR=" $(BUILDROOT_DIR)/.config 2>/dev/null | cut -d \" -f 2 | sed 's;$$(BASE_DIR);$(BASE_DIR);')
  endif
 endif
-ARMADEUS_DL_DIR:=$(shell echo $(ARMADEUS_DL_DIR))
 
 -include $(BUILDROOT_DIR)/.config
 # avoid to lost env variable because .config contains BR2_DL_DIR
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index c1219e9..0cf45c9 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_ARM_EABIHF=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_VFPV3D16=y
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index f0f88d8..c00ef5a 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_GENERIC_HOSTNAME="apf6"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index a0fa5fb..f833f1e 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_ARM_EABIHF=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_VFPV3D16=y
diff --git a/buildroot/configs/apf6mediacenter_defconfig b/buildroot/configs/apf6mediacenter_defconfig
index 2f62546..cdfbb6d 100644
--- a/buildroot/configs/apf6mediacenter_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_ARM_EABIHF=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_VFPV3D16=y
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6xenomai_defconfig
index 0a66c83..0c9a433 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_ARM_EABIHF=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_VFPV3D16=y


hooks/post-receive
-- 
armadeus