From a8639039065ab2a922578f127de66caf85db4e5b 2017-11-04 15:47:20
From: Gérard Vidal <gerard.vidal@ens-lyon.fr>
Date: 2017-11-04 15:47:20
Subject: [PATCH] Modifications to build buster images

---

diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh
index f8c4256..f0b5d34 100644
--- a/bootstrap.d/13-kernel.sh
+++ b/bootstrap.d/13-kernel.sh
@@ -13,7 +13,7 @@ if [ "$BUILD_KERNEL" = true ] ; then
   # Copy existing kernel sources into chroot directory
   if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then
     # Copy kernel sources
-    cp -r "${KERNELSRC_DIR}/*" "${R}/usr/src/linux"
+    cp -r "${KERNELSRC_DIR}/"* "${R}/usr/src/linux"
 
     # Clean the kernel sources
     if [ "$KERNELSRC_CLEAN" = true ] && [ "$KERNELSRC_PREBUILT" = false ] ; then
@@ -25,13 +25,13 @@ if [ "$BUILD_KERNEL" = true ] ; then
 
     # Fetch current RPi2/3 kernel sources
     if [ -z "${KERNEL_BRANCH}" ] ; then
-      as_nobody -u nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
+      as_nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
     else
-      as_nobody -u nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
-    fi
+      as_nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
+   fi
     
     # Copy downloaded kernel sources
-    mv "${temp_dir}/linux/*" "${R}/usr/src/linux/"
+    cp -r "${temp_dir}/linux/"* "${R}/usr/src/linux/"
 
     # Remove temporary directory for kernel sources
     rm -fr "${temp_dir}"
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index 25bbdc7..de68af5 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -212,8 +212,13 @@ CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
 
 # Packages required in the chroot build environment
 APT_INCLUDES=${APT_INCLUDES:=""}
-APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
-
+# apt-transport-https has been removed from repositories
+# this induces qemu error 383 which does not prevent building an image
+if [ "$RELEASE" = "buster" ] ; then
+  APT_INCLUDES="${APT_INCLUDES},apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+else
+  APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+fi
 # Packages required for bootstrapping
 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
 MISSING_PACKAGES=""
diff --git a/templates/raspife3-buster b/templates/raspife3-buster
index 6f8daff..a87b710 100644
--- a/templates/raspife3-buster
+++ b/templates/raspife3-buster
@@ -1,7 +1,9 @@
 # Configuration file raspi3 Buster IFÉ 2017/11/01
 #
-APT_SERVER=ftp.fr.debian.org 
-APT_INCLUDES="gnupg,firmware-linux-nonfree,firmware-linux,dh-autoreconf,\
+APT_SERVER=debian.mirrors.ovh.net
+APT_INCLUDES=""
+APT_INCLUDES_LATE=""
+APT_INCLUDES_LATE="gnupg,firmware-linux-nonfree,firmware-linux,dh-autoreconf,\
 gettext,build-essential,git,cmake,libjson-c-dev,unzip,usbutils,\
 bison,libboost-all-dev,automake,autoconf,autogen,libtool,libtool-bin,\
 pkg-config,checkinstall,menulibre,libnotify-bin,pandoc,\
@@ -10,14 +12,17 @@ python3-geopy,python3-pip,\
 python,python-dev,python-pypandoc,python-scipy,python-tk,python-pandocfilters,\
 python-geopy,python-pip,python-tk,pandoc,\
 python-configobj,python-cheetah,python-imaging,python-serial,python-usb,\
-pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,jed,i2c-tools,python-smbus,policykit-1,\
-pmount,ntpdate,ntp,\
+pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,i2c-tools,python-smbus,policykit-1,\
+pmount,ntpdate,ntp,rsync,\
 texlive,texlive-xetex,nginx-extras,ffmpeg,wicd,wicd-gtk,console-data,keyboard-configuration,\
-icedtea-8-plugin,openjdk-8-jdk,openjdk-8-jre,openjdk-8-jre-headless,libqtwebkit-dev,libqt5webkit5-dev,\
+libqtwebkit-dev,libqt5webkit5-dev,\
 libudev-dev,libzzip-dev,zlib1g-dev,libcanberra-gtk-module,libnss-myhostname,libfreetype6-dev,libpng16-16,\
-nmap,libltdl-dev,dbus-user-session,debian-archive-keyring"
-APT_INCLUDES_LATE="xutils-dev,lxsession,openbox-lxde-session,lxde,x11proto-randr-dev,lxrandr,\
-tightvncserver,geany,geany-plugin-py,firefox-esr,firefox-esr-l10n-fr"
+nmap,libltdl-dev,dbus-user-session,debian-archive-keyring,\
+xutils-dev,lxsession,openbox-lxde-session,lxde,x11proto-randr-dev,lxrandr,\
+tightvncserver,geany,geany-plugin-py,firefox-esr,firefox-esr-l10n-fr,jed"
+#ca-certificates-java,icedtea-plugin,icedtea-netx,\
+#openjdk-8-jdk,openjdk-8-jre,openjdk-8-jre-headless,\
+#openjdk-9-jdk,openjdk-9-jre,openjdk-9-jre-headless"
 #----------------------
 RPI_MODEL=3 
 RELEASE="buster"