From 229e4ac6545ec383bd6705a92dc3659dea6425da 2017-11-04 22:39:02
From: drtyhlpr <its_sead4@gmx.de>
Date: 2017-11-04 22:39:02
Subject: [PATCH] Merge pull request #105 from g-vidal/drtyhlpr-master

Proposed amendments  of 13-kernel.sh. thanks to g-vidal!
---

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..1046ab0 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -214,6 +214,12 @@ CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
 APT_INCLUDES=${APT_INCLUDES:=""}
 APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
 
+# Package apt-transport-https has been removed from Debian Buster release
+# this induces qemu error 383 which does not prevent building an image
+if [ "$RELEASE" = "buster" ] ; then
+  APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/apt-transport-https,//")"
+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=""