[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2659-gb1cbb43

[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  b1cbb436df958dc518b4f1a4f3ede9346b940bc5 (commit)
       via  83d66c67f0a4f1b13ef98347fe516e41623cfaf6 (commit)
       via  f4df1b3ea8a0efe7d3343cf1f79d23f2b9801455 (commit)
      from  a9a1cda08a38ab22d76ea73fd4a1d16684f431f0 (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 b1cbb436df958dc518b4f1a4f3ede9346b940bc5
Merge: 83d66c6 a9a1cda
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 14:08:50 2012 +0100

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

commit 83d66c67f0a4f1b13ef98347fe516e41623cfaf6
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 14:01:25 2012 +0100

    [BUILD] Add script that will ease export of our Linux (and U-Boot) patches to a public FTP server (for use in build systems like BR)

commit f4df1b3ea8a0efe7d3343cf1f79d23f2b9801455
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 14:00:05 2012 +0100

    [BUILDROOT] Fixes patches/buildroot/2011.05/057-pymysql-add_package.patch

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

Summary of changes:
 .../2011.05/057-pymysql-add_package.patch          |    4 +-
 scripts/publish_patches.sh                         |   76 ++++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100755 scripts/publish_patches.sh

diff --git a/patches/buildroot/2011.05/057-pymysql-add_package.patch b/patches/buildroot/2011.05/057-pymysql-add_package.patch
index 5d42d7d..b60644f 100644
--- a/patches/buildroot/2011.05/057-pymysql-add_package.patch
+++ b/patches/buildroot/2011.05/057-pymysql-add_package.patch
@@ -6,10 +6,10 @@ Index: buildroot/package/Config.in
 ===================================================================
 --- buildroot.orig/package/Config.in	2011-08-08 12:14:30.000000000 +0200
 +++ buildroot/package/Config.in	2011-08-08 12:14:33.000000000 +0200
-@@ -240,6 +240,7 @@
+@@ -239,6 +239,7 @@
+ source "package/microperl/Config.in"
  source "package/php/Config.in"
  source "package/python/Config.in"
- source "package/pyserial/Config.in"
 +source "package/pymysql/Config.in"
  source "package/ruby/Config.in"
  source "package/tcl/Config.in"
diff --git a/scripts/publish_patches.sh b/scripts/publish_patches.sh
new file mode 100755
index 0000000..5ef0405
--- /dev/null
+++ b/scripts/publish_patches.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+help()
+{
+	echo
+	echo "This script will publish Armadeus Linux and U-Boot current/stable patches."
+	echo "This way we ease Armadeus board integration in build systems, like Buildroot for example."
+	echo
+}
+
+if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+	help
+	exit 1
+fi
+
+echo "--- Getting envt variables:"
+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
+
+echo
+echo "--- Compressing:"
+tar cvzf $FINAL_PATCH.tar.gz $FINAL_PATCH
+if [ "$?" == 0 ]; then
+	rm $FINAL_PATCH
+fi
+
+echo
+echo "--- Uploading archive:"
+HOST=ftp2.armadeus.com
+echo "username for $HOST ?"
+read -p "> " USER
+echo "password ?"
+read -p "> " PASSWD
+if [ "$USER" == "" ] || [ "$PASSWD" == "" ]; then
+	echo "aborting"
+	exit 1
+fi
+ftp -n $HOST <<END_SCRIPT
+quote USER $USER
+quote PASS $PASSWD
+cd download
+put $FINAL_PATCH.tar.gz
+quit
+END_SCRIPT
+
+if [ "$?" == 0 ]; then
+	echo "done !"
+fi
+
+exit 0


hooks/post-receive
-- 
armadeus