RK3588 Support Debian12 Bookworm

opi5: update to v1.1.6
opi5b: update to v1.0.6
opi5plus: update to v1.0.6

external/config/boards/orangepi5.conf

@@ -12,4 +12,4 @@ BOOT_SUPPORT_SPI="yes"
 SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
 DISTRIB_TYPE_LEGACY="bullseye bookworm bionic focal jammy"
 BOOTFS_TYPE="fat"
-REVISION="1.1.4"
+REVISION="1.1.6"

external/config/boards/orangepi5b.conf

@@ -11,4 +11,4 @@ BOOT_SUPPORT_SPI="yes"
 SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
 DISTRIB_TYPE_LEGACY="bullseye bookworm bionic focal jammy"
 BOOTFS_TYPE="fat"
-REVISION="1.0.4"
+REVISION="1.0.6"

external/config/boards/orangepi5plus.conf

@@ -11,4 +11,4 @@ BOOT_SUPPORT_SPI="yes"
 SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
 DISTRIB_TYPE_LEGACY="bullseye bookworm bionic focal jammy"
 BOOTFS_TYPE="fat"
-REVISION="1.0.4"
+REVISION="1.0.6"

external/config/cli/bookworm/main/packages

@@ -13,6 +13,7 @@ openssh-server
 parted
 psmisc
 python3-apt
+python-is-python3
 smartmontools
 sysfsutils
 toilet

external/config/desktop/bookworm/environments/xfce/config_base/packages

@@ -95,6 +95,7 @@ smbclient
 software-properties-gtk
 spice-vdagent
 system-config-printer
+terminator
 thunar-volman
 tumbler
 update-inetd
@@ -109,6 +110,7 @@ xfce4
 xfce4-notifyd
 xfce4-screenshooter
 xfce4-terminal
+xfce4-power-manager
 xfce4-pulseaudio-plugin
 xfonts-100dpi
 xfonts-75dpi

external/config/optional/families/rockchip-rk3588/_config/desktop/bookworm/environments/xfce/config_base/packages

@@ -0,0 +1,40 @@
+cheese
+fcitx-config-gtk
+fcitx-frontend-gtk3
+fcitx-frontend-qt5
+fcitx-googlepinyin
+fcitx-table-all
+fcitx-ui-classic
+ffmpeg
+fonts-arphic-bsmi00lp
+fonts-arphic-gbsn00lp
+fonts-arphic-gkai00mp
+fonts-glyphicons-halflings
+geany
+glmark2-es2-x11
+glmark2-x11
+gstreamer1.0-alsa
+gstreamer1.0-opencv
+gstreamer1.0-plugins-bad
+gstreamer1.0-plugins-base
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-plugins-ugly
+gstreamer1.0-qt5
+gstreamer1.0-qt6
+gstreamer1.0-tools
+gstreamer1.0-wpe
+im-config
+libgstreamer-opencv1.0-0
+libgstreamer-plugins-bad1.0-dev
+libgstreamer-plugins-base1.0-dev
+libjs-bootstrap
+libmpv-dev
+libunwind-dev libdw-dev
+libv4l-0
+mpv
+pkg-config libglib2.0-dev
+qtmultimedia5-examples
+tightvncserver
+xserver-xephyr
+xserver-xorg-dev
+zenity

external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages

@@ -273,3 +273,4 @@ fcitx5-config-qt
 xinput
 gparted
 libjsoncpp-dev
+libpipewire-0.3-0

external/config/sources/families/include/rk3588_gpu_vpu.inc

@@ -13,10 +13,10 @@ rk3588_gpu_vpu_tweaks()
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rga2/librga2_2.2.0-1_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rga2/librga-dev_2.2.0-1_arm64.deb"
 
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-mpp1_1.5.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-mpp1_1.5.0-2_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-mpp-dev_1.5.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-mpp-dev_1.5.0-2_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-vpu0_1.5.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-vpu0_1.5.0-2_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/rockchip-mpp-demos_1.5.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/rockchip-mpp-demos_1.5.0-2_arm64.deb"
 
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-rkmpp/gstreamer1.0-rockchip1_1.14-4_arm64.deb"
 
@@ -125,6 +125,140 @@ rk3588_gpu_vpu_tweaks()
 		chroot $SDCARD /bin/bash -c "cd /usr/lib/aarch64-linux-gnu/dri/;cp kms_swrast_dri.so swrast_dri.so rockchip_dri.so /"
 		chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/"
 
