From 16c2d0ce3e61968d692171cb0bf246026fc5258d Mon Sep 17 00:00:00 2001
From: Tomasz Zaworski <zawoor@wmi.amu.edu.pl>
Date: Thu, 29 Jul 2021 12:42:53 +0200
Subject: [PATCH] Changed kernel to 5.10.0-0.bpo.3.

---
 buster-amd64/bin/basefs_init     |  1 +
 buster-amd64/bin/dist_iso        |  2 +-
 buster-amd64/bin/helperfs_config | 13 ++++++++-----
 buster-amd64/mkrescue            |  5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/buster-amd64/bin/basefs_init b/buster-amd64/bin/basefs_init
index 7f05a80..4eecc5e 100755
--- a/buster-amd64/bin/basefs_init
+++ b/buster-amd64/bin/basefs_init
@@ -11,6 +11,7 @@ debootstrap --arch=amd64 --variant=minbase ${DEBIAN_CODENAME} ${TARGET} http://h
 cat << EOF > ${TARGET}/etc/apt/sources.list
 deb http://httpredir.debian.org/debian ${DEBIAN_CODENAME} main contrib non-free
 deb http://security.debian.org/ ${DEBIAN_CODENAME}/updates main contrib non-free
+deb http://deb.debian.org/debian ${DEBIAN_CODENAME}-backports main contrib non-free
 EOF
 
 cat << EOF > ${TARGET}/etc/apt/apt.conf.d/80small
diff --git a/buster-amd64/bin/dist_iso b/buster-amd64/bin/dist_iso
index d8221d0..0febe73 100755
--- a/buster-amd64/bin/dist_iso
+++ b/buster-amd64/bin/dist_iso
@@ -81,7 +81,7 @@ cat /usr/lib/grub/i386-pc/cdboot.img ${TEMP_DIR_GRUB}/core.img > $TEMP_DIR/boot/
 cat /usr/lib/grub/i386-pc/boot.img ${TEMP_DIR_GRUB}/core.img > ${TEMP_DIR_GRUB}/embedded.img
 
 #EFI
-grub-mkimage -C xz -O x86_64-efi -p /boot/efi/ -o "${TEMP_DIR_GRUB}/bootx64.efi" linux chain iso9660 normal all_video gfxterm gfxmenu png
+grub-mkimage -C xz -O x86_64-efi -p /boot/efi/ -o "${TEMP_DIR_GRUB}/bootx64.efi" linux chain iso9660 normal all_video gfxterm gfxmenu png linuxefi
 truncate -s $(($(stat --printf="%s" ${TEMP_DIR_GRUB}/bootx64.efi) + 24576)) ${TEMP_DIR_GRUB}/efi.img
 mkfs.vfat ${TEMP_DIR_GRUB}/efi.img
 mkdir ${TEMP_DIR_GRUB}/mountpoint
diff --git a/buster-amd64/bin/helperfs_config b/buster-amd64/bin/helperfs_config
index 5c78024..b1b2b88 100755
--- a/buster-amd64/bin/helperfs_config
+++ b/buster-amd64/bin/helperfs_config
@@ -2,9 +2,11 @@
 
 TARGET=$1
 KERNEL_VERSION=$2
+KERNEL_REPO=$3
 LANG=C
 
-FIRMWARES="firmware-bnx2 firmware-bnx2x firmware-cavium firmware-linux-free \
+FIRMWARES1="firmware-linux-free"
+FIRMWARES2="firmware-bnx2 firmware-bnx2x firmware-cavium  \
     firmware-misc-nonfree firmware-myricom firmware-netxen firmware-qlogic \
     firmware-realtek"
 
@@ -16,8 +18,9 @@ EOF
 chmod a+x $TARGET/usr/sbin/policy-rc.d
 
 chroot ${TARGET} mount -t proc proc /proc
-chroot ${TARGET} apt-get --yes install busybox-static linux-image-${KERNEL_VERSION}
-chroot ${TARGET} apt-get --yes install linux-headers-${KERNEL_VERSION}
-chroot ${TARGET} apt-get --yes install zfs-dkms
-chroot ${TARGET} apt-get --yes install ${FIRMWARES}
+chroot ${TARGET} apt-get --yes install busybox-static
+chroot ${TARGET} apt-get --yes install -t ${KERNEL_REPO} linux-image-${KERNEL_VERSION} linux-headers-${KERNEL_VERSION}
+chroot ${TARGET} apt-get --yes install -t ${KERNEL_REPO} zfs-dkms
+chroot ${TARGET} apt-get --yes install ${FIRMWARES1}
+chroot ${TARGET} apt-get --yes install -t ${KERNEL_REPO} ${FIRMWARES2}
 chroot ${TARGET} umount /proc
diff --git a/buster-amd64/mkrescue b/buster-amd64/mkrescue
index 95b5941..52dc391 100755
--- a/buster-amd64/mkrescue
+++ b/buster-amd64/mkrescue
@@ -4,7 +4,8 @@ TARGET=$1
 VERSION=$(date +%g.%m)
 OUTPUT=${TARGET}/output/${VERSION}
 DEBIAN_CODENAME='buster'
-KERNEL_VERSION='4.19.0-8-amd64'
+KERNEL_VERSION='5.10.0-0.bpo.3-amd64'
+KERNEL_REPO="buster-backports"
 ARCH='amd64'
 
 umask 022
@@ -26,7 +27,7 @@ ${SCRIPTDIR}/bin/basefs_init ${TARGET}/basefs ${DEBIAN_CODENAME}
 cp -a ${TARGET}/basefs ${TARGET}/rootfs
 cp -a ${TARGET}/basefs ${TARGET}/helperfs
 
-${SCRIPTDIR}/bin/helperfs_config ${TARGET}/helperfs ${KERNEL_VERSION}
+${SCRIPTDIR}/bin/helperfs_config ${TARGET}/helperfs ${KERNEL_VERSION} ${KERNEL_REPO}
 
 # ROOTFS