diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-04-25 00:22:50 +0200 |
|---|---|---|
| committer | X2go Administrator <x2go-admin@ymir.das-netzwerkteam.de> | 2011-04-25 00:23:36 +0200 |
| commit | 2bd8587d8ce45a5080529f2aa682b61f01d863f0 (patch) | |
| tree | 118e191ca5f337122da240471c7ec43a6006a110 | |
| parent | 2f64d216e784d41c54e40ba4f621f26f28bfe8b4 (diff) | |
| download | buildscripts-2bd8587d8ce45a5080529f2aa682b61f01d863f0.tar.gz buildscripts-2bd8587d8ce45a5080529f2aa682b61f01d863f0.tar.bz2 buildscripts-2bd8587d8ce45a5080529f2aa682b61f01d863f0.zip | |
diverse changes around --binary-arch, using separate dirs for different architectures
| -rwxr-xr-x | bin/x2go-buildpackage | 14 | ||||
| -rw-r--r-- | home/.pbuilderrc | 17 |
2 files changed, 16 insertions, 15 deletions
diff --git a/bin/x2go-buildpackage b/bin/x2go-buildpackage index 03343ed..ee280fe 100755 --- a/bin/x2go-buildpackage +++ b/bin/x2go-buildpackage @@ -89,19 +89,21 @@ cat BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do # modify changelog for this build DEBEMAIL=git-admin@x2go.org DEBFULLNAME="X2go Git Administrator" dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT" "Auto-built $l_DIST $l_CODENAME package for packages.x2go.org repository." - test "x$USE_SUDO" = "xyes" && { + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386} + [ "x$USE_SUDO" != "xyes" ] && { cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME + 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 && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch } - } || { + } + [ "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 + sudo 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 + sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch } } cd - diff --git a/home/.pbuilderrc b/home/.pbuilderrc index f379cbe..52fe0ca 100644 --- a/home/.pbuilderrc +++ b/home/.pbuilderrc @@ -1,9 +1,12 @@ #!/bin/bash + +set -x + BASEDIRECTORY="/srv/pbuilder/cache" -DIST=${DIST-debian} -CODENAME=${CODENAME-sid} -ARCH=${ARCH-amd64} +DIST=${DIST:-debian} +CODENAME=${CODENAME:-sid} +ARCH=${ARCH:-amd64} # pbuilder options BASETGZ="$BASEDIRECTORY/base-$DIST-$CODENAME-$ARCH.tgz" @@ -35,14 +38,10 @@ else MEMORY_MEGS=512 fi -if [ "x$ARCH" != "xamd64" ]; then - BINARY_ARCH="yes" -fi - if [ "x${DIST}" = "xubuntu" ]; then - MIRRORSITE="http://de.archive.ubuntu.com/ubuntu" + MIRRORSITE="http://localhost:9999/ubuntu" elif [ "x${DIST}" = "xdebian" ]; then - MIRRORSITE="http://ftp.de.debian.org/debian" + MIRRORSITE="http://localhost:9999/debian" OTHERMIRROR="deb http://code.x2go.org/debian $CODENAME main" fi |