[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-33-g0d0292d

[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  0d0292d0f8b472ac399404640bb8efdee9bf9a39 (commit)
       via  f025de0a33a05bf2a57e41dc573539a7311c03c8 (commit)
      from  c24feddeda564e70f702fff969d455e8ca646ee2 (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 0d0292d0f8b472ac399404640bb8efdee9bf9a39
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Fri Jan 22 18:18:16 2016 +0100

    [TOOLS] add u-boot patch generation to scripts/publish_patches.sh

commit f025de0a33a05bf2a57e41dc573539a7311c03c8
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Fri Jan 22 18:15:17 2016 +0100

    [BUILD] add ARMADEUS_U_BOOT_PATCH_DIR to shell_env.sh

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

Summary of changes:
 Makefile                   |    1 +
 Makefile.in                |    1 +
 scripts/publish_patches.sh |   72 +++++++++++++++++++++++++------------------
 3 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index 98fddfa..14e45f6 100644
--- a/Makefile
+++ b/Makefile
@@ -201,6 +201,7 @@ shell_env:
 	@echo ARMADEUS_LINUX_VERSION=$(ARMADEUS_LINUX_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_LINUX_MAIN_VERSION=$(ARMADEUS_LINUX_MAIN_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_U_BOOT_DIR=$(ARMADEUS_U_BOOT_DIR) >> $(ARMADEUS_ENV_FILE)
+	@echo ARMADEUS_U_BOOT_PATCH_DIR=$(ARMADEUS_U_BOOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_U_BOOT_VERSION=$(ARMADEUS_U_BOOT_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_U_BOOT_CUSTOM_VERSION=$(ARMADEUS_U_BOOT_CUSTOM_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_U_BOOT_CONFIG=$(ARMADEUS_U_BOOT_CONFIG) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index 43648e2..8f3a198 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,6 +87,7 @@ 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)
+ARMADEUS_U_BOOT_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/u-boot/$(ARMADEUS_U_BOOT_VERSION)
 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/publish_patches.sh b/scripts/publish_patches.sh
index 5ef0405..b840eaf 100755
--- a/scripts/publish_patches.sh
+++ b/scripts/publish_patches.sh
@@ -8,6 +8,40 @@ help()
 	echo
 }
 
+generate_patch()
+{
+	ALL_VERSIONS=`ls $THE_PATCH_DIR/..`
+	echo
+	PS3="Choose the $THE_NAME you want to publish: "
+	select THE_VERSION in $ALL_VERSIONS
+	do
+		if [ "$THE_VERSION" == "" ]; then
+			exit 1
+		else
+			echo "You choosed $THE_VERSION"
+			break
+		fi
+	done
+
+	echo "--- Merging patches:"
+	FINAL_PATCH=$THE_NAME-$THE_VERSION-armadeus.patch
+	rm -f $FINAL_PATCH
+	touch $FINAL_PATCH
+	THE_PATCHES=`ls $THE_PATCH_DIR/../$THE_VERSION`
+	for patch in $THE_PATCHES; do
+		echo "Merging $patch"
+		cat $THE_PATCH_DIR/../$THE_VERSION/$patch >> $FINAL_PATCH
+	#	sleep 1
+	done
+
+	echo
+	echo "--- Compressing:"
+	tar cvzf $FINAL_PATCH.tar.gz $FINAL_PATCH
+	if [ "$?" == 0 ]; then
+		rm $FINAL_PATCH
+	fi
+}
+
 if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
 	help
 	exit 1
@@ -18,37 +52,15 @@ THIS_DIR=`dirname $0`
 make -C $THIS_DIR/.. shell_env
 source $THIS_DIR/../armadeus_env.sh
 
-PATCHES_LIST=`ls $LINUX_PATCHES_DIR`
-LINUX_VERSIONS=`ls $ARMADEUS_LINUX_PATCH_DIR/..`
-echo
-PS3="Choose the Linux kernel you want to publish: "
-select LINUX in $LINUX_VERSIONS
-do
-	if [ "$LINUX" == "" ]; then
-		exit 1
-	else
-		echo "You choosed $LINUX"
-		break
-	fi
-done
-
-echo "--- Merging patches:"
-FINAL_PATCH=linux-$LINUX-armadeus.patch
-rm -f $FINAL_PATCH
-touch $FINAL_PATCH
-LINUX_PATCHES=`ls $ARMADEUS_LINUX_PATCH_DIR/../$LINUX`
-for patch in $LINUX_PATCHES; do
-	echo "Merging $patch"
-	cat $ARMADEUS_LINUX_PATCH_DIR/../$LINUX/$patch >> $FINAL_PATCH
-#	sleep 1
-done
+# Linux
+THE_PATCH_DIR="$ARMADEUS_LINUX_PATCH_DIR"
+THE_NAME="linux"
+generate_patch
 
-echo
-echo "--- Compressing:"
-tar cvzf $FINAL_PATCH.tar.gz $FINAL_PATCH
-if [ "$?" == 0 ]; then
-	rm $FINAL_PATCH
-fi
+# U-Boot
+THE_PATCH_DIR="$ARMADEUS_U_BOOT_PATCH_DIR"
+THE_NAME="u-boot"
+generate_patch
 
 echo
 echo "--- Uploading archive:"


hooks/post-receive
-- 
armadeus