Improve build scripts

diff --git a/sources/build-pbuilder.sh b/sources/build-pbuilder.sh
index 4ce9eed5407b064858771d49bdced1835c4f6b68..e591df94a375e4368c746f7cf21391bd14997c6c 100644 (file)
--- a/sources/build-pbuilder.sh
+++ b/sources/build-pbuilder.sh
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-if [ -z "$1" ];  then
-    echo "Usage: $0 <dist>"
+if [ -z "$1" ] || [ -z "$2" ];  then
+    echo "Usage: $0 <dist> <arch> [<branch>]"
     exit 1
 fi
 
 DIST=$1
+ARCH=$2
+
+if [ -z "$3" ];  then
+    DEBIAN_BRANCH=debian/latest
+else
+    DEBIAN_BRANCH=$3
+fi
 
 gbp buildpackage \
 --git-submodules \
---git-debian-branch="debian/latest" \
+--git-debian-branch="$DEBIAN_BRANCH" \
 --git-pbuilder \
---git-arch=amd64 \
+--git-arch="$ARCH" \
 --git-dist="$DIST" \
---git-pbuilder-options="--buildresult $HOME/qa/git/argeo-qa-unstable/build/repo/deb/$DIST/ml/1.1 --aptcache /var/cache/pbuilder/aptcache"
+--git-pbuilder-options="--aptcache /var/cache/pbuilder/aptcache --buildresult $HOME/qa/git/argeo-qa-unstable/build/repo/deb/$DIST/ml/1.1"

diff --git a/sources/create-pbuilder-non-free.sh b/sources/create-pbuilder-non-free.sh
new file mode 100644 (file)
index 0000000..72b3ce6
--- /dev/null
+++ b/sources/create-pbuilder-non-free.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -z "$1" ] || [ -z "$2" ];  then
+    echo "Usage: $0 <dist> <arch>"
+    exit 1
+fi
+
+export DIST=$1
+export ARCH=$2
+
+sudo rm -rf "/var/cache/pbuilder/base-$DIST-$ARCH.cow"
+GIT_PBUILDER_OPTIONS="--aptcache /var/cache/pbuilder/aptcache --components 'main contrib non-free' --othermirror 'deb [trusted=yes] file:/home/mbaudier/qa/git/argeo-qa-unstable/build/repo/deb/$1/ml/1.1/ ./'" git-pbuilder create

diff --git a/sources/create-pbuilder.sh b/sources/create-pbuilder.sh
index 02b6268e5c7205d7290047c8516d09b9fa994888..5664f1a4b49cb1f33984f95451874a9f65392308 100644 (file)
--- a/sources/create-pbuilder.sh
+++ b/sources/create-pbuilder.sh
@@ -5,4 +5,8 @@ if [ -z "$1" ] || [ -z "$2" ];  then
     exit 1
 fi
 
-DIST=$1 ARCH=$2 GIT_PBUILDER_OPTIONS="--othermirror 'deb [trusted=yes] file:/home/mbaudier/qa/git/argeo-qa-unstable/build/repo/deb/$1/ml/1.1/ ./'" git-pbuilder create
+export DIST=$1
+export ARCH=$2
+
+sudo rm -rf "/var/cache/pbuilder/base-$DIST-$ARCH.cow"
+GIT_PBUILDER_OPTIONS="--aptcache /var/cache/pbuilder/aptcache --othermirror 'deb [trusted=yes] file:/home/mbaudier/qa/git/argeo-qa-unstable/build/repo/deb/$1/ml/1.1/ ./'" git-pbuilder create