[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-57-g97dda63

[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  97dda632b2207df99509ab9ec5db26d1280ef073 (commit)
      from  f583020f5869d12d86e81e58b0f7b23670d74c47 (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 97dda632b2207df99509ab9ec5db26d1280ef073
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Nov 22 18:16:36 2012 +0100

    [BUILD] Refine some APF28 specific hacks in scripts/quiltify.sh

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

Summary of changes:
 scripts/quiltify.sh |   34 +++++++++++-----------------------
 1 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 177b695..8f7da8e 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -165,30 +165,18 @@ for patch in $PATCHES; do
 	quilt import $patch
 done
 
-# Hacks for APF28 2.6.35 kernel
-if [ "$QUILT_TARGET_NAME" == "Linux kernel" ] && [ "$ARMADEUS_BOARD_NAME" == "apf28" ] && [ "$ARMADEUS_LINUX_VERSION" == "2.6.35.3" ]; then
-	tar -zxvf  $ARMADEUS_DL_DIR/MX28-FEC-PROBLEM-PATCH.tar.gz
-	PATCHES=`ls -ar *.patch`
-	for patch in $PATCHES; do
-		quilt import $patch
-	done
-	rm *.patch
-	
-	tar -zxvf  $ARMADEUS_DL_DIR/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz
-	PATCHES=`ls -ar patches_for_L2.6.35_MX28_SDK_10.12_SOURCE/kernel/*.patch`
-	for patch in $PATCHES; do
-		quilt import $patch
-	done
-	rm -rf patches_for_L2.6.35_MX28_SDK_10.12_SOURCE/kernel/
-	
-	tar -zxvf  $ARMADEUS_DL_DIR/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz
-	PATCHES=`ls -ar *.patch`
-	for patch in $PATCHES; do
-		quilt import $patch
+# Linux kernel may have additional (external) patches in archive form :
+if [ "$QUILT_TARGET_NAME" == "Linux kernel" ]; then
+	LINUX_PATCHES=`grep BR2_LINUX_KERNEL_PATCH $ARMADEUS_BUILDROOT_DIR/.config | cut -d = -f 2 | tr -d '\"'`
+	# 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`
+		if [ -f "$ARMADEUS_DL_DIR/$patch_source" ]; then
+			echo "--- $patch_source is an archive"
+			quilt import $ARMADEUS_DL_DIR/$patch_source
+		fi
 	done
-	rm *.patch
-	
-	quilt import $ARMADEUS_DL_DIR/linux-2.6.35.3-imx_10.12.01.patch.tar.gz
 fi
 
 quilt push -a


hooks/post-receive
-- 
armadeus