From 9d14773c5a17985c51c6d138167fe89ebf56ffc3 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alexandre.aubin@cern.ch>
Date: Fri, 1 Sep 2017 17:34:59 +0200
Subject: [PATCH] Misc clean / architecture change

---
 config/config                                 |  3 ++-
 config/pbuilder/armhf.conf                    |  6 ++++++
 config/pbuilder/pbuilder.conf                 | 18 ++++++++++++++++++
 config/rebuildd.conf                          |  2 +-
 init.sh                                       |  4 ++++
 scripts/{rebuildd => pbuilder}/build-binaries |  2 +-
 6 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 config/pbuilder/armhf.conf
 create mode 100644 config/pbuilder/pbuilder.conf
 rename scripts/{rebuildd => pbuilder}/build-binaries (96%)

diff --git a/config/config b/config/config
index 21796b4..484cf93 100644
--- a/config/config
+++ b/config/config
@@ -22,12 +22,13 @@ DEFAULT_ARCH="amd64"
 
 HOME_VINAIGRETTE="/home/vinaigrette"
 GIT_REPOS="$HOME_VINAIGRETTE/gitrepos/"
+REPO_DIR=/var/www/repo/debian
 
 PBUILDER_HOME="$HOME_VINAIGRETTE/scripts/pbuilder/"
 PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/"
 PBUILDER_RESULTS="$PBUILDER_HOME/result"
 DAILY_PACKAGES="$PBUILDER_HOME/packages/"
-REPO_DIR=/var/www/repo/debian
+PBUILDER_CONF="$PBUILDER_HOME/config/pbuilder/"
 
 # Scripts
 
diff --git a/config/pbuilder/armhf.conf b/config/pbuilder/armhf.conf
new file mode 100644
index 0000000..635b87f
--- /dev/null
+++ b/config/pbuilder/armhf.conf
@@ -0,0 +1,6 @@
+# ARM-specific configuration
+
+DEBOOTSTRAP=debootstrap
+#DEBOOTSTRAPOPTS=( '--variant=buildd' )
+ARCHITECTURE=armhf
+
diff --git a/config/pbuilder/pbuilder.conf b/config/pbuilder/pbuilder.conf
new file mode 100644
index 0000000..68a6cf7
--- /dev/null
+++ b/config/pbuilder/pbuilder.conf
@@ -0,0 +1,18 @@
+# this is your configuration file for pbuilder.
+# the file in /usr/share/pbuilder/pbuilderrc is the default template.
+# /etc/pbuilderrc is the one meant for overwriting defaults in
+# the default template
+#
+# read pbuilderrc.5 document for notes on specific options.
+
+# default distribution
+DISTRIBUTION="jessie"
+
+# default location for the user hooks directory
+HOOKDIR="/etc/pbuilder/hooks"
+
+# main mirror site for Debian
+MIRRORSITE="http://cdn.debian.net/debian"
+
+# extra packages which the system should install
+EXTRAPACKAGES="lintian"
diff --git a/config/rebuildd.conf b/config/rebuildd.conf
index 180a43c..5ebabd1 100644
--- a/config/rebuildd.conf
+++ b/config/rebuildd.conf
@@ -4,7 +4,7 @@ max_threads = 1
 max_jobs = 5
 kill_timeout = 90
 source_cmd = /home/vinaigrette/scripts/rebuildd/get-sources ${d} ${p} ${v}
-build_cmd = /home/vinaigrette/scripts/rebuildd/build-binaries ${d} ${p} ${v} ${a}
+build_cmd = /home/vinaigrette/scripts/pbuilder/build-binaries ${d} ${p} ${v} ${a}
 post_build_cmd = /home/vinaigrette/scripts/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j}
 dists = jessie stretch
 work_dir = /var/cache/rebuildd/build
diff --git a/init.sh b/init.sh
index 475eec7..fcd06f9 100755
--- a/init.sh
+++ b/init.sh
@@ -1,5 +1,6 @@
 
 apt-get install nginx pbuilder reprepro rebuildd gawk sendxmpp -y
+apt-get install qemu-system-arm debootstrap -y
 apt-get install python-virtualenv python3-pip -y
 
 VINAIGRETTE_HOME="/home/vinaigrette"
@@ -31,6 +32,9 @@ ln -s $VINAIGRETTE_HOME/config/rebuildd.conf /etc/rebuildd/rebuilddrc
 
 ln -s $VINAIGRETTE_HOME/images /var/cache/pbuilder/images
 ln -s /var/cache/pbuilder/result $PBUILDER_RESULTS
+
+ln -s $PBUILDER_CONF/pbuilder.conf /etc/pbuilderrc
+
 cp $VINAIGRETTE_HOME/config/nginx.conf /etc/nginx/sites-enabled/repo.conf
 
 cat $VINAIGRETTE_HOME/config/keys/$DEBSIGN_KEYID.pub | apt-key add
diff --git a/scripts/rebuildd/build-binaries b/scripts/pbuilder/build-binaries
similarity index 96%
rename from scripts/rebuildd/build-binaries
rename to scripts/pbuilder/build-binaries
index e2f4069..c32e486 100755
--- a/scripts/rebuildd/build-binaries
+++ b/scripts/pbuilder/build-binaries
@@ -49,7 +49,7 @@ fi
 case $arch in
   armhf)
     pbuilder build --debbuildopts "${DEBBUILDOPTS}" \
-        --configfile /etc/pbuilder/rc.d/armhf \
+        --configfile $PBUILDER_CONF/armhf.conf \
         --basetgz $BASE_TGZ "${EXTRA_OPTS[@]}" $DSC_FILE
     exit_code=$?
     ;;