diff options
| -rwxr-xr-x | bin/x2go-build-package | 7 |
1 files changed, 5 insertions, 2 deletions
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 } |