diff --git a/.gitignore b/.gitignore index d7a1da9fd1ba..8171991f8bad 100644 --- a/.gitignore +++ b/.gitignore @@ -36,23 +36,26 @@ external/cache/.gpg external/cache/hash external/cache/rootfs external/cache/sources/extra +external/cache/sources/wiringOP external/cache/sources/evalcache external/cache/sources/oh-my-zsh external/cache/sources/sunxi-tools external/cache/sources/rkbin-tools external/cache/sources/ffmpeg_kodi* +external/cache/sources/hi3403-tools +external/cache/sources/t527_packages +external/cache/sources/ascend-driver external/cache/sources/orangepi-test +external/cache/sources/component_cix* +external/cache/sources/wiringOP-Python external/cache/sources/rk3588_packages* external/cache/sources/rk356x_packages external/cache/sources/rk35xx_packages -external/cache/sources/t527_packages -external/cache/sources/sun60iw2_packages external/cache/sources/rk-rootfs-build* +external/cache/sources/sun60iw2_packages external/cache/sources/orangepi-firmware* -external/cache/sources/wiringOP -external/cache/sources/component_cix* -external/cache/sources/wiringOP-Python external/cache/sources/rk3399_gst_xserver_libs -external/cache/sources/ascend-driver +external/cache/sources/arm-trusted-firmware-2.2-hi3403 external/cache/sources/arm-trusted-firmware-sunxi-mainline +external/cache/debs/arm64/balenaEtcher-1.7.9+5945ab1f-arm64.AppImage external/cache/debs/arm64/balena-etcher-electron_1.7.9+5945ab1f_arm64.deb diff --git a/build.sh b/build.sh index 671abd18bf72..773f783121c2 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright (c) 2013-2021 Igor Pecovnik, igor.pecovnik@gma**.com # diff --git a/external/config/boards/orangepi6plus.conf b/external/config/boards/orangepi6plus.conf index bdf381faf797..7875effb1cf3 100644 --- a/external/config/boards/orangepi6plus.conf +++ b/external/config/boards/orangepi6plus.conf @@ -4,6 +4,7 @@ BOARDFAMILY="cix" KERNEL_TARGET="current next" IMAGE_PARTITION_TABLE="gpt" DISTRIB_TYPE_CURRENT="bookworm" +DISTRIB_TYPE_NEXT="bookworm noble" MODULES_CURRENT="armcb_isp_v4l2 btusb" PLYMOUTH="no" BUILD_MINIMAL="no" diff --git a/external/config/desktop/noble/environments/gnome/config_base/packages b/external/config/desktop/noble/environments/gnome/config_base/packages index ab1e833cc222..e94e0cb34631 100644 --- a/external/config/desktop/noble/environments/gnome/config_base/packages +++ b/external/config/desktop/noble/environments/gnome/config_base/packages @@ -1,42 +1,87 @@ +alsa-ucm-conf anacron apt-xapian-index at-spi2-core +bluetooth +bluez-obexd +bluez-tools +cheese +clpeak +cmake colord +command-not-found cups dbus-x11 -dmz-cursor-theme dconf-cli +dconf-editor +dkms +dmidecode +dmz-cursor-theme eject -foomatic-db-compressed-ppds +ffmpeg +fonts-dejavu +fonts-liberation fonts-noto-cjk fonts-ubuntu fonts-ubuntu-console +foomatic-db-compressed-ppds +fswebcam gdebi +gdm3 +git-lfs +glmark2 +glmark2-es2 +glmark2-es2-wayland +glmark2-wayland +gnome +gnome-bluetooth gnome-control-center -gnome-disk-utility gnome-desktop3-data +gnome-disk-utility gnome-keyring gnome-menus -gnome-screenshot -gnome-disk-utility -gnome-system-monitor -gnome-terminal gnome-packagekit +gnome-remote-desktop +gnome-screenshot gnome-session gnome-shell gnome-shell-extension-appindicator +gnome-system-monitor +gnome-terminal +gparted +gpiod +gstreamer1.0-libav +gstreamer1.0-plugins-bad +gstreamer1.0-tools gvfs-backends +ibus +ibus-libpinyin +im-config inputattach +language-pack-zh-hans +libdrm-radeon1 +libgpiod2 +libgpiod-dev libnotify-bin -gdm3 +libreoffice +libreoffice-gtk3 +libxcb-dri2-0 lm-sensors +locales +mesa-utils +mpv nautilus nautilus-extension-gnome-terminal +obexftp pavucontrol printer-driver-all profile-sync-daemon -pulseaudio -pulseaudio-module-bluetooth +python3-dev +python3-pip +python-is-python3 +smartmontools +smplayer +snapd software-properties-gtk synaptic system-config-printer @@ -44,7 +89,11 @@ terminator tracker tracker-extract tracker-miner-fs +tree +ttf-mscorefonts-installer upower +v4l-utils +vulkan-tools x11-apps x11-session-utils x11-utils @@ -56,4 +105,3 @@ xfonts-base xserver-xorg xwayland zenity -tree diff --git a/external/config/desktop/noble/environments/gnome/debian/postinst b/external/config/desktop/noble/environments/gnome/debian/postinst index ee52254c5932..d8f0c7f10d08 100644 --- a/external/config/desktop/noble/environments/gnome/debian/postinst +++ b/external/config/desktop/noble/environments/gnome/debian/postinst @@ -1,11 +1,11 @@ -# overwrite stock lightdm greeter configuration -if [ -d /etc/orangepi/lightdm ]; then cp -R /etc/orangepi/lightdm /etc/; fi -if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/orangepi-lightdm\/orangepi-default.png/warty-final-ubuntu.png/g' /etc/lightdm/slick-greeter.conf; fi - -if [ -f /etc/lightdm/lightdm.conf.d/11-orangepi.conf ]; then sed -i "s/user-session.*/user-session=gnome-wayland/" /etc/lightdm/lightdm.conf.d/11-orangepi.conf; fi - -# Disable Pulseaudio timer scheduling which does not work with sndhdmi driver -if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi +## overwrite stock lightdm greeter configuration +#if [ -d /etc/orangepi/lightdm ]; then cp -R /etc/orangepi/lightdm /etc/; fi +#if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/orangepi-lightdm\/orangepi-default.png/warty-final-ubuntu.png/g' /etc/lightdm/slick-greeter.conf; fi +# +#if [ -f /etc/lightdm/lightdm.conf.d/11-orangepi.conf ]; then sed -i "s/user-session.*/user-session=gnome-wayland/" /etc/lightdm/lightdm.conf.d/11-orangepi.conf; fi +# +## Disable Pulseaudio timer scheduling which does not work with sndhdmi driver +#if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi # set wallpapper to armbian keys=/etc/dconf/db/local.d/00-bg @@ -17,7 +17,7 @@ install -Dv /dev/null $profile # set default shortcuts echo " [org/gnome/shell] -favorite-apps = ['terminator.desktop', 'org.gnome.Nautilus.desktop', 'chromium-browser.desktop', 'thunderbird.desktop', 'code.desktop', 'Zoom.desktop'] +favorite-apps = ['org.gnome.Nautilus.desktop', 'org.gnome.Terminal.desktop', 'chromium.desktop', 'org.gnome.Totem.desktop', 'gparted.desktop', 'org.gnome.Settings.desktop'] [org/gnome/settings-daemon/plugins/power] sleep-inactive-ac-timeout='0' diff --git a/external/config/desktop/noble/environments/gnome/orangepi/create_desktop_package.sh b/external/config/desktop/noble/environments/gnome/orangepi/create_desktop_package.sh index 65267a1d277f..3df2d103dae7 100755 --- a/external/config/desktop/noble/environments/gnome/orangepi/create_desktop_package.sh +++ b/external/config/desktop/noble/environments/gnome/orangepi/create_desktop_package.sh @@ -1,164 +1,164 @@ -# install lightdm greeter -cp -R "${EXTER}"/packages/blobs/desktop/lightdm "${destination}"/etc/orangepi - -# install default desktop settings -mkdir -p "${destination}"/etc/skel -cp -R "${EXTER}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel - -#install cinnamon desktop bar icons -mkdir -p "${destination}"/usr/share/icons/orangepi -cp "${EXTER}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/share/icons/orangepi - -# install wallpapers -mkdir -p "${destination}"/usr/share/backgrounds/orangepi/ -cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi - -# install wallpapers -mkdir -p "${destination}"/usr/share/backgrounds/orangepi-lightdm/ -cp "${EXTER}"/packages/blobs/desktop/lightdm-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi-lightdm +## install lightdm greeter +#cp -R "${EXTER}"/packages/blobs/desktop/lightdm "${destination}"/etc/orangepi +# +## install default desktop settings +#mkdir -p "${destination}"/etc/skel +#cp -R "${EXTER}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel +# +##install cinnamon desktop bar icons +#mkdir -p "${destination}"/usr/share/icons/orangepi +#cp "${EXTER}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/share/icons/orangepi +# +## install wallpapers +#mkdir -p "${destination}"/usr/share/backgrounds/orangepi/ +#cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi +# +## install wallpapers +#mkdir -p "${destination}"/usr/share/backgrounds/orangepi-lightdm/ +#cp "${EXTER}"/packages/blobs/desktop/lightdm-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi-lightdm # install logo for login screen mkdir -p "${destination}"/usr/share/pixmaps/orangepi cp "${EXTER}"/packages/blobs/desktop/icons/orangepi.png "${destination}"/usr/share/pixmaps/orangepi -#generate wallpaper list for background changer -mkdir -p "${destination}"/usr/share/gnome-background-properties -cat < "${destination}"/usr/share/gnome-background-properties/orangepi.xml - - - - - OrangePi black-pyscho - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi bluie-circle - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi blue-monday - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi blue-penguin - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi gray-resultado - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi green-penguin - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi green-retro - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi green-wall-penguin - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi 4k-neglated - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi neon-gray-penguin - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi plastic-love - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi purple-penguine - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi purplepunk-resultado - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi red-penguin-dark - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi red-penguin - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi light - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi dark - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi uc - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - - OrangePi clear - /usr/share/backgrounds/orangepi/orangepi-default.png - zoom - #ffffff - #000000 - - -EOF +##generate wallpaper list for background changer +#mkdir -p "${destination}"/usr/share/gnome-background-properties +#cat < "${destination}"/usr/share/gnome-background-properties/orangepi.xml +# +# +# +# +# OrangePi black-pyscho +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi bluie-circle +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi blue-monday +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi blue-penguin +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi gray-resultado +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi green-penguin +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi green-retro +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi green-wall-penguin +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi 4k-neglated +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi neon-gray-penguin +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi plastic-love +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi purple-penguine +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi purplepunk-resultado +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi red-penguin-dark +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi red-penguin +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi light +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi dark +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi uc +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +# OrangePi clear +# /usr/share/backgrounds/orangepi/orangepi-default.png +# zoom +# #ffffff +# #000000 +# +# +#EOF diff --git a/external/config/kernel/linux-6.1-cix-p1-current.config b/external/config/kernel/linux-6.1-cix-p1-current.config index d80bdc6d6f1c..e37f94097596 100644 --- a/external/config/kernel/linux-6.1-cix-p1-current.config +++ b/external/config/kernel/linux-6.1-cix-p1-current.config @@ -5865,60 +5865,61 @@ CONFIG_USB_ISP1760_DUAL_ROLE=y # USB port drivers # CONFIG_USB_SERIAL=y -# CONFIG_USB_SERIAL_CONSOLE is not set +CONFIG_USB_SERIAL_CONSOLE=y CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_SIMPLE is not set -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP210X=m -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_EMPEG is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_F81232 is not set -# CONFIG_USB_SERIAL_F8153X is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_IUU is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_METRO is not set -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_MXUPORT is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_QCAUX is not set -CONFIG_USB_SERIAL_QUALCOMM=y -# CONFIG_USB_SERIAL_SPCP8X5 is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -# CONFIG_USB_SERIAL_SYMBOL is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -CONFIG_USB_SERIAL_WWAN=y -CONFIG_USB_SERIAL_OPTION=y -# CONFIG_USB_SERIAL_OMNINET is not set -# CONFIG_USB_SERIAL_OPTICON is not set -# CONFIG_USB_SERIAL_XSENS_MT is not set -# CONFIG_USB_SERIAL_WISHBONE is not set -# CONFIG_USB_SERIAL_SSU100 is not set -CONFIG_USB_SERIAL_QT2=y -# CONFIG_USB_SERIAL_UPD78F0730 is not set -# CONFIG_USB_SERIAL_XR is not set -# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_F8153X=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=y +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_UPD78F0730=m +CONFIG_USB_SERIAL_XR=m +CONFIG_USB_SERIAL_DEBUG=m # # USB Miscellaneous drivers @@ -5943,7 +5944,7 @@ CONFIG_USB_TEST=y # CONFIG_USB_EHSET_TEST_FIXTURE is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_YUREX is not set -# CONFIG_USB_EZUSB_FX2 is not set +CONFIG_USB_EZUSB_FX2=y # CONFIG_USB_HUB_USB251XB is not set CONFIG_USB_HSIC_USB3503=y # CONFIG_USB_HSIC_USB4604 is not set diff --git a/external/config/kernel/linux-6.6-cix-p1-next.config b/external/config/kernel/linux-6.6-cix-p1-next.config index b7f3f06cd698..be34de90bd98 100644 --- a/external/config/kernel/linux-6.6-cix-p1-next.config +++ b/external/config/kernel/linux-6.6-cix-p1-next.config @@ -6168,60 +6168,61 @@ CONFIG_USB_ISP1760_DUAL_ROLE=y # USB port drivers # CONFIG_USB_SERIAL=y -# CONFIG_USB_SERIAL_CONSOLE is not set +CONFIG_USB_SERIAL_CONSOLE=y CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_SIMPLE is not set -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP210X=m -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_EMPEG is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_F81232 is not set -# CONFIG_USB_SERIAL_F8153X is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_IUU is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_METRO is not set -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_MXUPORT is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_QCAUX is not set -CONFIG_USB_SERIAL_QUALCOMM=y -# CONFIG_USB_SERIAL_SPCP8X5 is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -# CONFIG_USB_SERIAL_SYMBOL is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_F8153X=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_WWAN=y CONFIG_USB_SERIAL_OPTION=y -# CONFIG_USB_SERIAL_OMNINET is not set -# CONFIG_USB_SERIAL_OPTICON is not set -# CONFIG_USB_SERIAL_XSENS_MT is not set -# CONFIG_USB_SERIAL_WISHBONE is not set -# CONFIG_USB_SERIAL_SSU100 is not set -CONFIG_USB_SERIAL_QT2=y -# CONFIG_USB_SERIAL_UPD78F0730 is not set -# CONFIG_USB_SERIAL_XR is not set -# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_UPD78F0730=m +CONFIG_USB_SERIAL_XR=m +CONFIG_USB_SERIAL_DEBUG=m # # USB Miscellaneous drivers @@ -6245,7 +6246,7 @@ CONFIG_USB_TEST=y # CONFIG_USB_EHSET_TEST_FIXTURE is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_YUREX is not set -# CONFIG_USB_EZUSB_FX2 is not set +CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_HUB_USB251XB is not set CONFIG_USB_HSIC_USB3503=y # CONFIG_USB_HSIC_USB4604 is not set diff --git a/external/config/sources/families/cix.conf b/external/config/sources/families/cix.conf index 99c87f1200fa..fad563a3d1bd 100644 --- a/external/config/sources/families/cix.conf +++ b/external/config/sources/families/cix.conf @@ -248,10 +248,12 @@ family_tweaks_kernel () { install_cix_debs() { [[ $BUILD_DESKTOP != yes ]] && return - [[ ${RELEASE} == noble ]] && return display_alert "Installing" "Cix debs" "info" + rm -rf ${SDCARD}/bin/sh + run_on_sdcard "ln -sf /bin/bash /bin/sh" + local POOL_PATH=${EXTER}/cache/sources/component_cix-${BRANCH}/cix_proprietary/cix_proprietary-debs local DEB_PATH=${SDCARD}/root/debs @@ -260,18 +262,27 @@ install_cix_debs() { cp -fp $POOL_PATH/pool/main/*/*/*.deb ${DEB_PATH}/ cp -fp $POOL_PATH/pool/main/*/*.deb ${DEB_PATH}/ fi - cp ${EXTER}/cache/sources/component_cix-${BRANCH}/debs/*.deb ${DEB_PATH}/ - chroot $SDCARD /bin/bash -e -c "apt-get -y --allow-downgrades install /root/debs/*.deb" - run_on_sdcard "systemctl mask swap.target" - run_on_sdcard "systemctl enable cix_resume.service" - run_on_sdcard "systemctl enable cix_resume_prepare.service" - rm ${DEB_PATH} -rf + if [[ ${RELEASE} == noble ]]; then + cp ${EXTER}/cache/sources/component_cix-${BRANCH}/debs/cix-npu-onnxruntime*.deb ${DEB_PATH}/ + cp ${EXTER}/cache/sources/component_cix-${BRANCH}/ubuntu_debs/*.deb ${DEB_PATH}/ - run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq install pulseaudio" - run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq remove wireplumber" - run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq remove pipewire-pulse" - dpkg_install_deb_chroot "${EXTER}/cache/sources/component_cix-${BRANCH}/debs_manual/gnome-core_arm64.deb" + chroot $SDCARD /bin/bash -e -c "apt-get -y --allow-downgrades install /root/debs/*.deb" + rm ${DEB_PATH} -rf + else + cp ${EXTER}/cache/sources/component_cix-${BRANCH}/debs/*.deb ${DEB_PATH}/ + + chroot $SDCARD /bin/bash -e -c "apt-get -y --allow-downgrades install /root/debs/*.deb" + run_on_sdcard "systemctl mask swap.target" + run_on_sdcard "systemctl enable cix_resume.service" + run_on_sdcard "systemctl enable cix_resume_prepare.service" + rm ${DEB_PATH} -rf + + run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq install pulseaudio" + run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq remove wireplumber" + run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq remove pipewire-pulse" + dpkg_install_deb_chroot "${EXTER}/cache/sources/component_cix-${BRANCH}/debs_manual/gnome-core_arm64.deb" + fi rm $SDCARD/root/*.deb >/dev/null 2>&1 } @@ -313,6 +324,32 @@ family_tweaks() { fi run_on_sdcard "systemctl --no-reload enable isp-daemon.service >/dev/null 2>&1" + #run_on_sdcard "apt-get -qqy install libgpiod-dev libgpiod2 gpiod >/dev/null 2>&1" + + if [[ ${RELEASE} == noble ]]; then + sed -i 's/^# *AutomaticLoginEnable.*/AutomaticLoginEnable = true/' ${SDCARD}/etc/gdm3/custom.conf + sed -i "s/^# *AutomaticLogin.*/AutomaticLogin = ${OPI_USERNAME}/" ${SDCARD}/etc/gdm3/custom.conf + + # fix cix chromium + cp ${EXTER}/cache/sources/component_cix-${BRANCH}/ubuntu_debs/libjpeg.so.62 $SDCARD/usr/lib/aarch64-linux-gnu/ + + run_on_sdcard "apt-mark hold \ + gstreamer1.0-gl \ + gstreamer1.0-gtk3 \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-base-apps \ + gstreamer1.0-plugins-good \ + gstreamer1.0-pulseaudio \ + gir1.2-gst-plugins-base-1.0 \ + libgstreamer-plugins-base1.0-0 \ + libgstreamer-plugins-good1.0-0 \ + libavcodec60 \ + xwayland" + else + sed -i 's/^# *AutomaticLoginEnable.*/AutomaticLoginEnable = true/' ${SDCARD}/etc/gdm3/daemon.conf + sed -i "s/^# *AutomaticLogin.*/AutomaticLogin = ${OPI_USERNAME}/" ${SDCARD}/etc/gdm3/daemon.conf + fi + rm $SDCARD/root/*.deb >/dev/null 2>&1 } @@ -322,15 +359,26 @@ install_balenaEtcher(){ [[ ${RELEASE} == noble ]] && return - balena_etcher_deb=balena-etcher-electron_1.7.9+5945ab1f_arm64.deb - balena_etcher_url="https://github.com/Itai-Nelken/BalenaEtcher-arm/releases/download/v1.7.9/${balena_etcher_deb}" - balena_etcher=${EXTER}/cache/debs/arm64/${balena_etcher_deb} + if [[ ${RELEASE} == backup ]]; then + balena_etcher_name=balenaEtcher-1.7.9+5945ab1f-arm64.AppImage + else + balena_etcher_name=balena-etcher-electron_1.7.9+5945ab1f_arm64.deb + fi + + balena_etcher_url="https://github.com/Itai-Nelken/BalenaEtcher-arm/releases/download/v1.7.9/${balena_etcher_name}" + balena_etcher=${EXTER}/cache/debs/arm64/${balena_etcher_name} if [[ ! -f ${balena_etcher} ]]; then wget -P ${EXTER}/cache/debs/arm64 ${balena_etcher_url} fi - install_deb_chroot ${balena_etcher} - rm $SDCARD/root/*.deb >/dev/null 2>&1 + if [[ ${RELEASE} == backup ]]; then + display_alert "Installing" "${balena_etcher_name}" "info" + cp ${balena_etcher} $SDCARD/opt/ + chmod +x $SDCARD/opt/${balena_etcher_name} + else + install_deb_chroot ${balena_etcher} + rm $SDCARD/root/*.deb >/dev/null 2>&1 + fi fi } diff --git a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization index e2570d211a8f..47dae4c51e6c 100755 --- a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization +++ b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization @@ -212,6 +212,11 @@ prepare_board() { --baudrate 1500000 --patchram /lib/firmware/SYN43711A0.hcd /dev/ttyS7 & fi ;; + orangepi6plus) + if [ ! -e /dev/dma_heap/linux,cma ]; then + ln -s /dev/dma_heap/reserved /dev/dma_heap/linux,cma + fi + ;; orangepi3-lts) #aplay /usr/share/sounds/alsa/audio.wav -D hw:0,0 > /dev/null 2>&1 rfkill unblock all diff --git a/external/packages/bsp/overlays_cix/etc/gdm3/daemon.conf b/external/packages/bsp/overlays_cix/etc/gdm3/daemon.conf deleted file mode 100644 index 9c19633231d7..000000000000 --- a/external/packages/bsp/overlays_cix/etc/gdm3/daemon.conf +++ /dev/null @@ -1,29 +0,0 @@ -# GDM configuration storage -# -# See /usr/share/gdm/gdm.schemas for a list of available options. - -[daemon] -# Uncomment the line below to force the login screen to use Xorg -XorgEnable=false -#WaylandEnable=true - -# Enabling automatic login -AutomaticLoginEnable = true -AutomaticLogin = orangepi - -# Enabling timed login -# TimedLoginEnable = true -# TimedLogin = user1 -# TimedLoginDelay = 10 - -[security] - -[xdmcp] - -[chooser] - -[debug] -# Uncomment the line below to turn on debugging -# More verbose logs -# Additionally lets the X server dump core if it crashes -#Enable=true diff --git a/external/packages/bsp/overlays_cix/usr/bin/install_bt_panel.sh b/external/packages/bsp/overlays_cix/usr/bin/install_bt_panel.sh index 0df0464c93ca..7550fddfcd96 100755 --- a/external/packages/bsp/overlays_cix/usr/bin/install_bt_panel.sh +++ b/external/packages/bsp/overlays_cix/usr/bin/install_bt_panel.sh @@ -1,4 +1,6 @@ #!/bin/bash -wget -O install.sh \ -http://download.bt.cn/install/install-ubuntu_6.0.sh && sudo bash install.sh +#wget -O install.sh \ +#http://download.bt.cn/install/install-ubuntu_6.0.sh && sudo bash install.sh + +if [ -f /usr/bin/curl ];then curl -sSO https://download.bt.cn/install/install_panel.sh;else wget -O install_panel.sh https://download.bt.cn/install/install_panel.sh;fi;bash install_panel.sh ssl251104 diff --git a/external/packages/bsp/overlays_cix/usr/bin/install_qt.sh b/external/packages/bsp/overlays_cix/usr/bin/install_qt.sh index cca794a6f52f..c0e89e4c5dff 100755 --- a/external/packages/bsp/overlays_cix/usr/bin/install_qt.sh +++ b/external/packages/bsp/overlays_cix/usr/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|bookworm|jammy ]]; then +elif [[ $release =~ bullseye|bookworm|jammy|noble ]]; 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!" @@ -14,7 +14,7 @@ fi sudo apt-get -y install qtcreator qmlscene gdb qtdeclarative5-dev qtbase5-examples cmake -if [[ $release =~ bookworm ]]; then +if [[ $release =~ bookworm|noble ]]; then sudo apt-get -y install qt6-wayland qtwayland5 sudo apt-get -y install libegl1-mesa-dev libgles2-mesa-dev fi diff --git a/external/packages/bsp/overlays_cix/usr/bin/install_ros.sh b/external/packages/bsp/overlays_cix/usr/bin/install_ros.sh new file mode 100755 index 000000000000..a8a2f46beaf1 --- /dev/null +++ b/external/packages/bsp/overlays_cix/usr/bin/install_ros.sh @@ -0,0 +1,103 @@ +#!/bin/bash + +#mirror_url=http://mirrors.ustc.edu.cn +mirror_url=https://repo.huaweicloud.com + +if [[ -n $1 && $1 =~ ros1|ros2 ]]; then + version=$1 +else + echo "usage: install_ros.sh ros1/ros2" + exit +fi + +release=$(lsb_release -cs) + +if [[ $version == "ros1" && $release =~ focal ]]; then + + [[ -f /etc/apt/sources.list.d/ros-latest.list ]] && sudo rm /etc/apt/sources.list.d/ros-latest.list + sudo sh -c "echo deb ${mirror_url}/ros/ubuntu $(lsb_release -sc) main > /etc/apt/sources.list.d/ros1.list" + sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + sudo apt update + sudo apt install -y ros-noetic-desktop-full + + sudo sh -c 'echo "source /opt/ros/noetic/setup.bash" >> /root/.bashrc' + echo "source /opt/ros/noetic/setup.bash" >> /home/orangepi/.bashrc + + sudo apt install -y python3-rosdep python3-rosinstall python3-rosinstall-generator python3-wstool build-essential + + sudo sh -c 'echo "151.101.84.133 raw.githubusercontent.com" >> /etc/hosts' + source /opt/ros/noetic/setup.bash + sudo rosdep init + rosdep update + + exit +fi + +if [[ $version == "ros2" && $release =~ focal ]]; then + + sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + echo "deb [arch=$(dpkg --print-architecture)] ${mirror_url}/ros2/ubuntu $(source /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list + + sudo apt update + sudo apt install -y ros-galactic-desktop + sudo apt install -y ros-dev-tools + + sudo sh -c 'echo "source /opt/ros/galactic/setup.bash" >> /root/.bashrc' + echo "source /opt/ros/galactic/setup.bash" >> /home/orangepi/.bashrc + + source /opt/ros/galactic/setup.bash + ros2 -h + + exit + +fi + +if [[ $version == "ros2" && $release =~ jammy ]]; then + + sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + echo "deb [arch=$(dpkg --print-architecture)] ${mirror_url}/ros2/ubuntu $(source /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list + + sudo apt update + sudo apt install -y ros-humble-desktop + sudo apt install -y ros-dev-tools + + sudo sh -c 'echo "source /opt/ros/humble/setup.bash" >> /root/.bashrc' + echo "source /opt/ros/humble/setup.bash" >> /home/orangepi/.bashrc + + source /opt/ros/humble/setup.bash + ros2 -h + + exit + +fi + +if [[ $version == "ros2" && $release =~ noble ]]; then + + sudo locale-gen en_US en_US.UTF-8 + sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 + export LANG=en_US.UTF-8 + sudo apt install -y software-properties-common curl gnupg2 + + sudo sh -c 'echo "deb https://mirrors.huaweicloud.com/ros2/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros2-latest.list' + curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add - + + sudo apt update + sudo apt install -y ros-jazzy-desktop-full + sudo apt install -y python3-colcon-common-extensions \ + python3-rosdep \ + python3-rosinstall-generator \ + python3-pip \ + build-essential + sudo apt install -y ros-dev-tools + + sudo sh -c 'echo "source /opt/ros/jazzy/setup.bash" >> /root/.bashrc' + echo "source /opt/ros/jazzy/setup.bash" >> /home/orangepi/.bashrc + + source /opt/ros/jazzy/setup.bash + ros2 -h + + exit + +fi + +echo "Unsupported System!" diff --git a/external/packages/bsp/overlays_cix/usr/bin/spidev_test b/external/packages/bsp/overlays_cix/usr/bin/spidev_test new file mode 100755 index 000000000000..84b4bcfac9f3 Binary files /dev/null and b/external/packages/bsp/overlays_cix/usr/bin/spidev_test differ diff --git a/external/packages/bsp/overlays_cix/usr/bin/test_ros.sh b/external/packages/bsp/overlays_cix/usr/bin/test_ros.sh new file mode 100755 index 000000000000..26344f39c97a --- /dev/null +++ b/external/packages/bsp/overlays_cix/usr/bin/test_ros.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +if [[ -f /opt/ros/noetic/setup.bash ]]; then + + source /opt/ros/noetic/setup.bash + roscore & + + sleep 5 + + rosrun turtlesim turtlesim_node & + rosrun turtlesim turtle_teleop_key + +fi + +if [[ -f /opt/ros/galactic/setup.bash ]]; then + + source /opt/ros/galactic/setup.bash + ros2 run demo_nodes_cpp talker & + ros2 run demo_nodes_py listener + +fi + +if [[ -f /opt/ros/humble/setup.bash ]]; then + + source /opt/ros/humble/setup.bash + ros2 run demo_nodes_cpp talker & + ros2 run demo_nodes_py listener + +fi + +if [[ -f /opt/ros/jazzy/setup.bash ]]; then + + source /opt/ros/jazzy/setup.bash + ros2 run demo_nodes_cpp talker & + ros2 run demo_nodes_py listener + +fi diff --git a/scripts/general.sh b/scripts/general.sh index 35dc0eccd9bd..84ed0a6bdd9d 100755 --- a/scripts/general.sh +++ b/scripts/general.sh @@ -227,7 +227,7 @@ create_sources_list() EOF ;; - xenial|bionic|focal|hirsute|impish|jammy|noble) + xenial|bionic|focal|hirsute|impish|jammy) cat <<-EOF > "${basedir}"/etc/apt/sources.list deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse #deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse @@ -243,6 +243,20 @@ create_sources_list() EOF ;; + noble) + distro="ubuntu" + # Drop deboostrap sources leftovers + rm -f "${basedir}/etc/apt/sources.list" + + cat <<- EOF > "${basedir}/etc/apt/sources.list.d/${distro}.sources" + Types: deb + URIs: http://${UBUNTU_MIRROR} + Suites: ${release} ${release}-security ${release}-updates ${release}-backports + Components: main restricted universe multiverse + Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg + EOF + ;; + raspi) cat <<-EOF > "${basedir}"/etc/apt/sources.list deb http://${DEBIAN_MIRROR} bullseye main contrib non-free