[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-700-g8b1b0fb

[Gwenhael Goavec-M. <gwe...@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  8b1b0fb0aebf8b6599049ecdb917bfb8072f438b (commit)
       via  d2bc3f984d619345b27c09e7c2d11ae94b9765c3 (commit)
      from  bf65ff6e0b4488bc52b2400a4d1810084099f205 (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 8b1b0fb0aebf8b6599049ecdb917bfb8072f438b
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Wed Apr 15 11:47:19 2015 +0200

    use ARMADEUS_DL_DIR (defined in Makefile.in) instead of BUILDROOT_DL_DIR (obsolete with recent buildroot)

commit d2bc3f984d619345b27c09e7c2d11ae94b9765c3
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Wed Apr 15 11:47:11 2015 +0200

    fix problem with env BR2_DL_DIR not used

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

Summary of changes:
 Makefile    |    4 ++--
 Makefile.in |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 77f519e..f682d01 100644
--- a/Makefile
+++ b/Makefile
@@ -37,10 +37,10 @@ ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
 BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
 #BUILDROOT_DIR is defined in ./Makefile.in
 PATCH_DIR = patches
-ifeq ($(BUILDROOT_DL_DIR),)
+ifeq ($(ARMADEUS_DL_DIR),)
 BUILDROOT_FILE_PATH:=downloads
 else
-BUILDROOT_FILE_PATH:=$(BUILDROOT_DL_DIR)
+BUILDROOT_FILE_PATH:=$(ARMADEUS_DL_DIR)
 endif
 TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore --strip-component=1 -xf
 BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/support/scripts/apply-patches.sh
diff --git a/Makefile.in b/Makefile.in
index c4bcbb3..7153ff9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,8 @@ else
 endif
 
 -include $(BUILDROOT_DIR)/.config
+# avoid to lost env variable because .config contains BR2_DL_DIR
+BR2_DL_DIR = $(ARMADEUS_DL_DIR)
 
 ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
 ARMADEUS_LINUX_MAIN_VERSION:=$(shell echo $(ARMADEUS_LINUX_VERSION) | cut -d . -f 1-3)


hooks/post-receive
-- 
armadeus