From 6bf32044cb4aa1bc275b6b78c3c0d3d995306671 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alexandre.aubin@cern.ch>
Date: Thu, 26 Apr 2018 04:23:20 +0200
Subject: [PATCH] Tweaking architecture + a few minor things

---
 config/config                   | 8 ++++----
 config/pbuilder/armel.conf      | 6 ++++++
 config/rebuildd.conf            | 2 +-
 config/rebuildd.default         | 2 +-
 scripts/rebuildd/build-binaries | 5 +++++
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 config/pbuilder/armel.conf

diff --git a/config/config b/config/config
index a01f854..4c894b0 100644
--- a/config/config
+++ b/config/config
@@ -10,11 +10,11 @@ REPO_URL="forge.yunohost.org"
 
 # Codenames, components and architectures
 
-AVAILABLE_CODENAMES="jessie stretch"
+AVAILABLE_CODENAMES="stretch"
 AVAILABLE_COMPONENTS="stable testing unstable extra"
-AVAILABLE_ARCH="amd64 i386 armhf"
+AVAILABLE_ARCH="amd64 i386 armel armhf arm64"
 
-DEFAULT_CODENAME="jessie"
+DEFAULT_CODENAME="stretch"
 DEFAULT_COMPONENT="unstable"
 DEFAULT_ARCH="amd64"
 
@@ -22,7 +22,7 @@ DEFAULT_ARCH="amd64"
 
 HOME_VINAIGRETTE="/home/vinaigrette"
 GIT_REPOS="$HOME_VINAIGRETTE/gitrepos/"
-REPO_DIR=/var/www/repo/debian
+REPO_DIR="/var/www/repo/debian"
 
 PBUILDER_HOME="$HOME_VINAIGRETTE/scripts/pbuilder/"
 PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/"
diff --git a/config/pbuilder/armel.conf b/config/pbuilder/armel.conf
new file mode 100644
index 0000000..75d67e9
--- /dev/null
+++ b/config/pbuilder/armel.conf
@@ -0,0 +1,6 @@
+# ARM-specific configuration
+
+DEBOOTSTRAP=debootstrap
+#DEBOOTSTRAPOPTS=( '--variant=buildd' )
+ARCHITECTURE=armel
+
diff --git a/config/rebuildd.conf b/config/rebuildd.conf
index a587e8e..8172a06 100644
--- a/config/rebuildd.conf
+++ b/config/rebuildd.conf
@@ -10,7 +10,7 @@ dists = jessie stretch
 work_dir = /var/cache/rebuildd/build
 database_uri = sqlite:///var/lib/rebuildd/rebuildd.db
 build_more_recent = 1
-more_archs = i386 armhf arm64 all any
+more_archs = i386 armel armhf arm64 all any
 no_system_arch = 0
 
 [mail]
diff --git a/config/rebuildd.default b/config/rebuildd.default
index 1e4be3b..4c0e1d2 100644
--- a/config/rebuildd.default
+++ b/config/rebuildd.default
@@ -3,6 +3,6 @@ START_REBUILDD_HTTPD=1
 PBUILDER_BIN=/usr/sbin/pbuilder
 PBUILDER_CACHE_PATH="/var/cache/pbuilder"
 PBUILDER_MIRROR=https://ftp.debian.org/debian
-ARCHS="amd64 i386 armhf arm64"
+ARCHS="amd64 i386 armel armhf arm64"
 DISTS="wheezy jessie stretch"
 ENABLE_BUILDER_MAINT=1
diff --git a/scripts/rebuildd/build-binaries b/scripts/rebuildd/build-binaries
index 11c48b5..991e0e0 100755
--- a/scripts/rebuildd/build-binaries
+++ b/scripts/rebuildd/build-binaries
@@ -50,6 +50,11 @@ then
    CONFIGFILE="--configfile $PBUILDER_CONF/armhf.conf"
 fi
 
+if [[ $arch == "armel" ]];
+then
+   CONFIGFILE="--configfile $PBUILDER_CONF/armel.conf"
+fi
+
 if [[ $arch == "arm64" ]];
 then
    CONFIGFILE="--configfile $PBUILDER_CONF/arm64.conf"