+		if [[ $install_zfs == "yes" ]]; then
+
+			chroot $SDCARD /bin/bash -c "dpkg -i /opt/${CHOSEN_KERNEL/image/headers}_${REVISION}_${ARCH}.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/zfs/libnvpair3linux_2.1.11-1~bpo11+1_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/zfs/libuutil3linux_2.1.11-1~bpo11+1_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/zfs/libzfs4linux_2.1.11-1~bpo11+1_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/zfs/libzpool5linux_2.1.11-1~bpo11+1_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/zfs/zfsutils-linux_2.1.11-1~bpo11+1_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/zfs/zfs-dkms_2.1.11-1~bpo11+1_all.deb"
+			chroot $SDCARD /bin/bash -c "apt remove -y ${CHOSEN_KERNEL/image/headers}"
+			chroot $SDCARD /bin/bash -c "rm -r /usr/src/linux-headers-5.10.110-rockchip-rk3588"
+		fi
+	fi
+
+	if [[ ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} =~ xfce|kde-plasma && ${RELEASE} == bookworm ]]; then
+
+
+		#chroot $SDCARD /bin/bash -c "apt-get update"
+		#chroot $SDCARD /bin/bash -c "apt-get install -y"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb"
+		cp "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/rkaiq_3A_server" $SDCARD/usr/bin/ -f
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rga2/librga2_2.1.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rga2/librga-dev_2.1.0-1_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-mpp1_1.5.0-1.2_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-mpp-dev_1.5.0-1.2_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-vpu0_1.5.0-1.2_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/rockchip-mpp-demos_1.5.0-1.2_arm64.deb"
+
+		install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libmali/libmali-valhall-g610-g6p0-x11_1.9-1_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer-rockchip/gstreamer1.0-rockchip1_1.14-4_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer1.0/gir1.2-gstreamer-1.0_1.22.0-3_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer1.0/gstreamer1.0-tools_1.22.0-3_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer1.0/libgstreamer1.0-0_1.22.0-3_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer1.0/libgstreamer1.0-dev_1.22.0-3_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gir1.2-gst-plugins-base-1.0_1.22.0-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-alsa_1.22.0-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-gl_1.22.0-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-plugins-base_1.22.0-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-plugins-base-apps_1.22.0-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-x_1.22.0-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/libgstreamer-gl1.0-0_1.22.0-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.22.0-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.22.0-4_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-0_1.22.0-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gir1.2-gst-plugins-bad-1.0_1.22.0-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/libgstreamer-opencv1.0-0_1.22.0-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-opencv_1.22.0-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-plugins-bad_1.22.0-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-plugins-bad-apps_1.22.0-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-wpe_1.22.0-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-dev_1.22.0-5_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-gtk3_1.22.0-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.22.0-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.22.0-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-qt5_1.22.0-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-qt6_1.22.0-6_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libdvbv5-0_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/dvb-tools_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/ir-keytable_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libdvbv5-dev_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libdvbv5-doc_1.22.1-6_all.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4lconvert0_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4l-0_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4l2rds0_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4l-dev_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/v4l-utils_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/qv4l2_1.22.1-6_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/qvidcap_1.22.1-6_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l-rkmpp/libv4l-rkmpp_1.5.1-1.1_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-common_21.1.7-4_all.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-xorg-core_21.1.7-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-xorg-dev_21.1.7-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-xorg-legacy_21.1.7-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xnest_21.1.7-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-xephyr_21.1.7-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xvfb_21.1.7-4_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/chromium/chromium-codecs-ffmpeg-extra_110.0.5481.4-debian11~bullseye~rkmpp20230130+1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/chromium/chromium-browser_110.0.5481.4-debian11~bullseye~rkmpp20230130+1_arm64.deb"
+		cp $EXTER/cache/sources/rk3588_packages_${RELEASE}/chromium/default $SDCARD/etc/chromium-browser/
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libdrm-cursor/libdrm-cursor_1.4.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libdrm-cursor/libdrm-cursor-dev_1.4.0-1_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rktoolkit/rktoolkit_1.0.0-1_arm64.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavutil57_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavutil-dev_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libpostproc56_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libpostproc-dev_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libswresample4_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libswresample-dev_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libswscale6_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libswscale-dev_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavcodec59_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavcodec-dev_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavformat59_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavformat-dev_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavfilter8_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavfilter-dev_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavdevice59_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavdevice-dev_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/ffmpeg_5.1.3-4_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/ffmpeg-doc_5.1.3-4_all.deb"
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpv/libmpv2_0.35.1-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpv/libmpv-dev_0.35.1-5_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpv/mpv_0.35.1-5_arm64.deb"
+
+		# The chromium using fixed pathes for libv4l2.so
+		chroot $SDCARD /bin/bash -c "ln -rsf /usr/lib/*/libv4l2.so /usr/lib/"
+		chroot $SDCARD /bin/bash -c "[ -e /usr/lib/aarch64-linux-gnu/ ] && ln -Tsf lib /usr/lib64"
+
+		chroot $SDCARD /bin/bash -c "cd /usr/lib/aarch64-linux-gnu/dri/;cp kms_swrast_dri.so swrast_dri.so rockchip_dri.so /"
+		chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/"
+
+		if [[ $install_zfs == "yes" ]]; then
+
+			chroot $SDCARD /bin/bash -c "dpkg -i /opt/${CHOSEN_KERNEL/image/headers}_${REVISION}_${ARCH}.deb"
+			run_on_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -yqq zfsutils-linux zfs-dkms"
+			chroot $SDCARD /bin/bash -c "apt remove -y ${CHOSEN_KERNEL/image/headers}"
+			chroot $SDCARD /bin/bash -c "rm -r /usr/src/linux-headers-5.10.110-rockchip-rk3588"
+		fi
 	fi
 
 	if [[ ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} =~ xfce|kde-plasma && ${RELEASE} == jammy ]]; then
