toggle to vendor kernel

Author: amazingfate

.github/workflows/build.yml

@@ -62,6 +62,7 @@ jobs:
           cp ../networkmanager.yaml .
           cp ../customize-chroot-${{ matrix.CODENAME }}.hook.chroot customize-chroot.hook.chroot
           cp ../10_linux .
+          cp ../zz-rk3588-update-dtb-for-edk2 .
           chmod +x lb-config.sh
           ./lb-config.sh
           sudo apt -y install qemu-user-static debian-archive-keyring

0001-binary_linux-image-install-dtbs.patch

@@ -11,11 +11,13 @@ diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
 index d1877daf4..6e4b5ee3f 100755
 --- a/scripts/build/binary_linux-image
 +++ b/scripts/build/binary_linux-image
-@@ -62,6 +62,7 @@ mkdir -p "${DESTDIR}"
+@@ -62,6 +62,9 @@ mkdir -p "${DESTDIR}"
 
  # Installing linux-image
  cp -a chroot/boot/"${LINUX}"-* "${DESTDIR}"
-+cp -a chroot/boot/dtb-* "${DESTDIR}/dtb" 2>&1 || Echo_message "Sking installing missing dtbs."
++mkdir -p "${DESTDIR}/dtb" && cp -a chroot/usr/lib/linux-image-*/rockchip "${DESTDIR}/dtb" 2>&1 || Echo_message "Sking installing missing dtbs."
++mkdir -p binary/dtb/base/ && cp -a chroot/usr/lib/linux-image-*/*/*.dtb binary/dtb/base 2>&1 || Echo_message "Sking installing missing dtbs."
++mkdir -p binary/dtb/overlays/ && cp -a chroot/usr/lib/linux-image-*/rockchip/overlay/rockchip-rk3588-panthor-gpu.dtbo binary/dtb/overlays 2>&1 || Echo_message "Sking installing missing panthor dtbo."
  cp -a chroot/boot/initrd.img-* "${DESTDIR}" 2>&1 || Echo_message "Skip installing missing initrd."
 
  case "${LB_INITRAMFS}" in

additional-packages.bookworm

@@ -1,4 +1,11 @@
-firmware-misc-nonfree
+firmware-misc-nonfree/bookworm-backports
+firmware-ti-connectivity/bookworm-backports
+libgl1-mesa-dri/bookworm-backports
+libegl-mesa0/bookworm-backports
+libdrm-amdgpu1/bookworm-backports
+libdrm-radeon1/bookworm-backports
+libglapi-mesa/bookworm-backports
+libglx-mesa0/bookworm-backports
 mesa-utils
 vim
 calamares-settings-debian

customize-chroot-bookworm.hook.chroot

@@ -9,3 +9,26 @@ then
 fi
 
 echo "chroot \$CHROOT /usr/bin/ssh-keygen -A" >> /usr/sbin/bootloader-config
+
+cat << EOF > /usr/lib/calamares/modules/calamares-copy-dtbs.sh
+#!/bin/bash
+set -ex
+
+if ! mountpoint -q /boot/efi; then
+        mount /boot/efi || exit 1
+fi
+
+mkdir -p /boot/efi/base
+mkdir -p /boot/efi/overlays
+cp /usr/lib/linux-image-*/rockchip/*.dtb /boot/efi/base
+cp /usr/lib/linux-image-*/rockchip/rockchip-rk3588-panthor-gpu.dtbo /boot/efi/overlays
+EOF
+
+chmod +x /usr/lib/calamares/modules/calamares-copy-dtbs.sh
+
+cat << EOF > /etc/calamares/modules/install-dtb.conf
+---
+shellprocess:
+    - filename: "/usr/lib/calamares/modules/calamares-copy-dtbs.sh"
+      timeout: 30
+EOF

lb-config-bookworm.sh

@@ -6,10 +6,11 @@ LB_IMAGE_NAME="debian-bookworm-live" lb config \
 	--distribution bookworm \
 	--distribution-chroot bookworm \
 	--distribution-binary bookworm\
+	--backports true \
 	--bootloaders grub-efi \
 	--keyring-packages "debian-archive-keyring ca-certificates fontconfig-config initramfs-tools" \
-	--linux-packages "linux-image linux-dtb linux-headers" \
-	--linux-flavours "legacy-rk35xx" \
+	--linux-packages "linux-image linux-headers" \
+	--linux-flavours "vendor-rk35xx" \
 	--parent-mirror-bootstrap "http://ftp.debian.org/debian/" \
 	--parent-mirror-chroot "http://ftp.debian.org/debian/" \
 	--parent-mirror-chroot-security "http://security.debian.org/debian-security/" \
@@ -25,17 +26,11 @@ LB_IMAGE_NAME="debian-bookworm-live" lb config \
 
 echo "deb https://apt.armbian.com bookworm main bookworm-utils bookworm-desktop" > config/archives/live.list.chroot
 echo "deb https://apt.armbian.com bookworm main bookworm-utils bookworm-desktop" > config/archives/live.list.binary
-echo "deb https://download.opensuse.org/repositories/home:/amazingfate:/panfork-mesa/Debian_12/ ./" >> config/archives/live.list.chroot
-echo "deb https://download.opensuse.org/repositories/home:/amazingfate:/panfork-mesa/Debian_12/ ./" >> config/archives/live.list.binary
 
 wget https://raw.githubusercontent.com/armbian/build/main/config/armbian.key
 gpg --dearmor < armbian.key > armbian.gpg
 cp armbian.gpg config/archives/armbian.key.binary
 cp armbian.gpg config/archives/armbian.key.chroot
-wget https://download.opensuse.org/repositories/home:/amazingfate:/panfork-mesa/Debian_12/Release.key
-gpg --dearmor < Release.key > obs-amazingfate.gpg
-cp obs-amazingfate.gpg config/archives/obs-amazingfate.key.binary
-cp obs-amazingfate.gpg config/archives/obs-amazingfate.key.chroot
 
 wget https://raw.githubusercontent.com/armbian/build/main/config/cli/common/main/packages -O config/package-lists/armbian-cli.list.chroot
 wget https://raw.githubusercontent.com/armbian/build/main/config/cli/common/main/packages.additional -O config/package-lists/armbian-cli-addtional.list.chroot
@@ -50,3 +45,5 @@ cp networkmanager.yaml config/includes.chroot_after_packages/etc/netplan
 cp customize-chroot.hook.chroot config/hooks/live
 mkdir -p config/includes.chroot_after_packages/etc/grub.d/
 cp 10_linux config/includes.chroot_after_packages/etc/grub.d/
+mkdir -p config/includes.chroot_after_packages/etc/kernel/postinst.d/
+cp zz-rk3588-update-dtb-for-edk2 config/includes.chroot_after_packages/etc/kernel/postinst.d/

zz-rk3588-update-dtb-for-edk2

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -ex
+
+if [ -d /boot/efi ];then
+	mkdir -p /boot/efi/base
+	mkdir -p /boot/efi/overlays
+	cp /usr/lib/linux-image-*/rockchip/*.dtb /boot/efi/base
+	cp /usr/lib/linux-image-*/rockchip/rockchip-rk3588-panthor-gpu.dtbo /boot/efi/overlays
+fi