[X2go-Commits] buildscripts.git - master (branch) updated: 41e449dcf22e8b0ce4996d532c5e7d3547dde06c

X2go dev team git-admin at x2go.org
Sun Jul 3 17:39:43 CEST 2011


The branch, master has been updated
       via  41e449dcf22e8b0ce4996d532c5e7d3547dde06c (commit)
      from  7b1ad9af8f929e746a5a3822c21fc2ff746bfa5c (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 41e449dcf22e8b0ce4996d532c5e7d3547dde06c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 3 17:39:55 2011 +0200

    add armel et al build support

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

Summary of changes:
 bin/x2go-build-package |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/bin/x2go-build-package b/bin/x2go-build-package
index 57124c4..00c5151 100755
--- a/bin/x2go-build-package
+++ b/bin/x2go-build-package
@@ -52,6 +52,10 @@ set_vars() {
 	DIST_SUPPORTED="debian ubuntu"
 	PKGDIST="$HOME/pkg-dist/$COMPONENT/$PROJECT"
 
+	# build for other architectures than amd64/i386
+	EXTRA_ARCHS="${EXTRA_ARCHS:-''}"
+	EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-''}"
+
 	# creating paths
 	mkdir -p "$TEMP_BASE"
 	mkdir -p $PROJECT_DIR
@@ -138,20 +142,34 @@ 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" ] && {
-					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
-					}
-					cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
-						DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch
+					test -n $EXTRA_ARCHS_ONLY && {
+						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
+						}
+						cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
+							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch
+						}
 					}
+					for extra_arch in $EXTRA_ARCHS; do
+						cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
+							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch
+						}
+					done
 				}
 				[ "x$USE_SUDO" = "xyes" ] && {
-					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
-					}
-					cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
-					    sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch
+					test -n $EXTRA_ARCHS_ONLY && {
+						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
+						}
+						cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
+							sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch
+						}
 					}
+					for extra_arch in $EXTRA_ARCHS; do
+						cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
+						    sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch
+						}
+					done
 				}
 				cd -
 				rm -Rf $TEMP_DIR


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).




More information about the x2go-commits mailing list