[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-106-g36e7f11

[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  36e7f11158f76025d90f70ec386339f76859357a (commit)
      from  050ee0089799d7dc926805edf0f1bbdc7acd673f (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 36e7f11158f76025d90f70ec386339f76859357a
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Feb 11 13:17:40 2014 +0100

    [BUILD] Fixes quiltify when used with customs BR2_DL_DIR

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

Summary of changes:
 Makefile            |    3 +--
 Makefile.in         |   12 ++++++++++++
 scripts/quiltify.sh |    4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b7019bd..23307b9 100644
--- a/Makefile
+++ b/Makefile
@@ -221,8 +221,7 @@ shell_env:
 	@echo ARMADEUS_BSP_VERSION=$(ARMADEUS_BSP_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_BOARD_NAME=$(ARMADEUS_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_U_BOOT_BOARD_NAME=$(ARMADEUS_U_BOOT_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
-	@echo ARMADEUS_DL_DIR=$(BR2_DL_DIR) >> $(ARMADEUS_ENV_FILE)
-
+	@echo ARMADEUS_DL_DIR=$(ARMADEUS_DL_DIR) >> $(ARMADEUS_ENV_FILE)
 
 PHONY_TARGETS+=dummy all linux linux-clean buildroot-clean buildroot-dirclean
 PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config shell_env buildroot-sources buildroot-unpacked
diff --git a/Makefile.in b/Makefile.in
index 1eebf88..0aad68b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,18 @@ ARMADEUS_BASE_DIR:=$(shell pwd)
 endif
 
 BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
+
+ifneq ($(BUILDROOT_DL_DIR),)
+# To be removed with BR 2014.02
+ARMADEUS_DL_DIR := $(BUILDROOT_DL_DIR)
+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);')
+ endif
+endif
+
 -include $(BUILDROOT_DIR)/.config
 
 ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 59c210c..9d4c6bc 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -172,9 +172,9 @@ if [ "$QUILT_TARGET_NAME" == "Linux kernel" ]; then
 	# Revert list order:
 	LINUX_PATCHES=`echo $LINUX_PATCHES | tac -s' '`
 	for patch_source in $LINUX_PATCHES; do
-		patch_source=`echo $patch_source | cut -d / -f 5`
+		patch_source=`echo $patch_source | sed 's#ftp://ftp2.armadeus.com/armadeusw/##g'`
 		if [ -f "$ARMADEUS_DL_DIR/$patch_source" ]; then
-			echo "--- $patch_source is an archive"
+			echo "--- $ARMADEUS_DL_DIR/$patch_source is an archive"
 			quilt import $ARMADEUS_DL_DIR/$patch_source
 		fi
 	done


hooks/post-receive
-- 
armadeus