diff --git a/external/cache/sources/orangepi-config/debian-config-functions b/external/cache/sources/orangepi-config/debian-config-functions index 8c9bdce..bd8cc51 100644 --- a/external/cache/sources/orangepi-config/debian-config-functions +++ b/external/cache/sources/orangepi-config/debian-config-functions @@ -59,6 +59,7 @@ function main(){ [[ "$LINUXFAMILY" == "sunxi64" ]] && OVERLAYDIR="/boot/dtb/allwinner/overlay"; [[ "$LINUXFAMILY" == "meson64" ]] && OVERLAYDIR="/boot/dtb/amlogic/overlay"; [[ "$LINUXFAMILY" == "rockchip64" ]] && OVERLAYDIR="/boot/dtb/rockchip/overlay"; + [[ "$LINUXFAMILY" == "rockchip-rk3588" ]] && OVERLAYDIR="/boot/dtb/rockchip/overlay"; # detect desktop check_desktop dialog --backtitle "$BACKTITLE" --title "Please wait" --infobox "\nLoading Orange Pi configuration utility ... " 5 45 diff --git a/external/config/boards/orangepi5.conf b/external/config/boards/orangepi5.conf index 9f4b6ce..0f5521a 100644 --- a/external/config/boards/orangepi5.conf +++ b/external/config/boards/orangepi5.conf @@ -2,6 +2,7 @@ BOARD_NAME="Orange Pi 5" BOARDFAMILY="rockchip-rk3588" BOOTCONFIG="orangepi_5_defconfig" +#BOOTCONFIG="orangepi_5_sata_defconfig" KERNEL_TARGET="legacy" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb" @@ -11,4 +12,4 @@ BOOT_SUPPORT_SPI="yes" SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes DISTRIB_TYPE_LEGACY="bullseye jammy" BOOTFS_TYPE="fat" -REVISION="1.0.2" +REVISION="1.0.4" diff --git a/external/config/optional/families/rockchip-rk3588/_config/desktop/bullseye/environments/xfce/config_base/packages b/external/config/optional/families/rockchip-rk3588/_config/desktop/bullseye/environments/xfce/config_base/packages index 3b06c18..d70138b 100644 --- a/external/config/optional/families/rockchip-rk3588/_config/desktop/bullseye/environments/xfce/config_base/packages +++ b/external/config/optional/families/rockchip-rk3588/_config/desktop/bullseye/environments/xfce/config_base/packages @@ -265,3 +265,4 @@ libva-wayland2 liblua5.2-0 vlc gparted +clinfo 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 e99b721..154898e 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 @@ -240,3 +240,19 @@ 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 diff --git a/external/config/sources/families/include/rockchip64_common.inc b/external/config/sources/families/include/rockchip64_common.inc index 4887a8a..01959af 100644 --- a/external/config/sources/families/include/rockchip64_common.inc +++ b/external/config/sources/families/include/rockchip64_common.inc @@ -281,17 +281,21 @@ family_tweaks() chromium_name="chromium-browser_107.0.5304.62-0ubuntu1~ppa1~22.04.1_arm64.deb" chromium_extra_name="chromium-codecs-ffmpeg-extra_107.0.5304.62-0ubuntu1~ppa1~22.04.1_arm64.deb" + chromium_browser_l10n_name="chromium-browser-l10n_107.0.5304.62-0ubuntu1~ppa1~22.04.1_all.deb" chromium_url="http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu/pool/main/c/chromium-browser" chromium=${EXTER}/cache/debs/arm64/${chromium_name} chromium_extra=${EXTER}/cache/debs/arm64/${chromium_extra_name} + chromium_browser_l10n=${EXTER}/cache/debs/arm64/${chromium_browser_l10n_name} if [[ ! -f $chromium_extra ]]; then wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_name} wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_extra_name} + wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_browser_l10n_name} fi install_deb_chroot $chromium_extra install_deb_chroot $chromium + install_deb_chroot $chromium_browser_l10n fi diff --git a/external/config/sources/families/rockchip-rk3588.conf b/external/config/sources/families/rockchip-rk3588.conf index 1ffaddf..28c5be5 100644 --- a/external/config/sources/families/rockchip-rk3588.conf +++ b/external/config/sources/families/rockchip-rk3588.conf @@ -60,7 +60,7 @@ family_tweaks_s() { sed "s/^SIZE=.*/SIZE=200M/" -i "${SDCARD}"/etc/default/orangepi-ramlog 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" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors usb-modeswitch" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 install_wiringop install_docker diff --git a/external/config/templates/config-example.conf b/external/config/templates/config-example.conf index 8473483..cd8e1bf 100644 --- a/external/config/templates/config-example.conf +++ b/external/config/templates/config-example.conf @@ -23,3 +23,8 @@ INSTALL_KSRC="no" IGNORE_UPDATES="" COMPRESS_OUTPUTIMAGE="no" NO_APT_CACHER="yes" + +#install_balena_etcher="yes" +#install_chromium="yes" +#install_docker="yes" +#install_firefox="yes" diff --git a/external/packages/bsp/rk3588/usr/share/orangepi5/rkspi_loader_sata.img b/external/packages/bsp/rk3588/usr/share/orangepi5/rkspi_loader_sata.img new file mode 100644 index 0000000..681b484 Binary files /dev/null and b/external/packages/bsp/rk3588/usr/share/orangepi5/rkspi_loader_sata.img differ