@@ -141,10 +275,10 @@ rk3588_gpu_vpu_tweaks()
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rga2/librga2_2.2.0-1_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rga2/librga-dev_2.2.0-1_arm64.deb"
 
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp1_1.5.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp1_1.5.0-1.2_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp-dev_1.5.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp-dev_1.5.0-1.2_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-vpu0_1.5.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-vpu0_1.5.0-1.2_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/rockchip-mpp-demos_1.5.0-1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/rockchip-mpp-demos_1.5.0-1.2_arm64.deb"
 
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-rkmpp/gstreamer1.0-rockchip1_1.14-4_arm64.deb"
 
@@ -188,7 +322,7 @@ rk3588_gpu_vpu_tweaks()
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l2rds0_1.22.1-2build1_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4lconvert0_1.22.1-2build1_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l-dev_1.22.1-2build1_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l-rkmpp_1.5.0-1.1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l-rkmpp_1.5.1-1.1_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/v4l-utils_1.22.1-2build1_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/qv4l2_1.22.1-2build1_arm64.deb"
 
@@ -232,8 +366,12 @@ rk3588_gpu_vpu_tweaks()
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpv/mpv_0.34.1-1ubuntu3_arm64.deb"
 		cp ${EXTER}/packages/bsp/rk3588/etc/mpv/mpv.conf $SDCARD/etc/mpv/
 
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/chromium/chromium-x11_91.0.4472.164_arm64.deb"
+		#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/chromium/chromium-x11_91.0.4472.164_arm64.deb"
-		cp ${EXTER}/cache/sources/rk3588_packages_jammy/chromium/libjpeg.so.62 $SDCARD/usr/lib/aarch64-linux-gnu/
+		#cp ${EXTER}/cache/sources/rk3588_packages_jammy/chromium/libjpeg.so.62 $SDCARD/usr/lib/aarch64-linux-gnu/
+
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/chromium-x11/chromium-codecs-ffmpeg-extra_110.0.5481.4-debian11~bullseye~rkmpp20230130+1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/chromium-x11/chromium-browser_110.0.5481.4-debian11~bullseye~rkmpp20230130+1_arm64.deb"
+		cp $EXTER/cache/sources/rk3588_packages_${RELEASE}/chromium-x11/default $SDCARD/etc/chromium-browser/
 
 		chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X"
 
@@ -243,6 +381,19 @@ rk3588_gpu_vpu_tweaks()
 
 		chroot $SDCARD /bin/bash -c "cd /usr/lib/aarch64-linux-gnu/dri/;cp kms_swrast_dri.so swrast_dri.so rockchip_dri.so /"
 		chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/"
+
+		if [[ $install_zfs == "yes" ]]; then
+
+			chroot $SDCARD /bin/bash -c "dpkg -i /opt/${CHOSEN_KERNEL/image/headers}_${REVISION}_${ARCH}.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/libnvpair3linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/libuutil3linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/libzfs4linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/libzpool5linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/zfsutils-linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/zfs-dkms_2.1.6-0york1~22.04_all.deb"
+			chroot $SDCARD /bin/bash -c "apt remove -y ${CHOSEN_KERNEL/image/headers}"
+			chroot $SDCARD /bin/bash -c "rm -r /usr/src/linux-headers-5.10.110-rockchip-rk3588"
+		fi
 	fi
 
 	if [[ ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} == xfce && ${RELEASE} == focal ]]; then
