[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-396-gf9e43b7

[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  f9e43b7ff5a0bc44c2573d7c15f8b8ea0ab13c01 (commit)
       via  b136a10c4013cd08c7eee59a5ee6568421f8d512 (commit)
      from  e8688ab7d260b00137c87b478effa9b6140d2902 (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 f9e43b7ff5a0bc44c2573d7c15f8b8ea0ab13c01
Merge: b136a10 e8688ab
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jun 19 11:55:46 2012 +0200

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

commit b136a10c4013cd08c7eee59a5ee6568421f8d512
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jun 19 11:54:18 2012 +0200

    [scripts] delete duplicated code

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

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

diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index cebe56e..1268060 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -166,13 +166,7 @@ for patch in $PATCHES; do
 done
 
 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


hooks/post-receive
-- 
armadeus