Skip to content

Commit bda6655

Browse files
committed
desktops: replace legacy machinery with armbian-config module_desktops
Replace the entire build-time desktop machinery with a single armbian-config call in the chroot. Desktop packages, branding, repos, apt pins, and manifests are now owned by configng's YAML-driven module_desktops pipeline. Deleted (~10,400 lines): config/desktop/ 229 files — per-release × per-DE package lists, postinst scripts, appgroups artifact-armbian-desktop.sh, artifact-armbian-bsp-desktop.sh armbian-desktop-deb.sh, armbian-bsp-desktop-deb.sh rootfs-desktop.sh New build variable DESKTOP_TIER (minimal/mid/full) replaces both DESKTOP_ENVIRONMENT_CONFIG_NAME and DESKTOP_APPGROUPS_SELECTED. Interactive DE selection clones configng via fetch_from_repo and queries the standalone Python parser on the host (no root needed): parse_desktop_yaml.py <yaml_dir> --list-json <release> <arch> Desktop install in distro-agnostic.sh (after armbian-bsp-cli): chroot_sdcard "SUDO_USER= DEBIAN_FRONTEND=noninteractive \ DIALOG=read armbian-config --api module_desktops install \ de=$DE tier=$TIER mode=build" mode=build skips user-dependent steps (getuser, group membership, skel propagation, DM start/autologin) since no real user exists at image-build time — armbian-firstrun handles those on first boot. Cleanup across 17 files: artifacts registry, aggregation pipeline, Python aggregation tools, CLI commands, action.yml, templates, library-functions.sh source lines, rootfs-create.sh package block, rootfs cache hash (DESKTOP_TIER replaces deleted vars).
1 parent 8081847 commit bda6655

File tree

348 files changed

+162
-10728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

348 files changed

+162
-10728
lines changed

action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ runs:
185185
BUILD_DESKTOP="yes"
186186
BUILD_MINIMAL="no"
187187
DESKTOP_ENVIRONMENT="${{ inputs.armbian_ui }}"
188-
DESKTOP_APPGROUPS_SELECTED=""
189-
DESKTOP_ENVIRONMENT_CONFIG_NAME="config_base"
188+
DESKTOP_TIER="mid"
190189
fi
191190
192191
# go to build folder
@@ -206,8 +205,7 @@ runs:
206205
BUILD_DESKTOP="${BUILD_DESKTOP}" \
207206
BUILD_MINIMAL="${BUILD_MINIMAL}" \
208207
DESKTOP_ENVIRONMENT="${DESKTOP_ENVIRONMENT}" \
209-
DESKTOP_APPGROUPS_SELECTED="${DESKTOP_APPGROUPS_SELECTED}" \
210-
DESKTOP_ENVIRONMENT_CONFIG_NAME="${DESKTOP_ENVIRONMENT_CONFIG_NAME}" \
208+
DESKTOP_TIER="${DESKTOP_TIER}" \
211209
ENABLE_EXTENSIONS="${{ inputs.armbian_extensions }}" \
212210
COMPRESS_OUTPUTIMAGE="${{ inputs.armbian_compress }}" \
213211
SHARE_LOG="yes" \

config/desktop/README.md

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

config/desktop/_all_distributions/appgroups/programming/packages

Lines changed: 0 additions & 1 deletion
This file was deleted.
Binary file not shown.

config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli.source

Lines changed: 0 additions & 1 deletion
This file was deleted.

config/desktop/bookworm/appgroups/browsers/armbian/create_desktop_package.sh

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

config/desktop/bookworm/appgroups/browsers/debian/postinst

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

config/desktop/bookworm/appgroups/browsers/packages

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

config/desktop/bookworm/appgroups/chat

Lines changed: 0 additions & 1 deletion
This file was deleted.

config/desktop/bookworm/appgroups/desktop_tools

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)