From d9463f284c07599ce5c0fbc585c81cd184baae28 2020-02-03 10:07:39
From: g-vidal <gerard.vidal@ens-lyon.fr>
Date: 2020-02-03 10:07:39
Subject: [PATCH] removed deprecated mkknlimg
added bullseye with test on testing distrib

---

diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 6a8187d..1179175 100644
--- a/bootstrap.d/11-apt.sh
+++ b/bootstrap.d/11-apt.sh
@@ -18,7 +18,7 @@ install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
 
 #Fix for changing path for security updates in testing/bullseye
-if [ "$RELEASE" = "testing" ] ; then
+if [ "$RELEASE" = "testing" ] || [ "$RELEASE" = "bullseye" ]; then
 sed -i "s,stretch\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
 sed -i "s/ stretch/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
 fi
diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh
index 2802792..cdb74ef 100644
--- a/bootstrap.d/13-kernel.sh
+++ b/bootstrap.d/13-kernel.sh
@@ -1,5 +1,5 @@
 #
-# Build and Setup RPi2/3 Kernel
+# Build and Setup RPi2/3/4 Kernel
 #
 
 # Load utility functions
@@ -780,7 +780,7 @@ if [ "$BUILD_KERNEL" = true ] ; then
 
   if [ "$ENABLE_UBOOT" = false ] ; then
     # Convert and copy kernel image to the boot directory
-    "${KERNEL_DIR}/scripts/mkknlimg" "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
+    cp "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
   else
     # Copy kernel image to the boot directory
     install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"