desktops: drop plucky and questing release blocks

tools/modules/desktops/scripts/parse_desktop_yaml.py

@@ -177,23 +177,29 @@ def _apply_tier_overrides(packages, source, tier, release, arch):
         <tier>:
           architectures:
             <arch>:
+              packages: [...]          # add on this arch in any release
               packages_remove: [...]   # remove on this arch in any release
           releases:
             <release>:
               architectures:
                 <arch>:
+                  packages: [...]          # add on this release+arch combo
                   packages_remove: [...]   # remove on this release+arch combo
 
     Both layers are applied. Use the per-arch layer for permanent
-    arch-wide holes (e.g. blender always missing on armhf), and the
-    per-release-per-arch layer for transient holes (e.g. loupe missing
-    on bookworm because GNOME 43 didn't have it).
+    arch-wide additions/holes (e.g. google-chrome-stable always on
+    amd64, blender always missing on armhf), and the per-release-per-
+    arch layer for transient differences (e.g. loupe missing on
+    bookworm because GNOME 43 didn't have it).
     """
     tier_block = _as_dict(_as_dict(source.get("tier_overrides")).get(tier))
 
     # Per-arch (any release) layer.
     archs = _as_dict(tier_block.get("architectures"))
     arch_block = _as_dict(archs.get(arch))
+    for pkg in _as_list(arch_block.get("packages")):
+        if pkg not in packages:
+            packages.append(pkg)
     for pkg in _as_list(arch_block.get("packages_remove")):
         if pkg in packages:
             packages.remove(pkg)
@@ -203,6 +209,9 @@ def _apply_tier_overrides(packages, source, tier, release, arch):
     release_block = _as_dict(releases.get(release))
     release_archs = _as_dict(release_block.get("architectures"))
     release_arch_block = _as_dict(release_archs.get(arch))
+    for pkg in _as_list(release_arch_block.get("packages")):
+        if pkg not in packages:
+            packages.append(pkg)
     for pkg in _as_list(release_arch_block.get("packages_remove")):
         if pkg in packages:
             packages.remove(pkg)

tools/modules/desktops/yaml/budgie.yaml

@@ -56,5 +56,3 @@ releases:
   noble:
     architectures: [arm64, amd64]
 
-  plucky:
-    architectures: [arm64, amd64]

tools/modules/desktops/yaml/cinnamon.yaml

@@ -66,19 +66,6 @@ releases:
     packages_uninstall:
       - ubuntu-session
 
-  plucky:
-    architectures: [arm64, amd64, riscv64]
-    packages:
-      - polkitd
-      - pkexec
-      - libu2f-udev
-    packages_remove:
-      - pavumeter
-    packages_uninstall:
-      - ubuntu-session
-
-  # ── Debian 14 / Debian Sid ─────────────────────────────────────────
-
   forky:
     # Debian 14 — pipewire replaces pulseaudio (same as trixie).
     # armhf excluded: cinnamon-desktop-environment has no armhf build.
@@ -120,19 +107,6 @@ releases:
     packages_uninstall:
       - ubuntu-session
 
-  questing:
-    # Ubuntu 25.10 — same as plucky; pavumeter absent from archive.
-    architectures: [arm64, amd64, riscv64]
-    packages:
-      - polkitd
-      - pkexec
-      - libu2f-udev
-    packages_remove:
-      # pavumeter was dropped from Ubuntu in plucky and stays absent.
-      - pavumeter
-    packages_uninstall:
-      - ubuntu-session
-
   resolute:
     # Ubuntu 26.04 LTS — same as questing; pavumeter still absent.
     architectures: [arm64, amd64, riscv64]

tools/modules/desktops/yaml/common.yaml

@@ -46,6 +46,7 @@ tiers:
       - vlc                  # media player
       - file-roller          # archive manager
       - transmission-gtk     # torrent client
+      - armbian-imager       # SD-card image flasher (from apt.armbian.com)
 
   full:
     packages:
@@ -55,6 +56,7 @@ tiers:
       - inkscape
       - thunderbird
       - audacity
+      - code                  # vscode (from apt.armbian.com)
 
 # Browser substitution table for the literal `browser` token in any
 # tier. The parser replaces `browser` with the right package per
@@ -74,68 +76,53 @@ tiers:
 #   - Debian has 'firefox-esr' but NO 'firefox' package.
 #   - Ubuntu's 'chromium' .deb is a snap-shim wrapper that pulls in
 #     snapd. Armbian doesn't ship snapd, so the shim is broken at
-#     runtime — substitute a real GTK browser instead.
-#     epiphany-browser (GNOME Web) is small, native deb, and
-#     available on every Ubuntu arch.
+#     runtime — apt.armbian.com hosts real .debs (chromium, firefox,
+#     google-chrome-stable) used in this map instead.
+#   - amd64 always gets google-chrome-stable (Google publishes no
+#     arm/riscv builds, so this is amd64-only).
 #   - 'chromium' isn't built for riscv64 in either Debian or Ubuntu.
 #
-# Verified against Debian bookworm/trixie and Ubuntu noble/plucky as
-# of 2026-04. Update this map when new releases ship or when an
-# arch dependency changes.
+# Verified against Debian bookworm/trixie, Ubuntu jammy/noble/resolute,
+# and apt.armbian.com as of 2026-04. Update this map when new releases
+# ship or when an arch dependency changes.
 browser:
   bookworm:
-    amd64:   chromium
+    amd64:   google-chrome-stable
     arm64:   chromium
     armhf:   chromium
     # bookworm has no riscv64 port — no entry needed
   trixie:
-    amd64:   chromium
+    amd64:   google-chrome-stable
     arm64:   chromium
     armhf:   chromium
     riscv64: firefox-esr     # 'firefox' does not exist in Debian
   noble:
-    amd64:   epiphany-browser    # 'chromium' deb is a snap-shim
-    arm64:   epiphany-browser
-    armhf:   epiphany-browser
-    riscv64: epiphany-browser    # 'chromium'/'firefox' both missing
-  plucky:
-    amd64:   epiphany-browser
-    arm64:   epiphany-browser
-    armhf:   epiphany-browser
-    riscv64: epiphany-browser
+    amd64:   google-chrome-stable
+    arm64:   chromium        # apt.armbian.com real .deb (Ubuntu's is snap-shim)
+    armhf:   chromium
+    riscv64: firefox          # apt.armbian.com real .deb
   jammy:
-    # Ubuntu 22.04 LTS — same snap-shim situation as noble; the
-    # 'chromium' deb just invokes snapd which Armbian doesn't ship.
-    # epiphany-browser is a real native deb available on all arches.
-    amd64:   epiphany-browser
-    arm64:   epiphany-browser
-    armhf:   epiphany-browser
-    riscv64: epiphany-browser
-  questing:
-    # Ubuntu 25.10 — same snap-shim situation as noble/plucky.
-    amd64:   epiphany-browser
-    arm64:   epiphany-browser
-    armhf:   epiphany-browser
-    riscv64: epiphany-browser
+    # Ubuntu 22.04 LTS — chromium / firefox apt names on Ubuntu are
+    # snap-shims; apt.armbian.com hosts real .debs of the same name.
+    amd64:   google-chrome-stable
+    arm64:   chromium
+    armhf:   chromium
+    riscv64: firefox
   resolute:
-    # Ubuntu 26.04 LTS — same snap-shim situation as noble/plucky.
-    amd64:   epiphany-browser
-    arm64:   epiphany-browser
-    armhf:   epiphany-browser
-    riscv64: epiphany-browser
+    # Ubuntu 26.04 LTS
+    amd64:   google-chrome-stable
+    arm64:   chromium
+    armhf:   chromium
+    riscv64: firefox
   forky:
-    # Debian 14 — same rules as trixie: 'firefox' is not a Debian
-    # package, only 'firefox-esr' exists; chromium is available for
-    # the three tier-1 arches.
-    amd64:   chromium
+    # Debian 14 — same rules as trixie.
+    amd64:   google-chrome-stable
     arm64:   chromium
     armhf:   chromium
     riscv64: firefox-esr     # 'firefox' does not exist in Debian
   sid:
     # Debian unstable — same rules as trixie/forky.
-    # loong64 gets firefox-esr because chromium is not yet built for
-    # this architecture in the Debian archive.
-    amd64:   chromium
+    amd64:   google-chrome-stable
     arm64:   chromium
     armhf:   chromium
     riscv64: firefox-esr     # 'firefox' does not exist in Debian
@@ -201,11 +188,6 @@ tier_overrides:
           amd64:  { packages_remove: [loupe] }
           arm64:  { packages_remove: [loupe] }
           armhf:  { packages_remove: [loupe] }
-      plucky:
-        # loupe in plucky was dropped on armhf (GNOME 48 didn't ship
-        # an armhf build for it). Other arches still have it.
-        architectures:
-          armhf:  { packages_remove: [loupe] }
       jammy:
         # loupe was introduced with GNOME 44/45; Ubuntu 22.04 (jammy)
         # shipped GNOME 42 and has no loupe package on any arch.
@@ -214,16 +196,16 @@ tier_overrides:
           arm64:    { packages_remove: [loupe] }
           armhf:    { packages_remove: [loupe] }
           riscv64:  { packages_remove: [loupe] }
-      questing:
-        # loupe on armhf continues to be absent in questing — no GNOME
-        # armhf build for loupe, same gap as plucky.
-        architectures:
-          armhf:  { packages_remove: [loupe] }
       resolute:
-        # Same loupe/armhf gap as questing.
+        # loupe/armhf still missing — no GNOME armhf build.
         architectures:
           armhf:  { packages_remove: [loupe] }
   full:
+    # `code` (Microsoft VSCode) is published for amd64/arm64/armhf only —
+    # no riscv64 build exists upstream. Strip arch-wide.
+    architectures:
+      riscv64:
+        packages_remove: [code]
     releases:
       bookworm:
         # thunderbird is missing on bookworm/armhf.
@@ -234,42 +216,20 @@ tier_overrides:
         architectures:
           armhf:  { packages_remove: [thunderbird] }
       noble:
-        # thunderbird on Ubuntu is a snap-shim that only exists on
-        # amd64/arm64; the deb is missing on armhf and riscv64.
-        # We strip it on EVERY arch on Ubuntu because the shim
-        # requires snapd which Armbian doesn't ship.
-        architectures:
-          amd64:    { packages_remove: [thunderbird] }
-          arm64:    { packages_remove: [thunderbird] }
-          armhf:    { packages_remove: [thunderbird] }
-          riscv64:  { packages_remove: [thunderbird] }
-      plucky:
+        # Ubuntu's thunderbird .deb on amd64/arm64 is a snap-shim
+        # wrapper, but apt.armbian.com hosts a real thunderbird .deb
+        # for those arches that wins by version. armhf and riscv64
+        # have no upstream Ubuntu deb at all and we don't (yet) ship
+        # them via apt.armbian.com — strip on those arches only.
         architectures:
-          amd64:    { packages_remove: [thunderbird] }
-          arm64:    { packages_remove: [thunderbird] }
           armhf:    { packages_remove: [thunderbird] }
           riscv64:  { packages_remove: [thunderbird] }
       jammy:
-        # thunderbird on Ubuntu 22.04 (jammy) was migrated to a
-        # snap-shim deb; Armbian doesn't ship snapd so the shim is
-        # broken at runtime. Strip it on all arches, same as noble/plucky.
         architectures:
-          amd64:    { packages_remove: [thunderbird] }
-          arm64:    { packages_remove: [thunderbird] }
-          armhf:    { packages_remove: [thunderbird] }
-          riscv64:  { packages_remove: [thunderbird] }
-      questing:
-        # Same snap-shim situation as noble/plucky.
-        architectures:
-          amd64:    { packages_remove: [thunderbird] }
-          arm64:    { packages_remove: [thunderbird] }
           armhf:    { packages_remove: [thunderbird] }
           riscv64:  { packages_remove: [thunderbird] }
       resolute:
-        # Same snap-shim situation as noble/plucky.
         architectures:
-          amd64:    { packages_remove: [thunderbird] }
-          arm64:    { packages_remove: [thunderbird] }
           armhf:    { packages_remove: [thunderbird] }
           riscv64:  { packages_remove: [thunderbird] }
       forky:
@@ -279,5 +239,10 @@ tier_overrides:
           armhf:    { packages_remove: [thunderbird] }
       sid:
         # thunderbird is missing on sid/armhf — same gap as trixie/forky.
+        # `code` is not tracked for sid in apt.armbian.com (Debian unstable;
+        # vendor debs may break) — strip on every sid arch.
         architectures:
-          armhf:    { packages_remove: [thunderbird] }
+          amd64:    { packages_remove: [code] }
+          arm64:    { packages_remove: [code] }
+          armhf:    { packages_remove: [code, thunderbird] }
+          riscv64:  { packages_remove: [code] }

tools/modules/desktops/yaml/deepin.yaml

@@ -53,5 +53,3 @@ releases:
   noble:
     architectures: [arm64, amd64]
 
-  plucky:
-    architectures: [arm64, amd64]

tools/modules/desktops/yaml/enlightenment.yaml

@@ -47,15 +47,6 @@ releases:
       - pkexec
       - libu2f-udev
 
-  plucky:
-    architectures: [arm64, amd64, armhf, riscv64]
-    packages:
-      - polkitd
-      - pkexec
-      - libu2f-udev
-
-  # ── Debian 14 / Debian Sid ─────────────────────────────────────────
-
   forky:
     # Debian 14 — pipewire replaces pulseaudio (same as trixie).
     architectures: [arm64, amd64, armhf, riscv64]
@@ -94,14 +85,6 @@ releases:
       - pkexec
       - libu2f-udev
 
-  questing:
-    # Ubuntu 25.10 — same as plucky.
-    architectures: [arm64, amd64, armhf, riscv64]
-    packages:
-      - polkitd
-      - pkexec
-      - libu2f-udev
-
   resolute:
     # Ubuntu 26.04 LTS — same as questing.
     architectures: [arm64, amd64, armhf, riscv64]

tools/modules/desktops/yaml/gnome.yaml

@@ -86,19 +86,6 @@ releases:
     packages_uninstall:
       - ubuntu-session
 
-  plucky:
-    architectures: [arm64, amd64]
-    packages:
-      - polkitd
-      - pkexec
-      - libu2f-udev
-    packages_remove:
-      - pavumeter
-    packages_uninstall:
-      - ubuntu-session
-
-  # ── Debian 14 / Debian Sid ─────────────────────────────────────────
-
   forky:
     # Debian 14 — pipewire replaces pulseaudio (same as trixie).
     architectures: [arm64, amd64]
@@ -139,19 +126,6 @@ releases:
     packages_uninstall:
       - ubuntu-session
 
-  questing:
-    # Ubuntu 25.10 — same as plucky; pavumeter absent from archive.
-    architectures: [arm64, amd64]
-    packages:
-      - polkitd
-      - pkexec
-      - libu2f-udev
-    packages_remove:
-      # pavumeter was dropped from Ubuntu in plucky and stays absent.
-      - pavumeter
-    packages_uninstall:
-      - ubuntu-session
-
   resolute:
     # Ubuntu 26.04 LTS — same as questing; pavumeter still absent.
     architectures: [arm64, amd64]