@@ -359,6 +510,19 @@ rk3588_gpu_vpu_tweaks()
 		chroot $SDCARD /bin/bash -c "cd /usr/lib/aarch64-linux-gnu/dri/;cp kms_swrast_dri.so swrast_dri.so rockchip_dri.so /"
 		chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/"
 
+		if [[ $install_zfs == "yes" ]]; then
+
+			chroot $SDCARD /bin/bash -c "dpkg -i /opt/${CHOSEN_KERNEL/image/headers}_${REVISION}_${ARCH}.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/zfs/libnvpair3linux_2.1.6-0york1~20.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/zfs/libuutil3linux_2.1.6-0york1~20.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/zfs/libzfs4linux_2.1.6-0york1~20.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/zfs/libzpool5linux_2.1.6-0york1~20.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/zfs/zfsutils-linux_2.1.6-0york1~20.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/zfs/zfs-dkms_2.1.6-0york1~20.04_all.deb"
+			chroot $SDCARD /bin/bash -c "apt remove -y ${CHOSEN_KERNEL/image/headers}"
+			chroot $SDCARD /bin/bash -c "rm -r /usr/src/linux-headers-5.10.110-rockchip-rk3588"
+		fi
+
 	fi
 
 
@@ -372,10 +536,11 @@ rk3588_gpu_vpu_tweaks()
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rga2/librga2_2.2.0-1+git220920.c1d5c71~jammy_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rga2/librga-dev_2.2.0-1+git220920.c1d5c71~jammy_arm64.deb"
 
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp1_1.5.0-1+git230210.c145c84~jammy1_arm64.deb"
+
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp-dev_1.5.0-1+git230210.c145c84~jammy1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp1_1.5.0-1.2_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-vpu0_1.5.0-1+git230210.c145c84~jammy1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp-dev_1.5.0-1.2_arm64.deb"
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/rockchip-mpp-demos_1.5.0-1+git230210.c145c84~jammy1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-vpu0_1.5.0-1.2_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/rockchip-mpp-demos_1.5.0-1.2_arm64.deb"
 
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-rkmpp/gstreamer1.0-rockchip1_1.14-4_arm64.deb"
 
@@ -422,7 +587,7 @@ rk3588_gpu_vpu_tweaks()
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/v4l-utils_1.22.1-2build1+rkmpp20221209_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/qv4l2_1.22.1-2build1+rkmpp20221209_arm64.deb"
 
-		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l-rkmpp_1.5.1-1.1+git230130.b004755~jammy1_arm64.deb"
+		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l-rkmpp_1.5.1-1.1_arm64.deb"
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/rockchip-multimedia-config_1.0.0-2+jammy_all.deb"
 
 		#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/xserver/xserver-xorg-core_21.1.3-2ubuntu2_arm64.deb"
@@ -482,5 +647,19 @@ rk3588_gpu_vpu_tweaks()
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/kodi/kodi_19.4+dfsg1-2+gles2_arm64.deb"
 
 		dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rktoolkit/rktoolkit_1.0.0-1_arm64.deb"
+
+		if [[ $install_zfs == "yes" ]]; then
+
+			chroot $SDCARD /bin/bash -c "dpkg -i /opt/${CHOSEN_KERNEL/image/headers}_${REVISION}_${ARCH}.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/libnvpair3linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/libuutil3linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/libzfs4linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/libzpool5linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/zfsutils-linux_2.1.6-0york1~22.04_arm64.deb"
+			dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/zfs/zfs-dkms_2.1.6-0york1~22.04_all.deb"
+			chroot $SDCARD /bin/bash -c "apt remove -y ${CHOSEN_KERNEL/image/headers}"
+			chroot $SDCARD /bin/bash -c "rm -r /usr/src/linux-headers-5.10.110-rockchip-rk3588"
+		fi
+
 	fi
 }

external/config/templates/config-example.conf

@@ -25,6 +25,7 @@ COMPRESS_OUTPUTIMAGE="no"
 NO_APT_CACHER="yes"
 
 #install_balena_etcher="yes"
-#install_chromium="yes"
+#install_zfs="yes"
 #install_docker="yes"
+#install_chromium="yes"
 #install_firefox="yes"

external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization

