Trying to handle that hook thing

README.md

@@ -59,6 +59,10 @@ How this shit works
 Misc notes
 ----------
 
+#### Hooks thingy
+
+At the start of the build, pbuilder will call the hooks in scripts/pbuilder/hooks 
+
 #### If you need to rebuild custom packages (for instance, metronome ?)
 
 - Go to a git clone of https://github.com/yunohost/metronome/

config/config

@@ -28,7 +28,7 @@ PBUILDER_HOME="$HOME_VINAIGRETTE/scripts/pbuilder/"
 PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/"
 PBUILDER_RESULTS="$PBUILDER_HOME/result"
 DAILY_PACKAGES="$PBUILDER_HOME/packages/"
-PBUILDER_CONF="$PBUILDER_HOME/config/pbuilder/"
+PBUILDER_CONF="$HOME_VINAIGRETTE/config/pbuilder/"
 
 # Scripts
 

config/pbuilder/nodejs.conf

@@ -0,0 +1,9 @@
+# NodeJS-specific configuration
+
+[[ -n ${OTHERMIRROR} ]] && OTHERMIRROR+=" | "
+OTHERMIRROR+="deb https://deb.nodesource.com/node_4.x ${DISTRIBUTION} main"
+
+[[ -n ${EXTRAPACKAGES} ]] && EXTRAPACKAGES+=" "
+EXTRAPACKAGES+="apt-transport-https ca-certificates"
+
+APTKEYRINGS=("${APTKEYRINGS[@]}" "/etc/pbuilder/keyrings/nodesource.gpg")

config/pbuilder/pbuilder.conf

@@ -9,7 +9,7 @@
 DISTRIBUTION="jessie"
 
 # default location for the user hooks directory
-HOOKDIR="/etc/pbuilder/hooks"
+HOOKDIR="/home/vinaigrette/scripts/pbuilder/hooks/"
 
 # main mirror site for Debian
 MIRRORSITE="http://cdn.debian.net/debian"

scripts/pbuilder/hooks/B90lintian

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+#install_packages() {
+#    apt-get -y "${APTGETOPT[@]}" install "$@"
+#}
+#
+#install_packages lintian
+
+echo "+++ lintian output +++"
+
+#su -c "lintian -I --show-overrides /tmp/buildd/*.changes" - pbuilder
+# use this version if you don't want lintian to fail the build
+su -c "lintian -i -I --show-overrides /tmp/buildd/*.changes; :" - pbuilder
+
+echo "+++ end of lintian output +++"
+

scripts/pbuilder/hooks/D70apt-update

@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/apt-get update

scripts/pbuilder/hooks/E01apt-preferences

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if $(cat "/etc/apt/sources.list" | grep -q "wheezy-backports"); then
+    echo "Adding pin preferences for wheezy-backports"
+    cat > "/etc/apt/preferences.d/wheezy-backports" << EOF
+Package: dh-python dh-systemd devscripts
+Pin: release a=wheezy-backports
+Pin-Priority: 999
+EOF
+else
+    if [ -f /etc/apt/preferences.d/wheezy-backports ]; then
+        rm -vf /etc/apt/preferences.d/wheezy-backports
+    fi
+fi

scripts/pbuilder/keyrings/nodesource.gpg

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+Comment: GPGTools - https://gpgtools.org
+
+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
+=CLGF
+-----END PGP PUBLIC KEY BLOCK-----

scripts/rebuildd/build-binaries

@@ -27,38 +27,36 @@ else
     JOBS=1
 fi
 
-echo \
-"******************************************************************************"
-echo "Starting building..."
+echo "######################"
+echo " Starting build ...   "
+echo "######################"
 
 # Format needed pbuilder arguments
 DEBBUILDOPTS="$DEBBUILDOPTS -j$JOBS"
 DSC_FILE="${package}_${version}.dsc"
 BASE_TGZ="${PBUILDER_IMAGES}/${arch}/${codename}.tgz"
 EXTRA_OPTS=()
+CONFIGFILE=""
 
 # Use specific conf for nodejs builds
-if [[ $package =~ ^yunohost-admin$ ]]; then
-    base_tgz="${PBUILDER_IMAGES}/${arch}/${codename}-nodejs.tgz"
-    if [[ -f ${base_tgz} ]]; then
-        echo "+ using nodejs environment..."
-	BASE_TGZ=${base_tgz}
-    fi
+if [[ $package == "yunohost-admin" ]];
+then
+    BASE_TGZ="${PBUILDER_IMAGES}/${arch}/${codename}-nodejs.tgz"
+    CONFIGFILE="--configfile $PBUILDER_CONF/nodejs.conf"
+fi
+        
+if [[ $arch == "armhf" ]]; 
+then
+   CONFIGFILE="--configfile $PBUILDER_CONF/armhf.conf"
 fi
 
-case $arch in
-  armhf)
-    pbuilder build --debbuildopts "${DEBBUILDOPTS}" \
-        --configfile $PBUILDER_CONF/armhf.conf \
-        --basetgz $BASE_TGZ "${EXTRA_OPTS[@]}" $DSC_FILE
-    exit_code=$?
-    ;;
+pbuilder build                            \
+         --basetgz "${BASE_TGZ}"          \
+ 	 --debbuildopts "${DEBBUILDOPTS}" \
+ 	 ${CONFIGFILE}                    \
+ 	 "${EXTRA_OPTS[@]}"               \
+	 $DSC_FILE
 
-  amd64|i386)
-    pbuilder build --debbuildopts "${DEBBUILDOPTS}" \
-        --basetgz $BASE_TGZ "${EXTRA_OPTS[@]}" $DSC_FILE
-    exit_code=$?
-    ;;
-esac
+exit_code=$?
 
 exit $exit_code