diff --git a/external/config/boards/orangepi5.conf b/external/config/boards/orangepi5.conf index 1879499..c0d62b4 100644 --- a/external/config/boards/orangepi5.conf +++ b/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 focal jammy" BOOTFS_TYPE="fat" -REVISION="1.1.2" +REVISION="1.1.4" diff --git a/external/config/kernel/linux-rockchip-rk3588-legacy.config b/external/config/kernel/linux-rockchip-rk3588-legacy.config index 85e6869..f10456a 100644 --- a/external/config/kernel/linux-rockchip-rk3588-legacy.config +++ b/external/config/kernel/linux-rockchip-rk3588-legacy.config @@ -2,10 +2,10 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 5.10.110 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (GNU Toolchain for the Arm Architecture 11.2-2022.02 (arm-11.14)) 11.2.1 20220111" +CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110201 -CONFIG_LD_VERSION=202438220000 +CONFIG_GCC_VERSION=110300 +CONFIG_LD_VERSION=238000000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y @@ -755,10 +755,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_GCC_PLUGINS=y -# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -7389,7 +7385,7 @@ CONFIG_RK_HEADSET=y # CONFIG_ROCKCHIP_RKNPU=y CONFIG_ROCKCHIP_RKNPU_DEBUG_FS=y -# CONFIG_ROCKCHIP_RKNPU_PROC_FS is not set +CONFIG_ROCKCHIP_RKNPU_PROC_FS=y # CONFIG_ROCKCHIP_RKNPU_FENCE is not set # CONFIG_ROCKCHIP_RKNPU_SRAM is not set CONFIG_ROCKCHIP_RKNPU_DRM_GEM=y @@ -7779,10 +7775,6 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf" # Memory initialization # CONFIG_INIT_STACK_NONE=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set -# CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization diff --git a/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/gnome/config_base/packages b/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/gnome/config_base/packages new file mode 100644 index 0000000..def8342 --- /dev/null +++ b/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/gnome/config_base/packages @@ -0,0 +1,313 @@ +libqt5opengl5 +libass9 +libblas3 +libbs2b0 +libdc1394-25 +libdecor-0-0 +libflite1 +libgfortran5 +liblapack3 +libmysofa1 +libopenal-data +libopenal1 +libpocketsphinx3 +librubberband2 +libsdl2-2.0-0 +libsndio7.0 +libsphinxbase3 +libvidstab1.1 +libzimg2 +libdvdnav4 +libdvdread8 +liblua5.2-0 +libmujs1 +libplacebo192 +libsixel1 +libva-wayland2 +libvulkan1 +libbrotli-dev +libdrm-dev +libdrm-etnaviv1 +libdrm-freedreno1 +libdrm-tegra0 +libfontenc-dev +libfreetype-dev +libfreetype6-dev +libgl-dev +libglx-dev +libpciaccess-dev +libpixman-1-dev +libpng-dev +libpthread-stubs0-dev +libx11-dev +libxau-dev +libxcb1-dev +libxcvt-dev +libxdmcp-dev +libxfont-dev +libxkbfile-dev +mesa-common-dev +x11proto-dev +xorg-sgml-doctools +xtrans-dev +glmark2 +glmark2-es2 +libdw-dev +libelf-dev +liblzma-dev +libunwind-dev +gir1.2-gudev-1.0 +libegl-dev +libgbm-dev +libgles-dev +libgles1 +libgudev-1.0-dev +liborc-0.4-dev +liborc-0.4-dev-bin +libudev-dev +libwayland-bin +libwayland-dev +libx11-xcb-dev +audacity +policykit-1-gnome +libdw-dev +libelf-dev +liblzma-dev +libunwind-dev +gir1.2-gudev-1.0 +libegl-dev +libgbm-dev +libgles-dev +libgles1 +libgudev-1.0-dev +liborc-0.4-dev +liborc-0.4-dev-bin +libudev-dev +libwayland-bin +libwayland-dev +libx11-xcb-dev +gdal-data +ibverbs-providers +libaec0 +libarmadillo10 +libarpack2 +libblosc1 +libcfitsio9 +libcharls2 +libdc1394-dev +libdca0 +libde265-0 +libdeflate-dev +libevent-pthreads-2.1-7 +libexif-dev +libfaad2 +libfabric1 +libfluidsynth3 +libfreeaptx0 +libfreexl1 +libfyba0 +libgdal30 +libgdcm-dev +libgdcm3.0 +libgeos-c1v5 +libgeos3.10.2 +libgeotiff5 +libgif7 +libgl2ps1.4 +libglew2.2 +libgphoto2-dev +libgssdp-1.2-0 +libgstreamer-plugins-good1.0-dev +libgupnp-1.2-1 +libgupnp-igd-1.0-4 +libhdf4-0-alt +libhdf5-103-1 +libhdf5-hl-100 +libheif1 +libhwloc-plugins +libhwloc15 +libibverbs1 +libilmbase-dev +libilmbase25 +libinstpatch-1.0-2 +libjbig-dev +libjpeg-dev +libjpeg-turbo8-dev +libjpeg8-dev +libjsoncpp25 +libkate1 +libkmlbase1 +libkmldom1 +libkmlengine1 +libldacbt-enc2 +liblept5 +libltc11 +libminizip1 +libmjpegutils-2.1-0 +libmodplug1 +libmpcdec6 +libmpeg2encpp-2.1-0 +libmplex2-2.1-0 +libmysqlclient21 +libnetcdf19 +libnice10 +libodbc2 +libodbcinst2 +libogdi4.1 +libopencv-calib3d-dev +libopencv-calib3d4.5d +libopencv-contrib-dev +libopencv-contrib4.5d +libopencv-core-dev +libopencv-core4.5d +libopencv-dev +libopencv-dnn-dev +libopencv-dnn4.5d +libopencv-features2d-dev +libopencv-features2d4.5d +libopencv-flann-dev +libopencv-flann4.5d +libopencv-highgui-dev +libopencv-highgui4.5d +libopencv-imgcodecs-dev +libopencv-imgcodecs4.5d +libopencv-imgproc-dev +libopencv-imgproc4.5d +libopencv-ml-dev +libopencv-ml4.5d +libopencv-objdetect-dev +libopencv-objdetect4.5d +libopencv-photo-dev +libopencv-photo4.5d +libopencv-shape-dev +libopencv-shape4.5d +libopencv-stitching-dev +libopencv-stitching4.5d +libopencv-superres-dev +libopencv-superres4.5d +libopencv-video-dev +libopencv-video4.5d +libopencv-videoio-dev +libopencv-videoio4.5d +libopencv-videostab-dev +libopencv-videostab4.5d +libopencv-viz-dev +libopencv-viz4.5d +libopenexr-dev +libopenexr25 +libopengl0 +libopenh264-6 +libopenmpi3 +libopenni2-0 +libpmix2 +libpq5 +libproj22 +libqhull-r8.0 +libraw1394-dev +librdmacm1 +librttopo1 +libsocket++1 +libspandsp2 +libspatialite7 +libsrtp2-1 +libsuperlu5 +libsz2 +libtbb-dev +libtbb12 +libtbb2 +libtbbmalloc2 +libtesseract4 +libtiff-dev +libtiffxx5 +libtk8.6 +libucx0 +liburiparser1 +libvo-aacenc0 +libvo-amrwbenc0 +libvtk9.1 +libwildmidi2 +libwpe-1.0-1 +libwpebackend-fdo-1.0-1 +libwpewebkit-1.0-3 +libxerces-c3.2 +libxnvctrl0 +libzbar0 +libzxingcore1 +mysql-common +proj-data +timgm6mb-soundfont +unixodbc-common +libgraphene-1.0-0 +tightvncserver +xrdp +language-selector-gnome +gnome-user-docs-fr +wogerman +wngerman +libqt5qmlworkerscript5 +qml-module-qtquick2 +fonts-arphic-bsmi00lp +fonts-arphic-gbsn00lp +fonts-arphic-gkai00mp +im-config +zenity +geany +python2 +clinfo +fonts-noto-cjk +gnome-user-docs-zh-hans +dkms +fakeroot +debhelper +fcitx5-frontend-gtk2 +fcitx5-frontend-qt5 +fcitx5-frontend-gtk4 +fcitx5-chinese-addons +fcitx5-module-cloudpinyin +language-pack-gnome-zh-hans +fcitx5 fonts-noto-cjk-extra +fcitx5-frontend-gtk3 +language-pack-zh-hans +fcitx5-data +fcitx5-config-qt +xinput +gparted +mesa-utils +libqt5core5a +libqt5gui5 +libqt5widgets5 +libchromaprint1 +libcec6 +libcrossguid0 +libfmt8 +libfstrcmp0 +libimagequant0 +libiso9660-11 +libkissfft-float131 +liblirc-client0 +libmicrohttpd12 +libmysqlclient21 +libp8-platform2 +libraqm0 +libraspberrypi0 +libshairplay0 +libtinyxml2.6.2v5 +libwayland-client++0 +libwayland-cursor++0 +libwayland-egl++0 +mailcap +mime-support +mysql-common +python3-pil +python3-pycryptodome +libjs-iscroll +gnome-bluetooth +onboard +gnome-screenshot +libqt5waylandclient5 +thunderbird-locale-zh-hans +fonts-arphic-uming +libreoffice-help-zh-cn +thunderbird-locale-zh-cn +fonts-arphic-ukai +libreoffice-l10n-zh-cn diff --git a/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages b/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages index 6a11e6b..0049132 100644 --- a/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages +++ b/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages @@ -272,3 +272,4 @@ fcitx5-data fcitx5-config-qt xinput gparted +libjsoncpp-dev diff --git a/external/config/sources/families/include/rk3588_gpu_vpu.inc b/external/config/sources/families/include/rk3588_gpu_vpu.inc index c053ebf..3cb9cce 100755 --- a/external/config/sources/families/include/rk3588_gpu_vpu.inc +++ b/external/config/sources/families/include/rk3588_gpu_vpu.inc @@ -230,6 +230,9 @@ 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" + cp ${EXTER}/cache/sources/rk3588_packages_jammy/chromium/libjpeg.so.62 $SDCARD/usr/lib/aarch64-linux-gnu/ + chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X" ## The chromium using fixed pathes for libv4l2.so @@ -238,16 +241,6 @@ 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/" - - ## for panfork - ok - #cp ${EXTER}/packages/bsp/mali_csffw.bin $SDCARD/lib/firmware/ - #chroot $SDCARD /bin/bash -c "apt-get install -y glmark2 glmark2-es2" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgbm1_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglapi-mesa_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgl1-mesa-dri_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libegl-mesa0_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglx-mesa0_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" - fi if [[ ${BOARD} =~ orangepi5|orangepi5b && ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} == xfce && ${RELEASE} == focal ]]; then @@ -320,12 +313,12 @@ rk3588_gpu_vpu_tweaks() dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libdrm2_2.4.107-8ubuntu1~20.04.2_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libdrm-common_2.4.107-8ubuntu1~20.04.2_all.deb" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libdrm-dev_2.4.107-8ubuntu1~20.04.2_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libkms1_2.4.107-8ubuntu1~20.04.2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libdrm-dev_2.4.107-8ubuntu1~20.04.2_arm64.deb" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm-cursor/libdrm-cursor_1.3.0-1_arm64.deb" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm-cursor/libdrm-cursor-dev_1.3.0-1_arm64.deb" - #chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm-cursor/libdrm-cursor_1.4.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm-cursor/libdrm-cursor-dev_1.4.0-1_arm64.deb" + chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/rktoolkit/rktoolkit_1.0.0-1_arm64.deb" @@ -369,11 +362,18 @@ rk3588_gpu_vpu_tweaks() if [[ ${BOARD} =~ orangepi5|orangepi5b && ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} == gnome && ${RELEASE} == jammy ]]; then + [[ -f $SDCARD/etc/profile.d/x11.sh ]] && rm $SDCARD/etc/profile.d/x11.sh - if [[ 0 == 1 ]] ; then + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb" + cp "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/rkaiq_3A_server" $SDCARD/usr/bin/ -f - chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper" + 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-vpu0_1.5.0-1+git230210.c145c84~jammy1_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/gstreamer/gir1.2-gstreamer-1.0_1.20.3-0ubuntu1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gstreamer/gstreamer1.0-tools_1.20.3-0ubuntu1_arm64.deb" @@ -406,30 +406,6 @@ rk3588_gpu_vpu_tweaks() dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/libgstreamer-plugins-good1.0-0_1.20.3-0ubuntu1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/libgstreamer-plugins-good1.0-dev_1.20.3-0ubuntu1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm/libkms1_2.4.110-1ubuntu1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm-cursor/libdrm-cursor_1.4.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm-cursor/libdrm-cursor-dev_1.4.0-1_arm64.deb" - - else - - chroot $SDCARD /bin/bash -c "apt-get update" > /dev/null - chroot $SDCARD /bin/bash -c "apt-get upgrade -y" > /dev/null - chroot $SDCARD /bin/bash -c "apt-get install -y libgraphene-1.0-0 libqt5waylandclient5" > /dev/null - chroot $SDCARD /bin/bash -c "apt-get install -y glmark2 glmark2-es2 mesa-utils libqt5core5a libqt5gui5 libqt5opengl5 libqt5widgets5 libchromaprint1 libchromaprint1 libcec6 libcrossguid0 libfmt8 libfstrcmp0 libimagequant0 libiso9660-11 libkissfft-float131 liblirc-client0 libmicrohttpd12 libmysqlclient21 libp8-platform2 libraqm0 libraspberrypi0 libshairplay0 libtinyxml2.6.2v5 libwayland-client++0 libwayland-cursor++0 libwayland-egl++0 mailcap mime-support mysql-common python3-pil python3-pycryptodome libjs-iscroll gnome-bluetooth onboard mpv gnome-screenshot" - - [[ -f $SDCARD/etc/profile.d/x11.sh ]] && rm $SDCARD/etc/profile.d/x11.sh - - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/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_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-vpu0_1.5.0-1+git230210.c145c84~jammy1_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/libv4l/libdvbv5-0_1.22.1-2build1+rkmpp20221209_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/dvb-tools_1.22.1-2build1+rkmpp20221209_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/ir-keytable_1.22.1-2build1+rkmpp20221209_arm64.deb" @@ -445,19 +421,31 @@ rk3588_gpu_vpu_tweaks() 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/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" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/xserver/xserver-common_21.1.3-2ubuntu2_all.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/xserver/xserver-xorg-dev_21.1.3-2ubuntu2_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/xserver/xserver-xorg-legacy_21.1.3-2ubuntu2_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm/libkms1_2.4.110-1ubuntu1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm-cursor/libdrm-cursor_1.4.0-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm-cursor/libdrm-cursor-dev_1.4.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/chromium/chromium-codecs-ffmpeg-extra_110.0.5481.4-0ubuntu1~jammy~rkmpp20230130_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/chromium/chromium-browser_110.0.5481.4-0ubuntu1~jammy~rkmpp20230130_arm64.deb" - #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/chromium/chromium-browser-l10n_110.0.5481.4-0ubuntu1~jammy~rkmpp20230130_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/chromium/chromium-browser-l10n_110.0.5481.4-0ubuntu1~jammy~rkmpp20230130_all.deb" #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/chromium/chromium-chromedriver_110.0.5481.4-0ubuntu1~jammy~rkmpp20230130_arm64.deb" cp $EXTER/cache/sources/rk3588_packages_jammy/chromium/default $SDCARD/etc/chromium-browser/ ## for panfork - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgbm1_23.0~panfork~csf~git221210.120202c6757~j_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglapi-mesa_23.0~panfork~csf~git221210.120202c6757~j_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgl1-mesa-dri_23.0~panfork~csf~git221210.120202c6757~j_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libegl-mesa0_23.0~panfork~csf~git221210.120202c6757~j_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglx-mesa0_23.0~panfork~csf~git221210.120202c6757~j_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/mali-g610-firmware_1.0.0-1_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgbm1_23.0~panfork~csf~git221210.120202c6757~j+3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgbm-dev_23.0~panfork~csf~git221210.120202c6757~j+3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglapi-mesa_23.0~panfork~csf~git221210.120202c6757~j+3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgl1-mesa-dri_23.0~panfork~csf~git221210.120202c6757~j+3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libegl-mesa0_23.0~panfork~csf~git221210.120202c6757~j+3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglx-mesa0_23.0~panfork~csf~git221210.120202c6757~j+3_arm64.deb" + # Improve mesa performance + echo "PAN_MESA_DEBUG=gofaster" >> $SDCARD/etc/environment ## for ffmpeg dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavutil56_4.4.2-0ubuntu0.22.04.1_arm64.deb" @@ -478,13 +466,17 @@ rk3588_gpu_vpu_tweaks() dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavdevice-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/ffmpeg_4.4.2-0ubuntu0.22.04.1_arm64.deb" + chroot $SDCARD /bin/bash -c "rm /etc/mpv/mpv.conf" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpv/libmpv1_0.34.1-1ubuntu3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpv/libmpv-dev_0.34.1-1ubuntu3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpv/wayland/mpv_0.34.1-1ubuntu3_arm64.deb" + cp ${EXTER}/cache/sources/rk3588_packages_jammy/mpv/mpv.conf $SDCARD/etc/mpv/ + ## for kodi dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/kodi/kodi-bin_19.4+dfsg1-2+gles2_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/kodi/kodi-data_19.4+dfsg1-2+gles2_all.deb" 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" - - fi fi } diff --git a/external/config/sources/families/rockchip-rk3588.conf b/external/config/sources/families/rockchip-rk3588.conf index 3434624..f447e02 100644 --- a/external/config/sources/families/rockchip-rk3588.conf +++ b/external/config/sources/families/rockchip-rk3588.conf @@ -62,7 +62,7 @@ family_tweaks_s() { chroot "${SDCARD}" /bin/bash -c "ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime" chroot "${SDCARD}" /bin/bash -c "dpkg-reconfigure -f noninteractive tzdata" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 - chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 install_wiringop install_docker diff --git a/external/packages/bsp/rk3588/etc/pulse/default.pa b/external/packages/bsp/rk3588/etc/pulse/default.pa index 6109ed2..5f4abc6 100644 --- a/external/packages/bsp/rk3588/etc/pulse/default.pa +++ b/external/packages/bsp/rk3588/etc/pulse/default.pa @@ -141,3 +141,4 @@ load-module module-filter-apply #set-default-sink output set-default-source alsa_input.platform-es8388-sound.HiFi__hw_rockchipes8388__source set-default-sink alsa_output.platform-es8388-sound.HiFi__hw_rockchipes8388__sink +set-card-profile 0 HDMI diff --git a/external/packages/bsp/rk3588/usr/local/bin/set_swap.sh b/external/packages/bsp/rk3588/usr/local/bin/set_swap.sh new file mode 100755 index 0000000..f0b3572 --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/set_swap.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +sudo swapoff -a +sudo dd if=/dev/zero of=/swapfile bs=1G count=8 +sudo chmod 0600 /swapfile +sudo mkswap /swapfile +sudo swapon /swapfile +sudo sed -i '/swapfile/d' /etc/fstab +sudo bash -c 'echo "/swapfile swap swap sw 0 0" >> /etc/fstab' diff --git a/external/packages/bsp/rk3588/usr/share/alsa/cards/HDMI-OUT.conf b/external/packages/bsp/rk3588/usr/share/alsa/cards/HDMI-OUT.conf new file mode 100644 index 0000000..351beae --- /dev/null +++ b/external/packages/bsp/rk3588/usr/share/alsa/cards/HDMI-OUT.conf @@ -0,0 +1,31 @@ +# configuration for HDMI connection which just expose the +# audio out device + + + +HDMI-OUT.pcm.hdmi.0 { + @args [ CARD DEVICE CTLINDEX AES0 AES1 AES2 AES3 ] + @args.CARD { + type string + } + @args.DEVICE { + type integer + } + @args.CTLINDEX { + type integer + } + @args.AES0 { + type integer + } + @args.AES1 { + type integer + } + @args.AES2 { + type integer + } + @args.AES3 { + type integer + } + type hw +card $CARD +} diff --git a/external/packages/bsp/rk3588/usr/share/alsa/cards/aliases.conf b/external/packages/bsp/rk3588/usr/share/alsa/cards/aliases.conf new file mode 100644 index 0000000..76d45cb --- /dev/null +++ b/external/packages/bsp/rk3588/usr/share/alsa/cards/aliases.conf @@ -0,0 +1,65 @@ +# +# Define aliases for various drivers +# + +YMF724 cards.YMF744 +YMF724F cards.YMF744 +YMF740 cards.YMF744 +YMF740C cards.YMF744 +YMF754 cards.YMF744 +CMIPCI cards.CMI8338 +CMI8738 cards.CMI8338 +CMI8738-SWIEC cards.CMI8338-SWIEC +CMI8738-MC4 cards.CMI8738-MC6 +'E-mu APS' cards.EMU10K1 +'GUS MAX' cards.GUS +'GUS ACE' cards.GUS +'GUS Extreme' cards.GUS +'AMD InterWave' cards.GUS +'Dynasonic 3-D' cards.GUS +'InterWave STB' cards.GUS +au8810 cards.AU8810 +au8820 cards.AU8820 +au8830 cards.AU8830 +Prodigy71 cards.Aureon71 +Prodigy71LT cards.Aureon71 +Prodigy71HIFI cards.Aureon71 +Aureon71Univ cards.Aureon71 +VIA82XX-MODEM cards.ICH-MODEM +'MPU-401 UART' cards.MPU-401 +'VX222/Old' cards.VX222 +'VX222/v2' cards.VX222 +'VX222/Mic' cards.VX222 +'CMI8330/C3D' cards.CMI8330 +'SB AWE' cards.SBAWE +'SB Pro' cards.SBPro +'PMac Burgundy' cards.PMac +'PMac DACA' cards.PMac +'PMac Tumbler' cards.PMac +'PMac Snapper' cards.PMac +'PMac Screamer' cards.PMac +'PMac AWACS' cards.PMac +'PMac Toonie' cards.PMacToonie +AppleOnbdAudio cards.PMacToonie +'USB US-X2Y' cards.US-X2Y +'Serial MIDI' cards.SerialMIDI +'Prodif Plus' cards.ProdifPlus +ESM1 cards.ES1968 +ES1978 cards.ES1968 +Allegro cards.Maestro3 +Canyon3D-2 cards.Maestro3 +Azalia cards.HDA-Intel +aaci-pl041 cards.AACI +AV66 cards.CMI8788 +AV100 cards.CMI8788 +AV200 cards.CMI8788 +CMI8786 cards.CMI8788 +CMI8787 cards.CMI8788 +pistachio cards.pistachio-card +VC4-HDMI cards.vc4-hdmi +rockchip-hdmi0 cards.HDMI-OUT + + + + + \ No newline at end of file