[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-384-gdaa18e5

[Fabien M <fa...@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  daa18e5df129783c67cef271ea0d80093101ef64 (commit)
       via  bd646b6bee57cb3dc4e13da8281c169238503df4 (commit)
      from  5d4ac172d0c0bf27a555b0b43fbd8e89fe551628 (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 daa18e5df129783c67cef271ea0d80093101ef64
Merge: bd646b6 5d4ac17
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jun 15 17:50:13 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit bd646b6bee57cb3dc4e13da8281c169238503df4
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jun 15 17:49:41 2012 +0200

    [scripts] Upgrade quiltify to include freescales.tar.gz patches

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

Summary of changes:
 scripts/quiltify.sh |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index da1264c..cebe56e 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -51,12 +51,6 @@ fi
 make shell_env
 . armadeus_env.sh
 
-if [ "$ARMADEUS_BOARD_NAME" == "apf28" ] && [ "$ARMADEUS_LINUX_VERSION" == "2.6.35.3" ]; then
-	FREESCALE_PATCH=linux-2.6.35.3-imx_10.12.01.patch.tar.gz
-else
-	FREESCALE_PATCH=""
-fi
-
 if [ "$1" != "export" ]; then
 	ask_user_choice "What do you want to quiltify today ? ;-)" "Linux Buildroot U-Boot"
 fi
@@ -171,8 +165,36 @@ for patch in $PATCHES; do
 	quilt import $patch
 done
 
-if [ "$FREESCALE_PATCH" != "" ]; then
-	quilt import $ARMADEUS_DL_DIR/$FREESCALE_PATCH
+if [ "$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/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
+	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