Skip to content

Commit c045b96

Browse files
committed
Move desktop install method to APA
https://github.com/armbian/apa
1 parent cd6c94f commit c045b96

File tree

4 files changed

+15
-352
lines changed

4 files changed

+15
-352
lines changed

tests/xfce_desktop.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ENABLED=false
2-
RELEASE="bookworm:jammy:noble"
1+
ENABLED=true
2+
RELEASE="bookworm:noble"
33
TESTNAME="XFCE"
44

55
testcase() {(

tools/json/config.software.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
{
335335
"id": "Desktops",
336336
"description": "Desktop Environments",
337-
"status": "Disabled",
337+
"status": "Enabled",
338338
"sub": [
339339
{
340340
"id": "XFCE",

tools/modules/system/module_desktop.sh

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,39 +32,24 @@ function module_desktop() {
3232
local commands
3333
IFS=' ' read -r -a commands <<< "${module_options["module_desktop,example"]}"
3434

35-
# generate and install packages
36-
module_desktop_packages "$de" "$DISTROID"
37-
3835
case "$1" in
3936
"${commands[0]}")
4037

38+
# Add APA development repository - this will be moved to main repo once it gets out of testing phase
39+
rm /etc/apt/sources.list.d/armbian-apa.list
40+
tee /etc/apt/sources.list.d/armbian-apa.sources > /dev/null <<- 'EOT'
41+
Types: deb
42+
URIs: https://github.armbian.com/apa
43+
Suites: current
44+
Components: main
45+
Signed-By: /usr/share/keyrings/armbian.gpg
46+
EOT
47+
4148
# update package list
4249
pkg_update
4350

44-
# desktops has different default login managers
45-
case "$de" in
46-
gnome)
47-
echo "/usr/sbin/gdm3" > /etc/X11/default-display-manager
48-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES}
49-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES_UNINSTALL}
50-
pkg_install -o Dpkg::Options::="--force-confold" gdm3
51-
;;
52-
kde-neon)
53-
echo "/usr/sbin/sddm" > /etc/X11/default-display-manager
54-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES}
55-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES_UNINSTALL}
56-
pkg_install -o Dpkg::Options::="--force-confold" kde-standard
57-
;;
58-
*)
59-
echo "/usr/sbin/lightdm" > /etc/X11/default-display-manager
60-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES}
61-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES_UNINSTALL}
62-
pkg_install -o Dpkg::Options::="--force-confold" lightdm
63-
;;
64-
esac
65-
66-
# install desktop
67-
pkg_install -o Dpkg::Options::="--force-confold" armbian-${DISTROID}-desktop-${de}
51+
# Install desktop package
52+
pkg_install armbian-desktop-${de}
6853

6954
# add user to groups
7055
for additionalgroup in sudo netdev audio video dialout plugdev input bluetooth systemd-journal ssh; do

tools/modules/system/module_desktop_packages.sh

Lines changed: 0 additions & 322 deletions
This file was deleted.

0 commit comments

Comments
 (0)