Skip to content

Commit

Permalink
Adjust several desktop targets in order to be able to assemble them
Browse files Browse the repository at this point in the history
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
  • Loading branch information
igorpecovnik committed Jun 9, 2024
1 parent d7068fa commit f2d7b2d
Show file tree
Hide file tree
Showing 34 changed files with 239 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions config/desktop/common/appgroups/browsers/packages
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
chromium-browser
firefox
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion config/desktop/jammy/environments/kde-neon/support

This file was deleted.

1 change: 1 addition & 0 deletions config/desktop/jammy/environments/kde-neon/support
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eos
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ foomatic-db-compressed-ppds
gdebi
ghostscript-x
gist
gnome-orca
gnome-disk-utility
gnome-screenshot
gnome-user-docs-de
Expand Down Expand Up @@ -74,7 +73,6 @@ libatk-adaptor
libcvc0
libfont-afm-perl
libfontconfig1
libfontembed1
libfontenc1
libgail-common
libgl1-mesa-dri
Expand All @@ -85,7 +83,6 @@ libproxy1-plugin-gsettings
libproxy1-plugin-networkmanager
libu2f-udev
libwmf0.2-7-gtk
libxapp1
libxcursor1
sddm
mesa-utils
Expand Down Expand Up @@ -142,7 +139,6 @@ wswiss
x11-apps
x11-utils
x11-xserver-utils
xapp
xapps-common
xarchiver
xbacklight
Expand Down
1 change: 1 addition & 0 deletions config/desktop/noble/environments/i3-wm/architectures
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
armhf, arm64, amd64, riscv64
Original file line number Diff line number Diff line change
@@ -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/
154 changes: 154 additions & 0 deletions config/desktop/noble/environments/i3-wm/config_base/packages
Original file line number Diff line number Diff line change
@@ -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
41 changes: 41 additions & 0 deletions config/desktop/noble/environments/i3-wm/debian/postinst
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions config/desktop/noble/environments/i3-wm/support
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
supported
1 change: 1 addition & 0 deletions config/desktop/noble/environments/kde-neon/architectures
1 change: 1 addition & 0 deletions config/desktop/noble/environments/kde-neon/armbian
10 changes: 10 additions & 0 deletions config/desktop/noble/environments/kde-neon/config_base/packages
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
neon-desktop
kde-standard
sddm
plasma-nm
plasma-pa
plasma-discover
plasma-vault
scdaemon
kscreen
bluedevil
1 change: 1 addition & 0 deletions config/desktop/noble/environments/kde-neon/debian
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/neon.gpg] http://archive.neon.kde.org/testing jammy main
1 change: 1 addition & 0 deletions config/desktop/noble/environments/kde-neon/support
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eos
1 change: 1 addition & 0 deletions config/desktop/noble/environments/kde-plasma
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
gpiod
firmware-sof-signed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
iozone3
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
gpiod
mtd-utils
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
iozone3
1 change: 0 additions & 1 deletion config/optional/architectures/armhf/_config/cli/mantic

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
gpiod
#mtd-utils
nocache
1 change: 0 additions & 1 deletion config/optional/architectures/armhf/_config/cli/trixie

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
gpiod
mtd-utils
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
iozone3

0 comments on commit f2d7b2d

Please sign in to comment.