local changesHEADmaster

This is what I used for building, but others might use
a different set of changes:

- forcing gcc-9 for now, as gcc-10 is still work in progress
- use all CPUs for building
- make local repositories trusted to work around a bug I ran into
- build perl, which is normally not included

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 10 insertions, 3 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index 274f741..fdcae14 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,11 +4,11 @@ set -v
 set -e
 set -u
 
-export DEB_BUILD_OPTIONS="nocheck noddebs parallel=1"
+export DEB_BUILD_OPTIONS="nocheck noddebs parallel=30"
 export DH_VERBOSE=1
 HOST_ARCH=undefined
 # select gcc version from gcc-defaults package unless set
-GCC_VER=
+GCC_VER=9
 : ${MIRROR:="http://http.debian.net/debian"}
 ENABLE_MULTILIB=no
 ENABLE_MULTIARCH_GCC=yes
@@ -213,7 +213,7 @@ fi
 # ensure that the rebootstrap list comes first
 test -f /etc/apt/sources.list && mv -v /etc/apt/sources.list /etc/apt/sources.list.d/local.list
 for f in /etc/apt/sources.list.d/*.list; do
-	test -f "$f" && sed -i "s/^deb \(\[.*\] \)*/deb [ arch-=$HOST_ARCH ] /" $f
+	test -f "$f" && sed -i "s/^deb \(\[.*\] \)*/deb [ arch-=$HOST_ARCH trusted=yes ] /" $f
 done
 grep -q '^deb-src .*sid' /etc/apt/sources.list.d/*.list || echo "deb-src $MIRROR sid main" >> /etc/apt/sources.list.d/sid-source.list
 
@@ -2883,6 +2883,13 @@ mark_built cdebconf
 
 automatically_cross_build_packages
 
+cross_build perl
+mark_built perl
+# needed by debconf
+
+automatically_cross_build_packages
+
+
 assert_built "$need_packages"
 
 echo "checking installability of build-essential with dose"