[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-260-g610dac7

[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  610dac7274027f1e2f61795531a9df01db937425 (commit)
      from  234fe9e80228b3b4b071f368da95fdf06f96149c (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 610dac7274027f1e2f61795531a9df01db937425
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Apr 10 15:43:26 2012 +0200

    [TOOLS] adding the freescale patch in quiltify, before importing regulars patch

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

Summary of changes:
 Makefile            |    1 +
 scripts/quiltify.sh |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index e27b95b..bb7b6af 100644
--- a/Makefile
+++ b/Makefile
@@ -225,6 +225,7 @@ shell_env:
 	@echo ARMADEUS_BUSYBOX_VERSION=$(ARMADEUS_BUSYBOX_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_BSP_VERSION=$(ARMADEUS_BSP_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_BOARD_NAME=$(ARMADEUS_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
+	@echo ARMADEUS_DL_DIR=$(BR2_DL_DIR) >> $(ARMADEUS_ENV_FILE)
 
 
 PHONY_TARGETS+=dummy all linux26 linux26-clean buildroot-clean buildroot-dirclean
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index b593d93..5f7ebc1 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -3,6 +3,12 @@
 # "quiltifies" Linux or Buildroot
 #
 
+if [ "$ARMADEUS_BOARD_NAME" != "apf28" ]; then
+	FREESCALE_PATCH=linux-2.6.35.3-imx_10.12.01.patch.tar.gz
+else
+	FREESCALE_PATCH=""
+fi
+
 answer=""
 
 ask_user_banner()
@@ -160,9 +166,15 @@ if [ "$QUILT_PATCH_FILTER" != "" ]; then
 else
 	PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
 fi
+
 for patch in $PATCHES; do
 	quilt import $patch
 done
+
+if [ "$FREESCALE_PATCH" != "" ]; then
+	quilt import $ARMADEUS_DL_DIR/$FREESCALE_PATCH
+fi
+
 quilt push -a
 if [ "$?" != 0 ]; then
 	echo "Please correct that"


hooks/post-receive
-- 
armadeus