summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-07-19 13:48:49 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-11-28 08:51:28 +0100
commit3157b37e91d01a3e033d51f284b0b64daea82859 (patch)
tree072c63e15e22c3ac94717b4e03299ac05ae77a30
parentb82ed1780835f38cc3f108713573572186aed044 (diff)
downloadbuildscripts-3157b37e91d01a3e033d51f284b0b64daea82859.tar.gz
buildscripts-3157b37e91d01a3e033d51f284b0b64daea82859.tar.bz2
buildscripts-3157b37e91d01a3e033d51f284b0b64daea82859.zip
build 3.0 (quilt) packages, as well
-rwxr-xr-xbin/build-package16
1 files changed, 9 insertions, 7 deletions
diff --git a/bin/build-package b/bin/build-package
index fd25138..4d73daf 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -104,6 +104,7 @@ prepare_workspace() {
git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT
git pull origin $CHECKOUT
git fetch origin upstream:upstream || true
+ git fetch origin pristine-tar:pristine-tar || true
# and again, get the $CHECKOUT refspec in pure state
git reset --hard
git clean -df
@@ -112,7 +113,8 @@ prepare_workspace() {
git clone git://$GIT_HOSTNAME/$PROJECT_PATH.git
cd "$PROJECT"
git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT;
- git fetch origin upstream:upstream || true
+ git fetch origin upstream:upstream
+ git fetch origin pristine-tar:pristine-tar || true
git clean -df
fi
cd "$PROJECT_DIR"
@@ -238,32 +240,32 @@ 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 && {
- DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- $SA_OPTION 0<&-
+ DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted $SA_OPTION 0<&-
}
[ "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" -- $SA_OPTION --binary-arch 0<&-
+ DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted $SA_OPTION 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 && {
- DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- $SA_OPTION --binary-arch 0<&-
+ DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
}
done
}
[ "x$USE_SUDO" = "xyes" ] && {
[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
[ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
- 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 -- $SA_OPTION 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 -- --allow-untrusted $SA_OPTION 0<&-
}
[ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
- 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 -- $SA_OPTION --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 --allow-untrusted $SA_OPTION 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 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" -- $SA_OPTION --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 --allow-untrusted $SA_OPTION 0<&-
}
done
}