From f2d7b2d110c7751b044b1ae48f8c42e8675e6f97 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 9 Jun 2024 10:16:08 +0200 Subject: [PATCH] Adjust several desktop targets in order to be able to assemble them Images were tested for compiling with newly added Action script that generates x86 QEMU images upon (manual for now) execution https://github.com/armbian/os/actions/workflows/full-distro-build-and-test.yml --- .../environments/budgie/config_base/packages | 5 - .../environments/gnome/config_base/packages | 3 - .../environments/mate/config_base/packages | 1 - .../common/appgroups/browsers/packages | 1 + .../environments/budgie/config_base/packages | 1 - .../environments/mate/config_base/packages | 1 - .../jammy/environments/kde-neon/support | 2 +- .../kde-plasma/config_base/packages | 4 - .../noble/environments/i3-wm/architectures | 1 + .../i3-wm/armbian/create_desktop_package.sh | 14 ++ .../environments/i3-wm/config_base/packages | 154 ++++++++++++++++++ .../noble/environments/i3-wm/debian/postinst | 41 +++++ .../desktop/noble/environments/i3-wm/support | 1 + .../noble/environments/kde-neon/architectures | 1 + .../noble/environments/kde-neon/armbian | 1 + .../kde-neon/config_base/packages | 10 ++ .../kde-neon/config_base/packages.uninstall | 1 + .../noble/environments/kde-neon/debian | 1 + .../kde-neon/sources/apt/neon.gpg | Bin 0 -> 1108 bytes .../kde-neon/sources/apt/neon.source | 1 + .../noble/environments/kde-neon/support | 1 + config/desktop/noble/environments/kde-plasma | 1 + .../amd64/_config/cli/{mantic => oracular} | 0 .../amd64/_config/cli/trixie/main/packages | 2 + .../cli/trixie/main/packages.additional | 1 + .../cli/trixie => arm64/_config/cli/oracular} | 0 .../arm64/_config/cli/trixie/main/packages | 2 + .../cli/trixie/main/packages.additional | 1 + .../architectures/armhf/_config/cli/mantic | 1 - .../armhf/_config/cli/noble/main/packages | 1 - .../cli/mantic => armhf/_config/cli/oracular} | 0 .../architectures/armhf/_config/cli/trixie | 1 - .../armhf/_config/cli/trixie/main/packages | 2 + .../cli/trixie/main/packages.additional | 1 + 34 files changed, 239 insertions(+), 19 deletions(-) mode change 120000 => 100644 config/desktop/jammy/environments/kde-neon/support create mode 100644 config/desktop/noble/environments/i3-wm/architectures create mode 100644 config/desktop/noble/environments/i3-wm/armbian/create_desktop_package.sh create mode 100644 config/desktop/noble/environments/i3-wm/config_base/packages create mode 100644 config/desktop/noble/environments/i3-wm/debian/postinst create mode 100644 config/desktop/noble/environments/i3-wm/support create mode 120000 config/desktop/noble/environments/kde-neon/architectures create mode 120000 config/desktop/noble/environments/kde-neon/armbian create mode 100644 config/desktop/noble/environments/kde-neon/config_base/packages create mode 120000 config/desktop/noble/environments/kde-neon/config_base/packages.uninstall create mode 120000 config/desktop/noble/environments/kde-neon/debian create mode 100644 config/desktop/noble/environments/kde-neon/sources/apt/neon.gpg create mode 100644 config/desktop/noble/environments/kde-neon/sources/apt/neon.source create mode 100644 config/desktop/noble/environments/kde-neon/support create mode 120000 config/desktop/noble/environments/kde-plasma rename config/optional/architectures/amd64/_config/cli/{mantic => oracular} (100%) create mode 100644 config/optional/architectures/amd64/_config/cli/trixie/main/packages create mode 100644 config/optional/architectures/amd64/_config/cli/trixie/main/packages.additional rename config/optional/architectures/{amd64/_config/cli/trixie => arm64/_config/cli/oracular} (100%) create mode 100644 config/optional/architectures/arm64/_config/cli/trixie/main/packages create mode 100644 config/optional/architectures/arm64/_config/cli/trixie/main/packages.additional delete mode 120000 config/optional/architectures/armhf/_config/cli/mantic rename config/optional/architectures/{arm64/_config/cli/mantic => armhf/_config/cli/oracular} (100%) delete mode 120000 config/optional/architectures/armhf/_config/cli/trixie create mode 100644 config/optional/architectures/armhf/_config/cli/trixie/main/packages create mode 100644 config/optional/architectures/armhf/_config/cli/trixie/main/packages.additional diff --git a/config/desktop/bookworm/environments/budgie/config_base/packages b/config/desktop/bookworm/environments/budgie/config_base/packages index 3708bd6a61c0..876a4a36dfa5 100644 --- a/config/desktop/bookworm/environments/budgie/config_base/packages +++ b/config/desktop/bookworm/environments/budgie/config_base/packages @@ -26,7 +26,6 @@ budgie-kangaroo-applet budgie-keyboard-autoswitch-applet budgie-network-manager-applet budgie-previews -budgie-previews-applet budgie-quickchar budgie-quicknote-applet budgie-recentlyused-applet @@ -38,9 +37,7 @@ budgie-trash-applet budgie-visualspace-applet budgie-wallstreet budgie-weathershow-applet -budgie-window-mover-applet budgie-window-shuffler -budgie-workspace-overview-applet budgie-workspace-stopwatch-applet cifs-utils colord @@ -57,12 +54,10 @@ fontconfig fontconfig-config fonts-noto-mono fonts-ubuntu -fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi ghostscript-x gist -gnome-orca gnome-screenshot gnome-disk-utility gnome-system-monitor diff --git a/config/desktop/bookworm/environments/gnome/config_base/packages b/config/desktop/bookworm/environments/gnome/config_base/packages index 25b6306a3ac6..5c0e9a521abf 100644 --- a/config/desktop/bookworm/environments/gnome/config_base/packages +++ b/config/desktop/bookworm/environments/gnome/config_base/packages @@ -24,10 +24,7 @@ gnome-system-monitor gnome-terminal gnome-session gnome-shell -gnome-shell-extension-appindicator inputattach -libasound2 -libasound2-plugins libnotify-bin libpulsedsp gdm3 diff --git a/config/desktop/bookworm/environments/mate/config_base/packages b/config/desktop/bookworm/environments/mate/config_base/packages index f5858c5ffd0f..91aeafc79d9e 100644 --- a/config/desktop/bookworm/environments/mate/config_base/packages +++ b/config/desktop/bookworm/environments/mate/config_base/packages @@ -37,7 +37,6 @@ mate-desktop-environment-core mate-desktop-environment-extra mate-desktop-environment-extras mate-dock-applet -mate-equake-applet mate-icon-theme mate-indicator-applet mate-indicator-applet-common diff --git a/config/desktop/common/appgroups/browsers/packages b/config/desktop/common/appgroups/browsers/packages index f99c9a1640d4..6821f1236d30 100644 --- a/config/desktop/common/appgroups/browsers/packages +++ b/config/desktop/common/appgroups/browsers/packages @@ -1 +1,2 @@ chromium-browser +firefox diff --git a/config/desktop/common/environments/budgie/config_base/packages b/config/desktop/common/environments/budgie/config_base/packages index 9aedefd8df4a..269d710701e4 100644 --- a/config/desktop/common/environments/budgie/config_base/packages +++ b/config/desktop/common/environments/budgie/config_base/packages @@ -25,7 +25,6 @@ budgie-kangaroo-applet budgie-keyboard-autoswitch-applet budgie-network-manager-applet budgie-previews -budgie-previews-applet budgie-quickchar budgie-quicknote-applet budgie-recentlyused-applet diff --git a/config/desktop/common/environments/mate/config_base/packages b/config/desktop/common/environments/mate/config_base/packages index 356a951dc222..912e44c9693f 100644 --- a/config/desktop/common/environments/mate/config_base/packages +++ b/config/desktop/common/environments/mate/config_base/packages @@ -106,7 +106,6 @@ mate-desktop-environment-core mate-desktop-environment-extra mate-desktop-environment-extras mate-dock-applet -mate-equake-applet mate-hud mate-icon-theme mate-indicator-applet diff --git a/config/desktop/jammy/environments/kde-neon/support b/config/desktop/jammy/environments/kde-neon/support deleted file mode 120000 index 3c4d1d008a2c..000000000000 --- a/config/desktop/jammy/environments/kde-neon/support +++ /dev/null @@ -1 +0,0 @@ -../../../common/environments/kde-plasma/support \ No newline at end of file diff --git a/config/desktop/jammy/environments/kde-neon/support b/config/desktop/jammy/environments/kde-neon/support new file mode 100644 index 000000000000..bc2264ca197d --- /dev/null +++ b/config/desktop/jammy/environments/kde-neon/support @@ -0,0 +1 @@ +eos diff --git a/config/desktop/jammy/environments/kde-plasma/config_base/packages b/config/desktop/jammy/environments/kde-plasma/config_base/packages index ef8e6d50429e..3068b9c28363 100644 --- a/config/desktop/jammy/environments/kde-plasma/config_base/packages +++ b/config/desktop/jammy/environments/kde-plasma/config_base/packages @@ -37,7 +37,6 @@ foomatic-db-compressed-ppds gdebi ghostscript-x gist -gnome-orca gnome-disk-utility gnome-screenshot gnome-user-docs-de @@ -74,7 +73,6 @@ libatk-adaptor libcvc0 libfont-afm-perl libfontconfig1 -libfontembed1 libfontenc1 libgail-common libgl1-mesa-dri @@ -85,7 +83,6 @@ libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk -libxapp1 libxcursor1 sddm mesa-utils @@ -142,7 +139,6 @@ wswiss x11-apps x11-utils x11-xserver-utils -xapp xapps-common xarchiver xbacklight diff --git a/config/desktop/noble/environments/i3-wm/architectures b/config/desktop/noble/environments/i3-wm/architectures new file mode 100644 index 000000000000..f4ca77356932 --- /dev/null +++ b/config/desktop/noble/environments/i3-wm/architectures @@ -0,0 +1 @@ +armhf, arm64, amd64, riscv64 diff --git a/config/desktop/noble/environments/i3-wm/armbian/create_desktop_package.sh b/config/desktop/noble/environments/i3-wm/armbian/create_desktop_package.sh new file mode 100644 index 000000000000..12f8dca6157b --- /dev/null +++ b/config/desktop/noble/environments/i3-wm/armbian/create_desktop_package.sh @@ -0,0 +1,14 @@ +# install lightdm greeter +cp -R "${SRC}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian + +# install default desktop settings +mkdir -p "${destination}"/etc/skel +cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel + +# install logo for login screen +mkdir -p "${destination}"/usr/share/pixmaps/armbian +cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian + +# install wallpapers +mkdir -p "${destination}"/usr/share/backgrounds/armbian/ +cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/armbian*.jpg "${destination}"/usr/share/backgrounds/armbian/ diff --git a/config/desktop/noble/environments/i3-wm/config_base/packages b/config/desktop/noble/environments/i3-wm/config_base/packages new file mode 100644 index 000000000000..1a8378b3b50b --- /dev/null +++ b/config/desktop/noble/environments/i3-wm/config_base/packages @@ -0,0 +1,154 @@ +anacron +apport-gtk +apt-xapian-index +arandr +blueman +bluez +bluez-cups +bluez-tools +brltty +brltty-x11 +caffeine +cifs-utils +compton +cups +cups-bsd +cups-client +cups-filters +dbus-x11 +dictionaries-common +dmz-cursor-theme +doc-base +dunst +evince +evince-common +feh +fontconfig +fontconfig-config +fonts-arphic-ukai +fonts-arphic-uming +fonts-dejavu-core +fonts-freefont-ttf +fonts-guru +fonts-guru-extra +fonts-khmeros-core +fonts-liberation +fonts-nanum +fonts-opensymbol +fonts-stix +fonts-symbola +fonts-ubuntu +foomatic-db-compressed-ppds +gdebi +ghostscript-x +gir1.2-appindicator3-0.1 +gnome-bluetooth +gnome-disk-utility +gnome-font-viewer +gnome-power-manager +gnome-system-monitor +gromit +gstreamer1.0-packagekit +gstreamer1.0-plugins-base-apps +gstreamer1.0-pulseaudio +gvfs-backends +hplip +i3 +i3lock +i3status +i3-wm +suckless-tools +indicator-printers +inputattach +kerneloops +keyutils +language-pack-en +laptop-detect +libanyevent-i3-perl +libatk-adaptor +libev4 +libfont-afm-perl +libfontconfig1 +libfontenc1 +libgail-common +libgl1-mesa-dri +libgnome-bluetooth13 +libgsettings-qt1 +libjson-xs-perl +libnotify-bin +libproxy1-plugin-gsettings +libproxy1-plugin-networkmanager +libu2f-udev +libwmf0.2-7-gtk +libxcb-cursor0 +libxcursor1 +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +lightdm-settings +lxappearance +mousetweaks +network-manager-openvpn-gnome +network-manager-vpnc +nitrogen +numix-gtk-theme +openprinting-ppds +overlay-scrollbar +overlay-scrollbar-gtk2 +p7zip-full +pamix +pasystray +pavucontrol +pavucontrol-qt +pavumeter +policykit-1 +policykit-1-gnome +policykit-desktop-privileges +printer-driver-all +profile-sync-daemon +pulseaudio-module-bluetooth +redshift +rofi +samba +slick-greeter +smbclient +system-config-printer +software-properties-gtk +speech-dispatcher +spice-vdagent +terminator +thunar +totem +totem-common +totem-plugins +ubuntu-docs +ubuntu-drivers-common +ubuntu-wallpapers +update-inetd +update-manager +update-manager-core +update-notifier +update-notifier-common +vifm +x11-apps +x11-xserver-utils +xarchiver +xbacklight +xcursor-themes +xdg-user-dirs +xdg-user-dirs-gtk +xfonts-100dpi +xfonts-75dpi +xfonts-base +xfonts-encodings +xfonts-scalable +xfonts-utils +xorg-docs +xorg-docs-core +xscreensaver +xserver-xorg +xserver-xorg-video-fbdev +xauth +xtitle +xttitle +xwallpaper diff --git a/config/desktop/noble/environments/i3-wm/debian/postinst b/config/desktop/noble/environments/i3-wm/debian/postinst new file mode 100644 index 000000000000..5eeeaa17ff47 --- /dev/null +++ b/config/desktop/noble/environments/i3-wm/debian/postinst @@ -0,0 +1,41 @@ +# overwrite stock lightdm greeter configuration +if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; 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 +echo "exec_always --no-startup-id feh --bg-scale --zoom fill --no-fehbg /usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg" | tee -a /etc/i3/config + +# lightdm wallpaper +mv /etc/lightdm/slick-greeter.conf /etc/lightdm/slick-greeter.conf.bak +touch /etc/lightdm/slick-greeter.conf +echo "[Greeter] +background=/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg +theme-name = Numix +icon-theme-name = Numix +font-name = Sans 11 +draw-user-background = false +show-keyboard = true +onscreen-keyboard = false +screen-reader = true +draw-grid = true" | tee -a /etc/lightdm/slick-greeter.conf + +echo "Finished preparing /etc/lightdm/slick-greeter.conf..." + +mv /etc/lightdm/lightdm-gtk-greeter.conf /etc/lightdm/lightdm-gtk-greeter.conf.bak +touch /etc/lightdm/lightdm-gtk-greeter.conf +echo "[greeter] +background=/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg +theme-name = Numix +icon-theme-name = Numix +font-name = Sans 11 +draw-user-background = false +show-keyboard = true +onscreen-keyboard = false +screen-reader = true +draw-grid = true" | tee -a /etc/lightdm/lightdm-gtk-greeter.conf + +echo "Finished preparing /etc/lightdm/lightdm-gtk-greeter.conf..." + +slick-greeter -h #applies wallpaper diff --git a/config/desktop/noble/environments/i3-wm/support b/config/desktop/noble/environments/i3-wm/support new file mode 100644 index 000000000000..0b0206d21c91 --- /dev/null +++ b/config/desktop/noble/environments/i3-wm/support @@ -0,0 +1 @@ +supported \ No newline at end of file diff --git a/config/desktop/noble/environments/kde-neon/architectures b/config/desktop/noble/environments/kde-neon/architectures new file mode 120000 index 000000000000..d93144c069b0 --- /dev/null +++ b/config/desktop/noble/environments/kde-neon/architectures @@ -0,0 +1 @@ +../../../common/environments/kde-plasma/architectures \ No newline at end of file diff --git a/config/desktop/noble/environments/kde-neon/armbian b/config/desktop/noble/environments/kde-neon/armbian new file mode 120000 index 000000000000..66eb11f76328 --- /dev/null +++ b/config/desktop/noble/environments/kde-neon/armbian @@ -0,0 +1 @@ +../../../common/environments/kde-plasma/armbian \ No newline at end of file diff --git a/config/desktop/noble/environments/kde-neon/config_base/packages b/config/desktop/noble/environments/kde-neon/config_base/packages new file mode 100644 index 000000000000..713143abaf67 --- /dev/null +++ b/config/desktop/noble/environments/kde-neon/config_base/packages @@ -0,0 +1,10 @@ +neon-desktop +kde-standard +sddm +plasma-nm +plasma-pa +plasma-discover +plasma-vault +scdaemon +kscreen +bluedevil diff --git a/config/desktop/noble/environments/kde-neon/config_base/packages.uninstall b/config/desktop/noble/environments/kde-neon/config_base/packages.uninstall new file mode 120000 index 000000000000..f569eddb09c9 --- /dev/null +++ b/config/desktop/noble/environments/kde-neon/config_base/packages.uninstall @@ -0,0 +1 @@ +../../../../common/environments/kde-plasma/config_base/packages.uninstall \ No newline at end of file diff --git a/config/desktop/noble/environments/kde-neon/debian b/config/desktop/noble/environments/kde-neon/debian new file mode 120000 index 000000000000..1ff8b65acc03 --- /dev/null +++ b/config/desktop/noble/environments/kde-neon/debian @@ -0,0 +1 @@ +../../../common/environments/kde-plasma/debian \ No newline at end of file diff --git a/config/desktop/noble/environments/kde-neon/sources/apt/neon.gpg b/config/desktop/noble/environments/kde-neon/sources/apt/neon.gpg new file mode 100644 index 0000000000000000000000000000000000000000..fe91a10436cb6d0599d7731f2adea22069a4ed63 GIT binary patch literal 1108 zcmV-a1gra*0u2OKbI5c75CEz7)|OqslF_biIeQ7|CZVL=__SR^k(jK5Luvi(fG3D+ zS#^whp>7Av-Y6bPkU(beL5Sk1@lj70bo&&Am1PHY{kCo8Yg_YkAO*+E7*T*gftR_Z zqmC6utIMI4*S-8S`6v#=EhX0qFyQ)^(wapcj-sBRi*7xbqLuBkF7J>`mZ|(~!z!UD!TLTk0-2d{M!ae?k&gzVhEJ?qQx$ z{A3OGEof~~=l%bqo*E{tJJl?eC$ z1a(@M>ayp}IrdX$o^?stJjxzck$-Jt+MLhqp|LuJ_he??8$iE%;o=KNDZ#wA@iH=* zJP#)iIaz*Nz&~B5-lk1?X#k9b=aZN{L7&h2^A}0nn$VmE_QL#(!ho5eOio74qRueE z&TsLC5_<;&YT!Xl;FWQVaO~!L+P3Zs*B=0+!+5Q-rNIPWoPIAIC2@4So|NKY`&zRZH)vu`aH=un~@eo;F)p5*fIFa?nJ>rd164eA@_V;RVofGCwqhXXkUr4Ni+B z@xqX5+8aQ}2oP2L#h(F#sMHyT2Z$Olc|K&U#{koLaNcY`^5rE*c6z8>c49}=2(Yr> aE~KuGi7;J4pa`jAR9>oX%R%U@c}ZwbZW8