buildscripts.git - master (branch) updated: 8452813bc06c9238b0de33899e5862f75c0ea8ad - x2go-commits

4 Jul 2011

The branch, master has been updated
       via  8452813bc06c9238b0de33899e5862f75c0ea8ad (commit)
       via  ef4681956793224908eb328a864056470b0bf54b (commit)
      from  2fbd79666c4ba1595fc457d9f7f99286c8df9ddb (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 8452813bc06c9238b0de33899e5862f75c0ea8ad
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon Jul 4 13:50:28 2011 +0200

    complete build script for EXTRA_ARCHS like armel

commit ef4681956793224908eb328a864056470b0bf54b
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon Jul 4 13:49:42 2011 +0200

    use kernel without initrd for armel arch

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

Summary of changes:
 bin/x2go-build-package |   46 ++++++++++++++++++++++++++++++++--------------
 home/.pbuilderrc       |    3 ++-
 2 files changed, 34 insertions(+), 15 deletions(-)

The diff of changes is:

diff --git a/bin/x2go-build-package b/bin/x2go-build-package
index 00c5151..2464ef9 100755
--- a/bin/x2go-build-package
+++ b/bin/x2go-build-package
@@ -53,8 +53,8 @@ set_vars() {
 	PKGDIST="$HOME/pkg-dist/$COMPONENT/$PROJECT"
 
 	# build for other architectures than amd64/i386
-	EXTRA_ARCHS="${EXTRA_ARCHS:-''}"
-	EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-''}"
+	EXTRA_ARCHS="${EXTRA_ARCHS:-}"
+	EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-}"
 
 	# creating paths
 	mkdir -p "$TEMP_BASE"
@@ -72,15 +72,26 @@ clear_pkgdist() {
 		CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])}
 		echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && {
 			for l_CODENAME in $CODENAMES; do
-				for l_ARCH in amd64 i386; do
+				if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then
+					for l_ARCH in amd64 i386; do
+						mkdir -p $PKGDIST/$l_DIST/$l_CODENAME
+						rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.changes
+						rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.upload
+						rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.build
+						rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.dsc
+						rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.tar.gz
+						rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/*.deb
+					done
+				fi
+				for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
 					mkdir -p $PKGDIST/$l_DIST/$l_CODENAME
-					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.changes
-					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.upload
-					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.build
-					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.dsc
-					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.tar.gz
-					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/*.deb
-				done
+					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.changes
+					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.upload
+					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.build
+					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.dsc
+					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.tar.gz
+					rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/*.deb
+				done	
 			done
 		}
 	done
@@ -142,7 +153,7 @@ build_packages() {
 				mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386}
 				OTHERMIRROR="deb http://packages.x2go.org/debian $l_CODENAME $COMPONENT"
 				[ "x$USE_SUDO" != "xyes" ] && {
-					test -n $EXTRA_ARCHS_ONLY && {
+					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
 						cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
 							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64
 						}
@@ -157,7 +168,7 @@ build_packages() {
 					done
 				}
 				[ "x$USE_SUDO" = "xyes" ] && {
-					test -n $EXTRA_ARCHS_ONLY && {
+					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
 						cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
 							sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64
 						}
@@ -188,8 +199,15 @@ upload_packages() {
 		l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z])
 		CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])}
 		for l_CODENAME in $CODENAMES; do
-			for l_ARCH in amd64 i386; do 
-				cd $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH
+			if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then	
+				for l_ARCH in amd64 i386; do 
+					cd $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH
+					ls $PROJECT_*.changes &>/dev/null && dupload --to x2go-$l_DIST-$l_CODENAME $PROJECT_*.changes
+					cd -
+				done
+			fi
+			for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
+				cd $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH
 				ls $PROJECT_*.changes &>/dev/null && dupload --to x2go-$l_DIST-$l_CODENAME $PROJECT_*.changes
 				cd -
 			done
diff --git a/home/.pbuilderrc b/home/.pbuilderrc
index e817471..74992ea 100644
--- a/home/.pbuilderrc
+++ b/home/.pbuilderrc
@@ -31,12 +31,13 @@ UML_DISTRIBUTION="$CODENAME"
 # qemubuilder options
 BASEPATH="$BASEDIRECTORY/base-$DIST-$CODENAME-$ARCH.qemu"
 KERNEL_IMAGE=/srv/pbuilder/qemu-kernels/$ARCH/vmlinuz
-INITRD=/srv/pbuilder/qemu-kernels/$ARCH/initrd.img
 ARCH_DISKDEVICE=sd
 if [ "x$ARCH" = "xarmel" ]; then
 	MEMORY_MEGS=256
+	INITRD=""
 else
 	MEMORY_MEGS=512
+	INITRD=/srv/pbuilder/qemu-kernels/$ARCH/initrd.img
 fi
 
 if [ "x${DIST}" = "xubuntu" ]; then 


hooks/post-receive
-- 
buildscripts.git (buildscripts upstream project)

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 "buildscripts.git" (buildscripts upstream project).

    