[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-385-gb7bca5e

[Julien B a. A. <ar...@sf...>]

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  b7bca5e486ae5a9dab8b59d69f7a36ebcff86411 (commit)
      from  88fa93ac39de51e719a4ba41d4df0109f54ea20b (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 b7bca5e486ae5a9dab8b59d69f7a36ebcff86411
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Feb 21 18:09:15 2018 +0100

    [TOOLS] Fixes scripts/quiltify.sh for U-Boot with given PATH_DIR in BR

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

Summary of changes:
 Makefile.in         | 7 +++++++
 scripts/quiltify.sh | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8f3a198..b9e5bcd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,8 +86,15 @@ ARMADEUS_LINUX_PATCH_DIR = $(shell echo $(BUILDROOT_DIR)/$(TEMP_LINUX_PATCH_DIR)
 else
 ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
 endif
+
 ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
+ifneq ($(BR2_TARGET_UBOOT_PATCH),"")
+TEMP_U_BOOT_PATCH_DIR = $(shell echo $(BR2_TARGET_UBOOT_PATCH) | rev | cut -d " " -f 1 | rev)
+ARMADEUS_U_BOOT_PATCH_DIR = $(shell echo $(BUILDROOT_DIR)/$(TEMP_U_BOOT_PATCH_DIR))
+else
 ARMADEUS_U_BOOT_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/u-boot/$(ARMADEUS_U_BOOT_VERSION)
+endif
+
 ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
 ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
 ifneq ($(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE),)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 2bdb160..7a57ec3 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -74,11 +74,10 @@ elif [ "$answer" == "U-Boot" ]; then
 		QUILT_POST_PATCH_HOOK="cp -pf $ARMADEUS_U_BOOT_CONFIG $ARMADEUS_U_BOOT_DIR/include/configs/"$ARMADEUS_U_BOOT_BOARD_NAME".h"
 	fi
 	QUILT_TARGET_DIR=$ARMADEUS_U_BOOT_DIR
+	QUILT_TARGET_PATCH_DIR=$ARMADEUS_U_BOOT_PATCH_DIR
 	if [ "$ARMADEUS_U_BOOT_VERSION" == "custom" ]; then
-		QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/u-boot/$ARMADEUS_U_BOOT_CUSTOM_VERSION
 		QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_CUSTOM_VERSION"
 	else
-		QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/u-boot/$ARMADEUS_U_BOOT_VERSION
 		QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_VERSION"
 	fi
 else
@@ -178,6 +177,12 @@ if [ "$?" != 0 ]; then
 fi
 
 # Import patches
+
+if [ ! -d "$QUILT_TARGET_PATCH_DIR" ]; then
+	echo "Patches dir ($QUILT_TARGET_PATCH_DIR) doesn't exist: exiting..."
+	exit 1
+fi
+
 pushd $QUILT_TARGET_DIR
 if [ "$?" != 0 ]; then
 	echo "Please correct that ($QUILT_TARGET_DIR)"


hooks/post-receive
-- 
armadeus