@@ -103,7 +103,7 @@ prepare_board() {
 			if [[ -c /dev/mpp_service ]]; then
 				chmod 0666 /dev/mpp_service
 
-				if [[ $DISTRIBUTION_CODENAME == bullseye ]]; then
+				if [[ $DISTRIBUTION_CODENAME =~ bullseye|bookworm|jammy ]]; then
 					{
 						echo "type=dec"
 						echo "codecs=VP8:VP9:H.264:H.265:AV1"

external/packages/bsp/rk3588/usr/local/bin/install_qt.sh

@@ -5,7 +5,7 @@ release=$(lsb_release -cs)
 sudo apt update
 if [[ $release =~ focal|bionic|buster ]]; then
 	sudo apt-get -y install qt5-default qttools5-dev-tools qtbase5-doc-html qt5-assistant qt5-doc
-elif [[ $release =~ bullseye|jammy ]]; then
+elif [[ $release =~ bullseye|bookworm|jammy ]]; then
 	sudo apt-get -y install qttools5-dev-tools qtbase5-doc-html qt5-assistant qt5-doc qt5-qmake qt5-qmake-bin
 else
 	echo "Unsupported system!"

external/packages/extras-buildpkgs/90-hostapd.conf

@@ -14,5 +14,5 @@ package_checkbuild()
 
 package_checkinstall()
 {
-	true
+	[[ $RELEASE != bookworm ]]
 }

external/packages/extras-buildpkgs/90-sunxi-tools.conf

@@ -13,10 +13,10 @@ fi
 
 package_checkbuild()
 {
-	[[ $RELEASE != xenial ]]
+	false
 }
 
 package_checkinstall()
 {
-	true
+	false
 }

scripts/general.sh

@@ -184,7 +184,7 @@ create_sources_list()
 	EOF
 	;;
 
-	bullseye|bookworm|trixie)
+	bullseye|trixie)
 	cat <<-EOF > "${basedir}"/etc/apt/sources.list
 	deb https://${DEBIAN_MIRROR} $release main contrib non-free
 	#deb-src https://${DEBIAN_MIRROR} $release main contrib non-free
@@ -200,10 +200,29 @@ create_sources_list()
 	EOF
 	;;
 
+	bookworm)
+	cat <<- EOF > "${basedir}"/etc/apt/sources.list
+	deb http://${DEBIAN_MIRROR} $release main contrib non-free non-free-firmware
+	#deb-src http://${DEBIAN_MIRROR} $release main contrib non-free non-free-firmware
+
+	deb http://${DEBIAN_MIRROR} ${release}-updates main contrib non-free non-free-firmware
+	#deb-src http://${DEBIAN_MIRROR} ${release}-updates main contrib non-free non-free-firmware
+
+	deb http://${DEBIAN_MIRROR} ${release}-backports main contrib non-free non-free-firmware
+	#deb-src http://${DEBIAN_MIRROR} ${release}-backports main contrib non-free non-free-firmware
+
+	deb http://${DEBIAN_SECURTY} ${release}-security main contrib non-free non-free-firmware
+	#deb-src http://${DEBIAN_SECURTY} ${release}-security main contrib non-free non-free-firmware
+	EOF
+	;;
+
 	sid) # sid is permanent unstable development and has no such thing as updates or security
-	cat <<-EOF > "${basedir}"/etc/apt/sources.list
+	cat <<- EOF > "${basedir}"/etc/apt/sources.list
-	deb http://${DEBIAN_MIRROR} $release main contrib non-free
+	deb http://${DEBIAN_MIRROR} $release main contrib non-free non-free-firmware
-	#deb-src http://${DEBIAN_MIRROR} $release main contrib non-free
+	#deb-src http://${DEBIAN_MIRROR} $release main contrib non-free non-free-firmware
+
+	deb http://${DEBIAN_MIRROR} unstable main contrib non-free non-free-firmware
+	#deb-src http://${DEBIAN_MIRROR} unstable main contrib non-free non-free-firmware
 	EOF
 	;;
 

scripts/main.sh

@@ -445,7 +445,7 @@ if [[ ${IGNORE_UPDATES} != yes ]]; then
 
 	fi
 
-	if [[ ${BOARD} =~ orangepi5 && $RELEASE =~ bullseye|focal|jammy ]]; then
+	if [[ ${BOARDFAMILY} == "rockchip-rk3588" && $RELEASE =~ bullseye|bookworm|focal|jammy ]]; then
 
 		[[ ${BUILD_OPT} == image ]] && fetch_from_repo "https://github.com/orangepi-xunlong/rk-rootfs-build.git" "${EXTER}/cache/sources/rk3588_packages_${RELEASE}" "branch:rk3588_packages_${RELEASE}"