diff --git a/external/config/boards/orangepi3b.conf b/external/config/boards/orangepi3b.conf index da5d29d..2b49b9e 100755 --- a/external/config/boards/orangepi3b.conf +++ b/external/config/boards/orangepi3b.conf @@ -7,7 +7,7 @@ MODULES_BLACKLIST_LEGACY="bcmdhd" KERNEL_TARGET="legacy" BOOT_LOGO="desktop" BOOT_SUPPORT_SPI="yes" -DISTRIB_TYPE_LEGACY="focal jammy bullseye raspi" +DISTRIB_TYPE_LEGACY="focal jammy bullseye bookworm raspi" BOOTFS_TYPE="fat" IMAGE_PARTITION_TABLE="gpt" BOOT_FDT_FILE="rockchip/rk3566-orangepi-3b.dtb" diff --git a/external/config/boards/orangepicm4.conf b/external/config/boards/orangepicm4.conf index 65dedda..5599fd6 100755 --- a/external/config/boards/orangepicm4.conf +++ b/external/config/boards/orangepicm4.conf @@ -7,7 +7,7 @@ MODULES_BLACKLIST_LEGACY="bcmdhd" KERNEL_TARGET="legacy" BOOT_LOGO="desktop" BOOT_SUPPORT_SPI="yes" -DISTRIB_TYPE_LEGACY="focal jammy bullseye raspi" +DISTRIB_TYPE_LEGACY="focal jammy bullseye bookworm raspi" BOOTFS_TYPE="fat" IMAGE_PARTITION_TABLE="gpt" BOOT_FDT_FILE="rockchip/rk3566-orangepi-cm4.dtb" diff --git a/external/config/sources/families/include/rk356x_gpu_vpu.inc b/external/config/sources/families/include/rk356x_gpu_vpu.inc index e4873f0..10154b3 100755 --- a/external/config/sources/families/include/rk356x_gpu_vpu.inc +++ b/external/config/sources/families/include/rk356x_gpu_vpu.inc @@ -345,6 +345,123 @@ rk356x_gpu_vpu_tweaks() chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/" fi + + if [[ ${BOARD} =~ orangepicm4|orangepi3b && ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} =~ xfce|kde-plasma && ${RELEASE} == bookworm ]]; then + + + rk356x_deb+=("rk356x_packages/common/libmali/libmali-bifrost-g52-g13p0-x11-gbm_1.9-1_arm64.deb") + rk356x_deb+=("rk356x_packages/common/rga2/librga2_2.2.0-1_arm64.deb") + rk356x_deb+=("rk356x_packages/common/rga2/librga-dev_2.2.0-1_arm64.deb") + rk356x_deb+=("rk356x_packages/common/rkaiq/camera_engine_rkaiq_rk3568_arm64.deb") + rk356x_deb+=("rk356x_packages/common/rktoolkit/rktoolkit_1.0.0-1_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/mpp/librockchip-mpp1_1.5.0-1.2_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/mpp/librockchip-mpp-dev_1.5.0-1.2_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/mpp/librockchip-vpu0_1.5.0-1.2_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/mpp/rockchip-mpp-demos_1.5.0-1.2_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/gstreamer-rockchip/gstreamer1.0-rockchip1_1.14-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gstreamer1.0/gir1.2-gstreamer-1.0_1.22.0-3_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gstreamer1.0/gstreamer1.0-tools_1.22.0-3_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gstreamer1.0/libgstreamer1.0-0_1.22.0-3_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gstreamer1.0/libgstreamer1.0-dev_1.22.0-3_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/gir1.2-gst-plugins-base-1.0_1.22.0-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/gstreamer1.0-alsa_1.22.0-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/gstreamer1.0-gl_1.22.0-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/gstreamer1.0-plugins-base_1.22.0-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/gstreamer1.0-plugins-base-apps_1.22.0-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/gstreamer1.0-x_1.22.0-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/libgstreamer-gl1.0-0_1.22.0-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.22.0-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.22.0-4_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-0_1.22.0-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-bad1.0/gir1.2-gst-plugins-bad-1.0_1.22.0-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-bad1.0/libgstreamer-opencv1.0-0_1.22.0-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-opencv_1.22.0-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-plugins-bad_1.22.0-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-plugins-bad-apps_1.22.0-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-wpe_1.22.0-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-dev_1.22.0-5_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-good1.0/gstreamer1.0-gtk3_1.22.0-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.22.0-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.22.0-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-good1.0/gstreamer1.0-qt5_1.22.0-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/gst-plugins-good1.0/gstreamer1.0-qt6_1.22.0-6_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/libdvbv5-0_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/dvb-tools_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/ir-keytable_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/libdvbv5-dev_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/libdvbv5-doc_1.22.1-6_all.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/libv4lconvert0_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/libv4l-0_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/libv4l2rds0_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/libv4l-dev_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/v4l-utils_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/qv4l2_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l/qvidcap_1.22.1-6_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libv4l-rkmpp/libv4l-rkmpp_1.5.1-1.1_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/xserver/xserver-common_21.1.7-3_all.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/xserver/xserver-xorg-core_21.1.7-3_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/xserver/xserver-xorg-dev_21.1.7-3_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/xserver/xserver-xorg-legacy_21.1.7-3_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/xserver/xnest_21.1.7-3_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/xserver/xserver-xephyr_21.1.7-3_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/xserver/xvfb_21.1.7-3_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/chromium/chromium-codecs-ffmpeg-extra_110.0.5481.4-debian11~bullseye~rkmpp20230130+1_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/chromium/chromium-browser_110.0.5481.4-debian11~bullseye~rkmpp20230130+1_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/libdrm-cursor/libdrm-cursor_1.4.0-1_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/libdrm-cursor/libdrm-cursor-dev_1.4.0-1_arm64.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavutil57_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavutil-dev_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libpostproc56_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libpostproc-dev_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libswresample4_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libswresample-dev_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libswscale6_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libswscale-dev_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavcodec59_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavcodec-dev_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavformat59_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavformat-dev_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavfilter8_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavfilter-dev_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavdevice59_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/libavdevice-dev_5.1.3-4_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/ffmpeg_5.1.3-4_arm64.deb") + #rk356x_deb+=("rk356x_packages/${RELEASE}/ffmpeg/ffmpeg-doc_5.1.3-4_all.deb") + + rk356x_deb+=("rk356x_packages/${RELEASE}/mpv/libmpv2_0.35.1-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/mpv/libmpv-dev_0.35.1-5_arm64.deb") + rk356x_deb+=("rk356x_packages/${RELEASE}/mpv/mpv_0.35.1-5_arm64.deb") + + for deb in ${rk356x_deb[@]} + do + dpkg_install_deb_chroot "$EXTER/cache/sources/${deb}" + done + + # 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/" + + cp $EXTER/cache/sources/rk356x_packages/${RELEASE}/chromium/default $SDCARD/etc/chromium-browser/ + 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}" + fi + fi } rk356x_gpu_vpu_tweaks_for_raspios()