diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-02-15 23:35:49 +0100 |
|---|---|---|
| committer | X2Go Admin Account <x2go-admin@Debian-60-squeeze-64-minimal.(none)> | 2012-02-15 23:36:24 +0100 |
| commit | b085e56b5b5519a18f5b0f0f2e7ca607d149f598 (patch) | |
| tree | 86d52b3139265167223e5662ae98f379aee1fe60 /bin/build-package | |
| parent | d52afed8373ccb31a84089cf2dc0676ca7a3ec0a (diff) | |
| download | buildscripts-b085e56b5b5519a18f5b0f0f2e7ca607d149f598.tar.gz buildscripts-b085e56b5b5519a18f5b0f0f2e7ca607d149f598.tar.bz2 buildscripts-b085e56b5b5519a18f5b0f0f2e7ca607d149f598.zip | |
fix GNUPGHOME location (root/sudo vs. x2go-admin)
Diffstat (limited to 'bin/build-package')
| -rwxr-xr-x | bin/build-package | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/build-package b/bin/build-package index f1c24de..4b0ed8c 100755 --- a/bin/build-package +++ b/bin/build-package @@ -33,6 +33,7 @@ COMPONENT_MAIN="main" COMPONENT_NIGHTLY="nightly" REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" +GNUPGHOME=$HOME/.gnupg test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; } @@ -221,16 +222,16 @@ build_packages() { [ "x$USE_SUDO" = "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { [ "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<&- + sudo GNUPGHOME=$GNUPGHOME 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<&- } [ "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<&- + sudo GNUPGHOME=$GNUPGHOME 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<&- } } 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 $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch 0<&- } done } |