From c8894b658cefdd33738e2275ef3741895050d833 Mon Sep 17 00:00:00 2001 From: toolsmanhehe <1340909670@qq.com> Date: Wed, 11 Sep 2024 21:00:33 +0800 Subject: [PATCH] Support opizero2w/opizero3 Ubuntu24.04 --- external/config/boards/orangepizero2w.conf | 4 +- external/config/boards/orangepizero3.conf | 4 +- .../config/cli/noble/debootstrap/components | 1 + .../noble/debootstrap/config_desktop/packages | 3 + .../config/cli/noble/debootstrap/packages | 33 ++++ .../noble/main/config_cli_standard/packages | 34 ++++ .../config_cli_standard/packages.additional | 39 ++++ .../cli/noble/main/config_desktop/packages | 25 +++ .../main/config_desktop/packages.additional | 36 ++++ external/config/cli/noble/main/packages | 21 +++ .../config/cli/noble/main/packages.additional | 21 +++ .../noble/appgroups/3dsupport/packages | 2 + .../noble/appgroups/browsers/debian/postinst | 14 ++ .../orangepi/create_desktop_package.sh | 4 + .../desktop/noble/appgroups/browsers/packages | 1 + .../desktop/noble/appgroups/chat/packages | 9 + .../noble/appgroups/desktop_tools/packages | 3 + .../noble/appgroups/editors/debian/postinst | 0 .../desktop/noble/appgroups/editors/packages | 3 + .../desktop/noble/appgroups/email/packages | 1 + .../desktop/noble/appgroups/internet/packages | 4 + .../noble/appgroups/multimedia/packages | 4 + .../desktop/noble/appgroups/office/packages | 3 + .../custom/desktops/cinnamon/packages | 2 + .../custom/desktops/gnome/packages | 2 + .../programming/custom/desktops/kde/packages | 2 + .../noble/appgroups/programming/packages | 5 + .../noble/appgroups/remote_desktop/packages | 3 + .../xfce/appgroups/programming/packages | 2 + .../environments/xfce/config_base/packages | 166 ++++++++++++++++++ .../xfce/config_base/packages.uninstall | 1 + .../xfce/debian/orangepi-bsp-desktop/postinst | 0 .../debian/orangepi-bsp-desktop/prepare.sh | 0 .../noble/environments/xfce/debian/postinst | 22 +++ .../xfce/orangepi/create_desktop_package.sh | 22 +++ .../desktop/noble/environments/xfce/support | 1 + external/config/distributions/noble/name | 1 + external/config/distributions/noble/support | 1 + .../environments/xfce/config_base/packages | 38 ++++ .../bsp/overlays_arm64/usr/bin/create_ap | 4 +- .../bsp/overlays_arm64/usr/bin/install_qt.sh | 2 +- .../bsp/overlays_arm64/usr/bin/install_ros.sh | 19 ++ .../bsp/overlays_arm64/usr/bin/test_ros.sh | 9 + scripts/chroot-buildpackages.sh | 5 +- scripts/configuration.sh | 2 +- scripts/debootstrap.sh | 2 +- scripts/distributions.sh | 2 +- scripts/general.sh | 18 +- 48 files changed, 580 insertions(+), 20 deletions(-) create mode 100755 external/config/cli/noble/debootstrap/components create mode 100755 external/config/cli/noble/debootstrap/config_desktop/packages create mode 100755 external/config/cli/noble/debootstrap/packages create mode 100755 external/config/cli/noble/main/config_cli_standard/packages create mode 100755 external/config/cli/noble/main/config_cli_standard/packages.additional create mode 100755 external/config/cli/noble/main/config_desktop/packages create mode 100755 external/config/cli/noble/main/config_desktop/packages.additional create mode 100755 external/config/cli/noble/main/packages create mode 100755 external/config/cli/noble/main/packages.additional create mode 100755 external/config/desktop/noble/appgroups/3dsupport/packages create mode 100755 external/config/desktop/noble/appgroups/browsers/debian/postinst create mode 100755 external/config/desktop/noble/appgroups/browsers/orangepi/create_desktop_package.sh create mode 100755 external/config/desktop/noble/appgroups/browsers/packages create mode 100755 external/config/desktop/noble/appgroups/chat/packages create mode 100755 external/config/desktop/noble/appgroups/desktop_tools/packages create mode 100755 external/config/desktop/noble/appgroups/editors/debian/postinst create mode 100755 external/config/desktop/noble/appgroups/editors/packages create mode 100755 external/config/desktop/noble/appgroups/email/packages create mode 100755 external/config/desktop/noble/appgroups/internet/packages create mode 100755 external/config/desktop/noble/appgroups/multimedia/packages create mode 100755 external/config/desktop/noble/appgroups/office/packages create mode 100755 external/config/desktop/noble/appgroups/programming/custom/desktops/cinnamon/packages create mode 100755 external/config/desktop/noble/appgroups/programming/custom/desktops/gnome/packages create mode 100755 external/config/desktop/noble/appgroups/programming/custom/desktops/kde/packages create mode 100755 external/config/desktop/noble/appgroups/programming/packages create mode 100755 external/config/desktop/noble/appgroups/remote_desktop/packages create mode 100755 external/config/desktop/noble/environments/xfce/appgroups/programming/packages create mode 100755 external/config/desktop/noble/environments/xfce/config_base/packages create mode 100755 external/config/desktop/noble/environments/xfce/config_base/packages.uninstall create mode 100755 external/config/desktop/noble/environments/xfce/debian/orangepi-bsp-desktop/postinst create mode 100755 external/config/desktop/noble/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh create mode 100755 external/config/desktop/noble/environments/xfce/debian/postinst create mode 100755 external/config/desktop/noble/environments/xfce/orangepi/create_desktop_package.sh create mode 100755 external/config/desktop/noble/environments/xfce/support create mode 100755 external/config/distributions/noble/name create mode 100755 external/config/distributions/noble/support create mode 100644 external/config/optional/families/sun50iw9/_config/desktop/noble/environments/xfce/config_base/packages diff --git a/external/config/boards/orangepizero2w.conf b/external/config/boards/orangepizero2w.conf index 27bdc9b..c5413ad 100755 --- a/external/config/boards/orangepizero2w.conf +++ b/external/config/boards/orangepizero2w.conf @@ -10,6 +10,6 @@ MODULES_BLACKLIST_LEGACY="bcmdhd" MODULES_BLACKLIST_CURRENT="bcmdhd" DISTRIB_TYPE_LEGACY="buster" DISTRIB_TYPE_CURRENT="bullseye focal jammy" -DISTRIB_TYPE_NEXT="bullseye bookworm jammy raspi" +DISTRIB_TYPE_NEXT="bullseye bookworm jammy noble raspi" BOOT_LOGO="desktop" -REVISION="1.0.2" +REVISION="1.0.4" diff --git a/external/config/boards/orangepizero3.conf b/external/config/boards/orangepizero3.conf index 6c4a01f..7a7085f 100755 --- a/external/config/boards/orangepizero3.conf +++ b/external/config/boards/orangepizero3.conf @@ -10,6 +10,6 @@ MODULES_BLACKLIST_LEGACY="bcmdhd" MODULES_BLACKLIST_CURRENT="bcmdhd" DISTRIB_TYPE_LEGACY="buster" DISTRIB_TYPE_CURRENT="bullseye focal jammy" -DISTRIB_TYPE_NEXT="bullseye bookworm jammy raspi" +DISTRIB_TYPE_NEXT="bullseye bookworm jammy noble raspi" BOOT_LOGO="desktop" -REVISION="1.0.4" +REVISION="1.0.6" diff --git a/external/config/cli/noble/debootstrap/components b/external/config/cli/noble/debootstrap/components new file mode 100755 index 0000000..0dcc422 --- /dev/null +++ b/external/config/cli/noble/debootstrap/components @@ -0,0 +1 @@ +main universe restricted diff --git a/external/config/cli/noble/debootstrap/config_desktop/packages b/external/config/cli/noble/debootstrap/config_desktop/packages new file mode 100755 index 0000000..20dfb58 --- /dev/null +++ b/external/config/cli/noble/debootstrap/config_desktop/packages @@ -0,0 +1,3 @@ +dconf-cli +libglib2.0-dev +libgtk2.0-bin diff --git a/external/config/cli/noble/debootstrap/packages b/external/config/cli/noble/debootstrap/packages new file mode 100755 index 0000000..ec387f0 --- /dev/null +++ b/external/config/cli/noble/debootstrap/packages @@ -0,0 +1,33 @@ +apt-utils +bzip2 +ca-certificates +console-setup +cpio +cron +dbus +dbus-user-session +dmsetup +fdisk +gnupg +ifupdown +init +initramfs-tools +iputils-ping +isc-dhcp-client +kmod +less +libpam-systemd +linux-base +locales +logrotate +netbase +netcat-openbsd +rsync +rsyslog +sudo +systemd +tzdata +ucf +udev +whiptail +wireless-regdb diff --git a/external/config/cli/noble/main/config_cli_standard/packages b/external/config/cli/noble/main/config_cli_standard/packages new file mode 100755 index 0000000..5c5f30a --- /dev/null +++ b/external/config/cli/noble/main/config_cli_standard/packages @@ -0,0 +1,34 @@ +automake +bison +bridge-utils +build-essential +ca-certificates +console-setup +dkms +expect +fbset +flex +gnupg2 +hping3 +html2text +initramfs-tools +iptables +iw +keyboard-configuration +libnl-3-dev +libnl-genl-3-dev +libssl-dev +libwrap0-dev +linux-base +man-db +networkd-dispatcher +nfs-common +python3-distutils-extra +python3-lib2to3 +selinux-policy-default +sudo +unattended-upgrades +unicode-data +vnstat +wireless-regdb +wpasupplicant diff --git a/external/config/cli/noble/main/config_cli_standard/packages.additional b/external/config/cli/noble/main/config_cli_standard/packages.additional new file mode 100755 index 0000000..d2b9dab --- /dev/null +++ b/external/config/cli/noble/main/config_cli_standard/packages.additional @@ -0,0 +1,39 @@ +alsa-utils +aptitude +avahi-autoipd +bash-completion +btrfs-progs +dnsutils +dosfstools +ethtool +evtest +f2fs-tools +f3 +git +haveged +hdparm +hostapd +ifenslave +iotop +iperf3 +iputils-arping +libdigest-sha-perl +libfuse2 +libnss-myhostname +libpam-systemd +libproc-processtable-perl +nfs-common +ntfs-3g +pciutils +plymouth +plymouth-themes +pv +qrencode +rfkill +screen +software-properties-common +stress +sunxi-tools +unzip +vim +vlan diff --git a/external/config/cli/noble/main/config_desktop/packages b/external/config/cli/noble/main/config_desktop/packages new file mode 100755 index 0000000..b3aced6 --- /dev/null +++ b/external/config/cli/noble/main/config_desktop/packages @@ -0,0 +1,25 @@ +automake +bison +bridge-utils +build-essential +ca-certificates +console-setup +emacs-nox +expect +fbset +flex +html2text +initramfs-tools +iptables +iw +keyboard-configuration +libnl-3-dev +libnl-genl-3-dev +libssl-dev +libwrap0-dev +linux-base +sudo +unattended-upgrades +unicode-data +wireless-regdb +wpasupplicant diff --git a/external/config/cli/noble/main/config_desktop/packages.additional b/external/config/cli/noble/main/config_desktop/packages.additional new file mode 100755 index 0000000..052d157 --- /dev/null +++ b/external/config/cli/noble/main/config_desktop/packages.additional @@ -0,0 +1,36 @@ +alsa-utils +aptitude +avahi-autoipd +bash-completion +btrfs-progs +dnsutils +dosfstools +ethtool +evtest +f2fs-tools +f3 +git +haveged +hdparm +hostapd +ifenslave +iotop +iperf3 +iputils-arping +libdigest-sha-perl +libfuse2 +libnss-myhostname +libpam-systemd +libproc-processtable-perl +ntfs-3g +pciutils +pv +qrencode +rfkill +screen +software-properties-common +stress +sunxi-tools +unzip +vim +vlan diff --git a/external/config/cli/noble/main/packages b/external/config/cli/noble/main/packages new file mode 100755 index 0000000..bfd7121 --- /dev/null +++ b/external/config/cli/noble/main/packages @@ -0,0 +1,21 @@ +bc +chrony +cpufrequtils +debconf-utils +device-tree-compiler +dialog +fake-hwclock +figlet +fping +ncurses-term +nocache +openssh-server +parted +psmisc +python3-apt +smartmontools +sysfsutils +toilet +u-boot-tools +usbutils +python-is-python3 diff --git a/external/config/cli/noble/main/packages.additional b/external/config/cli/noble/main/packages.additional new file mode 100755 index 0000000..a9fb06e --- /dev/null +++ b/external/config/cli/noble/main/packages.additional @@ -0,0 +1,21 @@ +cracklib-runtime +curl +htop +i2c-tools +iozone3 +jq +libcrack2 +lm-sensors +lsof +mc +mmc-utils +nano +net-tools +netplan.io +network-manager +network-manager-openvpn +resolvconf +sysstat +wget +wireless-tools +wpasupplicant diff --git a/external/config/desktop/noble/appgroups/3dsupport/packages b/external/config/desktop/noble/appgroups/3dsupport/packages new file mode 100755 index 0000000..4364640 --- /dev/null +++ b/external/config/desktop/noble/appgroups/3dsupport/packages @@ -0,0 +1,2 @@ +glmark2-es2 +mesa-utils diff --git a/external/config/desktop/noble/appgroups/browsers/debian/postinst b/external/config/desktop/noble/appgroups/browsers/debian/postinst new file mode 100755 index 0000000..96dc4f1 --- /dev/null +++ b/external/config/desktop/noble/appgroups/browsers/debian/postinst @@ -0,0 +1,14 @@ +if [ -f /etc/chromium-browser/default ]; then +cat > /etc/chromium-browser/default << DELIM +# Options to pass to chromium-browser +CHROMIUM_FLAGS="--use-gl=egl --ignore-gpu-blocklist --enable-accelerated-video-decode --enable-zero-copy --enable-gpu-rasterization --enable-oop-rasterization --enable-pinch --flag-switches-begin --flag-switches-end --origin-trial-disabled-features=SecurePaymentConfirmation" +DELIM +fi + +# overwrite stock firefox configuration +if [ -d /etc/firefox/ ]; then ln -sf /etc/orangepi/firefox.conf /etc/firefox/syspref.js; fi +if [ -d /usr/lib/firefox-esr/ ]; then + ln -sf /etc/orangepi/firefox.conf /usr/lib/firefox-esr/mozilla.cfg + echo 'pref("general.config.obscure_value", 0);' > /usr/lib/firefox-esr/defaults/pref/local-settings.js + echo 'pref("general.config.filename", "mozilla.cfg");' >> /usr/lib/firefox-esr/defaults/pref/local-settings.js +fi diff --git a/external/config/desktop/noble/appgroups/browsers/orangepi/create_desktop_package.sh b/external/config/desktop/noble/appgroups/browsers/orangepi/create_desktop_package.sh new file mode 100755 index 0000000..d5b9f0d --- /dev/null +++ b/external/config/desktop/noble/appgroups/browsers/orangepi/create_desktop_package.sh @@ -0,0 +1,4 @@ +# install optimized browser configurations +cp "${EXTER}"/packages/blobs/desktop/chromium.conf "${destination}"/etc/orangepi +cp "${EXTER}"/packages/blobs/desktop/firefox.conf "${destination}"/etc/orangepi +cp -R "${EXTER}"/packages/blobs/desktop/chromium "${destination}"/etc/orangepi diff --git a/external/config/desktop/noble/appgroups/browsers/packages b/external/config/desktop/noble/appgroups/browsers/packages new file mode 100755 index 0000000..f99c9a1 --- /dev/null +++ b/external/config/desktop/noble/appgroups/browsers/packages @@ -0,0 +1 @@ +chromium-browser diff --git a/external/config/desktop/noble/appgroups/chat/packages b/external/config/desktop/noble/appgroups/chat/packages new file mode 100755 index 0000000..362c4fe --- /dev/null +++ b/external/config/desktop/noble/appgroups/chat/packages @@ -0,0 +1,9 @@ +hexchat +pidgin +purple-discord +purple-lurch +purple-matrix +purple-mm-sms +purple-rocketchat +telegram-purple +telegram-desktop diff --git a/external/config/desktop/noble/appgroups/desktop_tools/packages b/external/config/desktop/noble/appgroups/desktop_tools/packages new file mode 100755 index 0000000..485ac59 --- /dev/null +++ b/external/config/desktop/noble/appgroups/desktop_tools/packages @@ -0,0 +1,3 @@ +bleachbit +fbi +gparted diff --git a/external/config/desktop/noble/appgroups/editors/debian/postinst b/external/config/desktop/noble/appgroups/editors/debian/postinst new file mode 100755 index 0000000..e69de29 diff --git a/external/config/desktop/noble/appgroups/editors/packages b/external/config/desktop/noble/appgroups/editors/packages new file mode 100755 index 0000000..8b52c4f --- /dev/null +++ b/external/config/desktop/noble/appgroups/editors/packages @@ -0,0 +1,3 @@ +emacs +notepadqq +vim diff --git a/external/config/desktop/noble/appgroups/email/packages b/external/config/desktop/noble/appgroups/email/packages new file mode 100755 index 0000000..84daedd --- /dev/null +++ b/external/config/desktop/noble/appgroups/email/packages @@ -0,0 +1 @@ +thunderbird diff --git a/external/config/desktop/noble/appgroups/internet/packages b/external/config/desktop/noble/appgroups/internet/packages new file mode 100755 index 0000000..a2c5a91 --- /dev/null +++ b/external/config/desktop/noble/appgroups/internet/packages @@ -0,0 +1,4 @@ +filezilla +putty +transmission +transmission-remote-gtk diff --git a/external/config/desktop/noble/appgroups/multimedia/packages b/external/config/desktop/noble/appgroups/multimedia/packages new file mode 100755 index 0000000..f3a08a0 --- /dev/null +++ b/external/config/desktop/noble/appgroups/multimedia/packages @@ -0,0 +1,4 @@ +celluloid +eog +gimp +mpv diff --git a/external/config/desktop/noble/appgroups/office/packages b/external/config/desktop/noble/appgroups/office/packages new file mode 100755 index 0000000..25e91f3 --- /dev/null +++ b/external/config/desktop/noble/appgroups/office/packages @@ -0,0 +1,3 @@ +libreoffice +libreoffice-style-elementary +simple-scan diff --git a/external/config/desktop/noble/appgroups/programming/custom/desktops/cinnamon/packages b/external/config/desktop/noble/appgroups/programming/custom/desktops/cinnamon/packages new file mode 100755 index 0000000..35db926 --- /dev/null +++ b/external/config/desktop/noble/appgroups/programming/custom/desktops/cinnamon/packages @@ -0,0 +1,2 @@ +gnome-builder +sysprof diff --git a/external/config/desktop/noble/appgroups/programming/custom/desktops/gnome/packages b/external/config/desktop/noble/appgroups/programming/custom/desktops/gnome/packages new file mode 100755 index 0000000..96c54c3 --- /dev/null +++ b/external/config/desktop/noble/appgroups/programming/custom/desktops/gnome/packages @@ -0,0 +1,2 @@ +geany +gnome-builder diff --git a/external/config/desktop/noble/appgroups/programming/custom/desktops/kde/packages b/external/config/desktop/noble/appgroups/programming/custom/desktops/kde/packages new file mode 100755 index 0000000..5988f0d --- /dev/null +++ b/external/config/desktop/noble/appgroups/programming/custom/desktops/kde/packages @@ -0,0 +1,2 @@ +kdevelop +qtcreator diff --git a/external/config/desktop/noble/appgroups/programming/packages b/external/config/desktop/noble/appgroups/programming/packages new file mode 100755 index 0000000..c965e26 --- /dev/null +++ b/external/config/desktop/noble/appgroups/programming/packages @@ -0,0 +1,5 @@ +build-essential +clang +geany +meld +regexxer diff --git a/external/config/desktop/noble/appgroups/remote_desktop/packages b/external/config/desktop/noble/appgroups/remote_desktop/packages new file mode 100755 index 0000000..1b4fb4e --- /dev/null +++ b/external/config/desktop/noble/appgroups/remote_desktop/packages @@ -0,0 +1,3 @@ +remmina +remmina-plugin-vnc +remmina-plugin-rdp diff --git a/external/config/desktop/noble/environments/xfce/appgroups/programming/packages b/external/config/desktop/noble/environments/xfce/appgroups/programming/packages new file mode 100755 index 0000000..96c54c3 --- /dev/null +++ b/external/config/desktop/noble/environments/xfce/appgroups/programming/packages @@ -0,0 +1,2 @@ +geany +gnome-builder diff --git a/external/config/desktop/noble/environments/xfce/config_base/packages b/external/config/desktop/noble/environments/xfce/config_base/packages new file mode 100755 index 0000000..aa4ca13 --- /dev/null +++ b/external/config/desktop/noble/environments/xfce/config_base/packages @@ -0,0 +1,166 @@ +anacron +apport-gtk +blueman +bluez +bluez-cups +bluez-tools +brltty +brltty-x11 +cifs-utils +colord +cups +cups-bsd +cups-client +cups-filters +dbus-x11 +dictionaries-common +dmz-cursor-theme +doc-base +evince +evince-common +fontconfig +fontconfig-config +fonts-arphic-ukai +fonts-arphic-uming +fonts-dejavu-core +fonts-freefont-ttf +fonts-guru +fonts-guru-extra +fonts-kacst +fonts-kacst-one +fonts-khmeros-core +fonts-liberation +fonts-nanum +fonts-opensymbol +fonts-stix +fonts-symbola +fonts-ubuntu-console +foomatic-db-compressed-ppds +gdebi +ghostscript +gist +gnome-font-viewer +gnome-screenshot +gnome-user-docs-de +gnome-user-docs-es +gnome-user-docs-it +gnome-user-docs-pt +gnome-user-docs-ru +gnome-user-docs-sl +gnome-system-monitor +gstreamer1.0-packagekit +gstreamer1.0-plugins-base-apps +gstreamer1.0-pulseaudio +gtk2-engines +gtk2-engines-murrine +gtk2-engines-pixbuf +gvfs-backends +hplip +indicator-printers +inputattach +inxi +kerneloops +keyutils +language-pack-gnome-de +language-pack-gnome-en +language-pack-gnome-es +language-pack-gnome-fr +language-pack-gnome-it +language-pack-gnome-pt +language-pack-gnome-ru +language-pack-gnome-sl +laptop-detect +libatk-adaptor +libfont-afm-perl +libfontconfig1 +libfontenc1 +libgail-common +libgl1-mesa-dri +libgsettings-qt1 +libgtk2.0-bin +libnotify-bin +libpam-gnome-keyring +libproxy1-plugin-gsettings +libproxy1-plugin-networkmanager +libu2f-udev +libwmf0.2-7-gtk +libxapp1 +libxcursor1 +lightdm +lightdm-settings +lxtask +mesa-utils +mousepad +mousetweaks +network-manager-gnome +network-manager-openvpn +network-manager-ssh +network-manager-vpnc +numix-gtk-theme +numix-icon-theme +numix-icon-theme-circle +openprinting-ppds +orca +p7zip-full +pamix +pasystray +pavucontrol +pavucontrol-qt +pavumeter +policykit-1 +policykit-desktop-privileges +printer-driver-all +profile-sync-daemon +pulseaudio-module-bluetooth +qalculate-gtk +redshift +slick-greeter +smbclient +software-properties-gtk +spice-vdagent +system-config-printer +system-config-printer-common +terminator +thunar-volman +tree +ubuntu-drivers-common +update-inetd +update-manager +update-manager-core +update-notifier +update-notifier-common +viewnior +wamerican +wbrazilian +wbritish +wfrench +witalian +wportuguese +wspanish +wswiss +x11-apps +x11-utils +x11-xserver-utils +libxapp-dev +xapps-common +xarchiver +xbacklight +xcursor-themes +xdg-user-dirs +xdg-user-dirs-gtk +xfce4 +xfce4-notifyd +xfce4-power-manager +xfce4-screenshooter +xfce4-terminal +xfonts-100dpi +xfonts-75dpi +xfonts-base +xfonts-encodings +xfonts-scalable +xfonts-utils +xorg-docs-core +xscreensaver +xserver-xorg +xserver-xorg-video-fbdev +xwallpaper diff --git a/external/config/desktop/noble/environments/xfce/config_base/packages.uninstall b/external/config/desktop/noble/environments/xfce/config_base/packages.uninstall new file mode 100755 index 0000000..adf250e --- /dev/null +++ b/external/config/desktop/noble/environments/xfce/config_base/packages.uninstall @@ -0,0 +1 @@ +ubuntu-session diff --git a/external/config/desktop/noble/environments/xfce/debian/orangepi-bsp-desktop/postinst b/external/config/desktop/noble/environments/xfce/debian/orangepi-bsp-desktop/postinst new file mode 100755 index 0000000..e69de29 diff --git a/external/config/desktop/noble/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh b/external/config/desktop/noble/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh new file mode 100755 index 0000000..e69de29 diff --git a/external/config/desktop/noble/environments/xfce/debian/postinst b/external/config/desktop/noble/environments/xfce/debian/postinst new file mode 100755 index 0000000..6269956 --- /dev/null +++ b/external/config/desktop/noble/environments/xfce/debian/postinst @@ -0,0 +1,22 @@ +# overwrite stock lightdm greeter configuration +if [ -d /etc/orangepi/lightdm ]; then cp -R /etc/orangepi/lightdm /etc/; fi + + +#Adjust xsettings.xml for NumixBlue Theme Ubuntu +if [ -f /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml ]; then sed -i 's/Xfce-dusk/NumixBlue/g' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml; fi + +# Adjust menu +#if [ -f /etc/xdg/menus/xfce-applications.menu ]; then +#sed -i -n '/Settings<\/Menuname>/{p;:a;N;/xfce4-session-logout.desktop<\/Filename>/!ba;s/.*\n/\ +#\t\n\t\n \n orangepi-donate.desktop<\/Filename>\ +#\n orangepi-support.desktop<\/Filename>\n/};p' /etc/xdg/menus/xfce-applications.menu +#fi + +# Hide few items +if [ -f /usr/share/applications/display-im6.q16.desktop ]; then mv /usr/share/applications/display-im6.q16.desktop /usr/share/applications/display-im6.q16.desktop.hidden; fi +if [ -f /usr/share/applications/display-im6.desktop ]]; then mv /usr/share/applications/display-im6.desktop /usr/share/applications/display-im6.desktop.hidden; fi +if [ -f /usr/share/applications/vim.desktop ]]; then mv /usr/share/applications/vim.desktop /usr/share/applications/vim.desktop.hidden; fi +if [ -f /usr/share/applications/libreoffice-startcenter.desktop ]]; then mv /usr/share/applications/libreoffice-startcenter.desktop /usr/share/applications/libreoffice-startcenter.desktop.hidden; 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 diff --git a/external/config/desktop/noble/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/noble/environments/xfce/orangepi/create_desktop_package.sh new file mode 100755 index 0000000..dda7225 --- /dev/null +++ b/external/config/desktop/noble/environments/xfce/orangepi/create_desktop_package.sh @@ -0,0 +1,22 @@ +# 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 diff --git a/external/config/desktop/noble/environments/xfce/support b/external/config/desktop/noble/environments/xfce/support new file mode 100755 index 0000000..a23e5fb --- /dev/null +++ b/external/config/desktop/noble/environments/xfce/support @@ -0,0 +1 @@ +supported diff --git a/external/config/distributions/noble/name b/external/config/distributions/noble/name new file mode 100755 index 0000000..337c32d --- /dev/null +++ b/external/config/distributions/noble/name @@ -0,0 +1 @@ +Ubuntu noble 24.04 LTS diff --git a/external/config/distributions/noble/support b/external/config/distributions/noble/support new file mode 100755 index 0000000..a23e5fb --- /dev/null +++ b/external/config/distributions/noble/support @@ -0,0 +1 @@ +supported diff --git a/external/config/optional/families/sun50iw9/_config/desktop/noble/environments/xfce/config_base/packages b/external/config/optional/families/sun50iw9/_config/desktop/noble/environments/xfce/config_base/packages new file mode 100644 index 0000000..c2b6e14 --- /dev/null +++ b/external/config/optional/families/sun50iw9/_config/desktop/noble/environments/xfce/config_base/packages @@ -0,0 +1,38 @@ +clinfo +debhelper +dkms +fakeroot +fcitx5-chinese-addons +fcitx5-config-qt +fcitx5-data +fcitx5 fonts-noto-cjk-extra +fcitx5-frontend-gtk2 +fcitx5-frontend-gtk3 +fcitx5-frontend-gtk4 +fcitx5-frontend-qt5 +fcitx5-module-cloudpinyin +fonts-arphic-bsmi00lp +fonts-arphic-gbsn00lp +fonts-arphic-gkai00mp +fonts-noto-cjk +geany +glmark2-x11 +glmark2-es2-x11 +gnome-user-docs-fr +gnome-user-docs-zh-hans +im-config +language-pack-gnome-zh-hans +language-pack-zh-hans +language-selector-gnome +libjsoncpp-dev +libpipewire-0.3-0t64 +libqt5qmlworkerscript5 +qml-module-qtquick2 +screenfetch +tightvncserver +vlc +wngerman +wogerman +xinput +xrdp +zenity diff --git a/external/packages/bsp/overlays_arm64/usr/bin/create_ap b/external/packages/bsp/overlays_arm64/usr/bin/create_ap index e5b7a88..2c49d5e 100755 --- a/external/packages/bsp/overlays_arm64/usr/bin/create_ap +++ b/external/packages/bsp/overlays_arm64/usr/bin/create_ap @@ -329,9 +329,9 @@ can_transmit_to_channel() { if [[ $USE_IWCONFIG -eq 0 ]]; then if [[ $FREQ_BAND == 2.4 ]]; then - CHANNEL_INFO=$(get_adapter_info ${IFACE} | grep " 24[0-9][0-9] MHz \[${CHANNEL_NUM}\]") + CHANNEL_INFO=$(get_adapter_info ${IFACE} | grep " \(24[0-9][0-9]\|24[0-9][0-9].[0-9]\) MHz \[${CHANNEL_NUM}\]") else - CHANNEL_INFO=$(get_adapter_info ${IFACE} | grep " \(49[0-9][0-9]\|5[0-9]\{3\}\) MHz \[${CHANNEL_NUM}\]") + CHANNEL_INFO=$(get_adapter_info ${IFACE} | grep " \(49[0-9][0-9].[0-9]\|5[0-9]\{3\}.[0-9]\|49[0-9][0-9]\|5[0-9]\{3\}\) MHz \[${CHANNEL_NUM}\]") fi [[ -z "${CHANNEL_INFO}" ]] && return 1 [[ "${CHANNEL_INFO}" == *no\ IR* ]] && return 1 diff --git a/external/packages/bsp/overlays_arm64/usr/bin/install_qt.sh b/external/packages/bsp/overlays_arm64/usr/bin/install_qt.sh index 6ebd6d5..4d8a560 100755 --- a/external/packages/bsp/overlays_arm64/usr/bin/install_qt.sh +++ b/external/packages/bsp/overlays_arm64/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!" diff --git a/external/packages/bsp/overlays_arm64/usr/bin/install_ros.sh b/external/packages/bsp/overlays_arm64/usr/bin/install_ros.sh index e7c9988..6a4038e 100755 --- a/external/packages/bsp/overlays_arm64/usr/bin/install_ros.sh +++ b/external/packages/bsp/overlays_arm64/usr/bin/install_ros.sh @@ -71,4 +71,23 @@ if [[ $version == "ros2" && $release =~ jammy ]]; then fi +if [[ $version == "ros2" && $release =~ noble ]]; 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-jazzy-desktop + 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_arm64/usr/bin/test_ros.sh b/external/packages/bsp/overlays_arm64/usr/bin/test_ros.sh index f38b35e..3db0abc 100755 --- a/external/packages/bsp/overlays_arm64/usr/bin/test_ros.sh +++ b/external/packages/bsp/overlays_arm64/usr/bin/test_ros.sh @@ -27,3 +27,12 @@ if [[ -f /opt/ros/humble/setup.bash ]]; then 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/chroot-buildpackages.sh b/scripts/chroot-buildpackages.sh index bbdb6a0..1976598 100755 --- a/scripts/chroot-buildpackages.sh +++ b/scripts/chroot-buildpackages.sh @@ -39,6 +39,7 @@ create_chroot() apt_mirror['impish']="$UBUNTU_MIRROR" components['stretch']='main,contrib' apt_mirror['jammy']="$UBUNTU_MIRROR" + apt_mirror['noble']="$UBUNTU_MIRROR" components['buster']='main,contrib' components['bullseye']='main,contrib' components['bookworm']='main,contrib' @@ -49,6 +50,7 @@ create_chroot() components['hirsute']='main,universe,multiverse' components['impish']='main,universe,multiverse' components['jammy']='main,universe,multiverse' + components['noble']='main,universe,multiverse' display_alert "Creating build chroot" "$release/$arch" "info" local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3,distcc,apt-utils" @@ -140,6 +142,7 @@ chroot_prepare_distccd() gcc_version['bionic']='5.4' gcc_version['focal']='9.2' gcc_version['jammy']='10.2' + gcc_version['noble']='13.2' gcc_version['hirsute']='10.2' gcc_version['sid']='10.2' gcc_type['armhf']='arm-linux-gnueabihf-' @@ -176,7 +179,7 @@ chroot_build_packages() target_arch="${ARCH}" else # only make packages for recent releases. There are no changes on older - target_release="stretch bionic buster bullseye bookworm focal hirsute jammy sid" + target_release="stretch bionic buster bullseye bookworm focal hirsute jammy noble sid" target_arch="armhf arm64" fi diff --git a/scripts/configuration.sh b/scripts/configuration.sh index a34b07c..266b9e9 100755 --- a/scripts/configuration.sh +++ b/scripts/configuration.sh @@ -416,7 +416,7 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^} [[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY" [[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH" -if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish|jammy)$ ]]; then +if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish|jammy|noble)$ ]]; then DISTRIBUTION="Ubuntu" elif [[ "$RELEASE" == raspi ]]; then DISTRIBUTION="Bullseye" diff --git a/scripts/debootstrap.sh b/scripts/debootstrap.sh index baa1cad..8b49bcb 100755 --- a/scripts/debootstrap.sh +++ b/scripts/debootstrap.sh @@ -458,7 +458,7 @@ prepare_partitions() { # parttype[nfs] is empty # metadata_csum and 64bit may need to be disabled explicitly when migrating to newer supported host OS releases - if [[ $HOSTRELEASE =~ buster|bullseye|bookworm|bionic|focal|jammy|kinetic|sid ]]; then + if [[ $HOSTRELEASE =~ buster|bullseye|bookworm|bionic|focal|jammy|noble|kinetic|sid ]]; then mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum" fi # mkopts[fat] is empty diff --git a/scripts/distributions.sh b/scripts/distributions.sh index b5977bb..5951ecb 100755 --- a/scripts/distributions.sh +++ b/scripts/distributions.sh @@ -743,7 +743,7 @@ install_distribution_specific() ;; - bionic|focal|hirsute|impish|jammy) + bionic|focal|hirsute|impish|jammy|noble) # by using default lz4 initrd compression leads to corruption, go back to proven method sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" "${SDCARD}"/etc/initramfs-tools/initramfs.conf diff --git a/scripts/general.sh b/scripts/general.sh index 239291d..ae213de 100755 --- a/scripts/general.sh +++ b/scripts/general.sh @@ -158,7 +158,7 @@ get_package_list_hash() # create_sources_list # -# : buster|bullseye|bookworm|bionic|focal|jammy|hirsute|sid +# : buster|bullseye|bookworm|bionic|focal|jammy|noble|hirsute|sid # : path to root directory # create_sources_list() @@ -227,7 +227,7 @@ create_sources_list() EOF ;; - xenial|bionic|focal|hirsute|impish|jammy) + xenial|bionic|focal|hirsute|impish|jammy|noble) 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 @@ -874,13 +874,13 @@ function distro_menu () [[ -z "${DISTRIB_TYPE_LEGACY}" ]] && DISTRIB_TYPE="buster bionic focal" elif [[ "${BRANCH}" == "current" ]]; then DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}" - [[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy" + [[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy noble" elif [[ "${BRANCH}" == "next" ]]; then if [[ -n "${DISTRIB_TYPE_NEXT}" ]]; then DISTRIB_TYPE="${DISTRIB_TYPE_NEXT}" else DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}" - [[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy" + [[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy noble" fi fi @@ -941,7 +941,7 @@ addtorepo() # parameter "delete" remove incoming directory if publishing is succesful # function: cycle trough distributions - local distributions=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "sid") + local distributions=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "noble" "sid") #local distributions=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3)) local errors=0 @@ -1071,7 +1071,7 @@ repo-manipulate() # "update" search for new files in output/debs* to add them to repository # "purge" leave only last 5 versions - local DISTROS=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "sid") + local DISTROS=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "noble" "sid") #local DISTROS=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3)) case $@ in @@ -1445,7 +1445,7 @@ prepare_host() fi # Add support for Ubuntu 20.04, 21.04 and Mint 20.x - if [[ $HOSTRELEASE =~ ^(focal|hirsute|jammy|ulyana|ulyssa|bullseye|bookworm|uma)$ ]]; then + if [[ $HOSTRELEASE =~ ^(focal|hirsute|jammy|noble|noble|ulyana|ulyssa|bullseye|bookworm|uma)$ ]]; then hostdeps+=" python2 python3" ln -fs /usr/bin/python2.7 /usr/bin/python2 ln -fs /usr/bin/python2.7 /usr/bin/python @@ -1460,7 +1460,7 @@ prepare_host() # # NO_HOST_RELEASE_CHECK overrides the check for a supported host system # Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion - if [[ -z $HOSTRELEASE || "focal jammy" != *"$HOSTRELEASE"* ]]; then + if [[ -z $HOSTRELEASE || "focal jammy noble" != *"$HOSTRELEASE"* ]]; then if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn" display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn" @@ -1913,7 +1913,7 @@ install_docker() { buster|bullseye|bookworm) distributor_id="debian" ;; - xenial|bionic|focal|jammy) + xenial|bionic|focal|jammy|noble) distributor_id="ubuntu" ;; esac