diff options
| author | X2go Administrator <x2go-admin@minobo.das-netzwerkteam.de> | 2012-01-18 22:11:31 +0100 |
|---|---|---|
| committer | X2go Administrator <x2go-admin@minobo.das-netzwerkteam.de> | 2012-01-18 22:11:31 +0100 |
| commit | eca903fceb335913fa641b30cdf7973daa4ee93a (patch) | |
| tree | f741c047a83a30a5eca624f110905d877fc72fb6 /bin/build-package | |
| parent | 8ce1824780bb0c77df4e351009bdb5d1a5610651 (diff) | |
| parent | 28dea91c42a72f04cb8e5c727626bc6b29895706 (diff) | |
| download | buildscripts-eca903fceb335913fa641b30cdf7973daa4ee93a.tar.gz buildscripts-eca903fceb335913fa641b30cdf7973daa4ee93a.tar.bz2 buildscripts-eca903fceb335913fa641b30cdf7973daa4ee93a.zip | |
Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/buildscripts
Diffstat (limited to 'bin/build-package')
| -rwxr-xr-x | bin/build-package | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/build-package b/bin/build-package index bfc6e2a..5acf585 100755 --- a/bin/build-package +++ b/bin/build-package @@ -202,10 +202,10 @@ build_packages() { [ "x$USE_SUDO" != "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { - cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { + [ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" 0<&- } - cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { + [ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch 0<&- } } @@ -218,10 +218,10 @@ build_packages() { } [ "x$USE_SUDO" = "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { - cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { + [ "x$SKIP_ARCH" != "xamd64" ] && 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 $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 0<&- } - cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { + [ "x$SKIP_ARCH" != "xi386" ] && 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 $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch 0<&- } } |