summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
Diffstat (limited to 'auto')
-rwxr-xr-xauto/config2
-rw-r--r--auto/functions/patch-bootstrap17
2 files changed, 18 insertions, 1 deletions
diff --git a/auto/config b/auto/config
index 5bb2033..fd8ff85 100755
--- a/auto/config
+++ b/auto/config
@@ -66,7 +66,7 @@ squeeze)
;;
wheezy)
LB_PACKAGES_LISTS+=" dragonfire"
- LB_REPOSITORIES+=" dragonfire wine-ppa-oneiric"
+ LB_REPOSITORIES+=" dragonfire"
case $LB_ARCHITECTURE in
amd64) LB_LINUX_PACKAGES="linux-image-3.2.0-30 linux-headers-3.2.0-30"; LB_LINUX_FLAVOURS="generic";;
i386) LB_LINUX_PACKAGES="linux-image-3.2.0-30 linux-headers-3.2.0-30"; LB_LINUX_FLAVOURS="generic";;
diff --git a/auto/functions/patch-bootstrap b/auto/functions/patch-bootstrap
new file mode 100644
index 0000000..edf0203
--- /dev/null
+++ b/auto/functions/patch-bootstrap
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Hacks to execute after bootstrapping
+
+current_script="$(basename "$0"|sed 's/^lb_//')"
+
+if [ "$current_script" = "chroot" -a ! -e chroot/usr/local/sbin/update-initramfs ]; then
+ echo "HACK: Disabling update-initramfs to prevent calling it several times during build."
+ mkdir -p chroot/usr/local/sbin
+ ln -fs /bin/true chroot/usr/local/sbin/update-initramfs
+
+ . config/bootstrap
+ if [ "$LB_ARCHITECTURE" = "amd64" -o "$LB_ARCHITECTURES" = "amd64" ] && [ "$LB_DISTRIBUTION" = "wheezy" ]; then
+ echo "HACK: Enabling multiarch: amd64 + i386"
+ chroot chroot dpkg --add-architecture i386
+ fi
+fi
+