aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfig.dot/pbuilder/hooks/D90update.link (renamed from config.dot/pbuilder/hooks/D90update)9
-rw-r--r--pbuilderrc.dot.link18
2 files changed, 22 insertions, 5 deletions
diff --git a/config.dot/pbuilder/hooks/D90update b/config.dot/pbuilder/hooks/D90update.link
index 1f0a31d..0c5ac42 100755
--- a/config.dot/pbuilder/hooks/D90update
+++ b/config.dot/pbuilder/hooks/D90update.link
@@ -1,3 +1,12 @@
+#!/bin/bash
+#
# See https://wiki.debian.org/BuildingFormalBackports
# https://wiki.debian.org/PbuilderTricks#How_to_include_local_packages_in_the_build
+
+set -e
+
+if [ ! -z "$LOCALDEBS" ]; then
+ ( cd $LOCALDEBS; apt-ftparchive packages . > Packages )
+fi
+
/usr/bin/apt-get update
diff --git a/pbuilderrc.dot.link b/pbuilderrc.dot.link
index 4fb9ddf..ce23a70 100644
--- a/pbuilderrc.dot.link
+++ b/pbuilderrc.dot.link
@@ -1,19 +1,24 @@
# See /usr/share/pbuilder/pbuilderrc for defaults
-# Source custom configuration
-if [ -e "$HOME/.custom/pbuilderrc" ]; then
- source $HOME/.custom/pbuilderrc
-fi
-
# Basic configuration
ARCH=${ARCH:=amd64}
DIST=${DIST:=sid}
COMPONENTS=${COMPONENTS:=main contrib non-free}
HOOKDIR=${HOOKDIR:=$HOME/.config/pbuilder/hooks/}
+# Source custom configuration
+if [ -e "$HOME/.custom/pbuilderrc" ]; then
+ source $HOME/.custom/pbuilderrc
+fi
+
# Map distribution option to our env variable
DISTRIBUTION="$DIST"
+# Bindmounts
+if [ ! -z "$BINDMOUNTS" ]; then
+ mkdir -p $BINDMOUNTS
+fi
+
# Backports
# https://wiki.ubuntu.com/PbuilderHowto#Using_backport_repositories_in_pbuilder
# https://wiki.debian.org/BuildingFormalBackports#Building_multi-dependencies_packages
@@ -25,6 +30,9 @@ fi
# https://wiki.debian.org/AutomateBackports
# https://wiki.debian.org/PbuilderTricks#How_to_include_local_packages_in_the_build
if [ ! -z "$LOCALDEBS" ]; then
+ # Ensure it exists
+ mkdir -p $LOCALDEBS
+
if [ ! -z "$OTHERMIRROR" ]; then
OTHERMIRROR="$OTHERMIRROR | deb file://${LOCALDEBS} ./"
else