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

X2go dev team git-admin at x2go.org
Mon Jul 4 13:54:44 CEST 2011


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

    Create arch PKGDIST dirs for EXTRA_ARCHS

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

Summary of changes:
 bin/x2go-build-package |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/bin/x2go-build-package b/bin/x2go-build-package
index 2464ef9..cbf3411 100755
--- a/bin/x2go-build-package
+++ b/bin/x2go-build-package
@@ -74,7 +74,7 @@ clear_pkgdist() {
 			for l_CODENAME in $CODENAMES; do
 				if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then
 					for l_ARCH in amd64 i386; do
-						mkdir -p $PKGDIST/$l_DIST/$l_CODENAME
+						mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH
 						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
@@ -84,7 +84,7 @@ clear_pkgdist() {
 					done
 				fi
 				for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
-					mkdir -p $PKGDIST/$l_DIST/$l_CODENAME
+					mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH
 					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
@@ -103,6 +103,7 @@ prepare_workspace() {
 	rm -f $PROJECT_DIR/BUILDS_FOR
 
 	# make sure our local working copy is up to date...
+
 	if [ -d $PROJECT_DIR/.git ]; then 
 		cd $PROJECT_DIR && git reset --hard
 		git pull origin $CHECKOUT
@@ -162,6 +163,7 @@ build_packages() {
 						}
 					}
 					for extra_arch in $EXTRA_ARCHS; do
+						mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch
 						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
 						}
@@ -177,6 +179,7 @@ build_packages() {
 						}
 					}
 					for extra_arch in $EXTRA_ARCHS; do
+						mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch
 						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
 						}


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