targets: set DESKTOP_TIER per desktop block, keyed on DESKTOP_APPGROUPS_SELECTED#288
Merged
igorpecovnik merged 1 commit intomainfrom Apr 21, 2026
Merged
targets: set DESKTOP_TIER per desktop block, keyed on DESKTOP_APPGROUPS_SELECTED#288igorpecovnik merged 1 commit intomainfrom
igorpecovnik merged 1 commit intomainfrom
Conversation
Contributor
WalkthroughThe script Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
armbian-config's module_desktops treats minimal / mid / full as three distinct install targets. The build framework hard-requires an explicit DESKTOP_TIER whenever BUILD_DESKTOP=yes; a missing value causes 'module_desktops install' to bail at config-validation time. generate_targets.py emits 12 'desktop-*' target blocks across the stable / legacy / edge / nightly flavours. None of them set DESKTOP_TIER today, so every regenerated targets.yaml will start failing desktop builds once the build-side migration (armbian/build#9683 — replace config/desktop/ tree with armbian-config module_desktops) lands. Map tier from the existing DESKTOP_APPGROUPS_SELECTED value that each block already carries: DESKTOP_APPGROUPS_SELECTED='' → DESKTOP_TIER='minimal' 8 blocks: plain DE + display manager, ~500 MB. Matches the bare desktop the empty-appgroup target produced before. DESKTOP_APPGROUPS_SELECTED='programming' → DESKTOP_TIER='mid' 4 blocks: DE + browser + everyday user-facing tools (editor, calculator, media, archive, torrent), ~1 GB. Roughly what the 'programming' appgroup pulled in on top of the bare desktop. Neither maps to 'full' — none of the current generate_targets.py blocks wanted the full tier (office suite + creative tools, ~2.5 GB). Future targets can override per block when needed.
40f09dd to
96274c2
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
armbian-config's
module_desktopstreatsminimal/mid/fullas three distinct install targets. The build framework hard-requires an explicitDESKTOP_TIERwheneverBUILD_DESKTOP=yes; a missing value causesmodule_desktops installto bail at config-validation time.scripts/generate_targets.pyemits 12desktop-*target blocks across the stable / legacy / edge / nightly flavours. None of them setDESKTOP_TIERtoday, so every regeneratedtargets.yamlwill start failing desktop builds once the build-side migration (armbian/build#9683 — replaceconfig/desktop/tree with armbian-configmodule_desktops) lands.Change
Add
DESKTOP_TIERto everydesktop-*block'svars:stanza, mapping the value from the existingDESKTOP_APPGROUPS_SELECTEDthat each block already carries:DESKTOP_APPGROUPS_SELECTEDDESKTOP_TIER""(empty)minimal"programming"midprogrammingappgroup pulled in on top of the bare desktopNeither maps to
full— none of the current generate_targets.py blocks wanted the full tier (office suite + creative tools, ~2.5 GB). Future targets can override per block when needed.Diff shape
BUILD_DESKTOP: "yes" DESKTOP_ENVIRONMENT: "xfce" DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base" DESKTOP_APPGROUPS_SELECTED: "" + DESKTOP_TIER: "minimal" items:BUILD_DESKTOP: "yes" DESKTOP_ENVIRONMENT: "xfce" DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base" DESKTOP_APPGROUPS_SELECTED: "programming" + DESKTOP_TIER: "mid" items:12 single-line insertions total; no structural edits.
Test plan
python3 -c "import ast; ast.parse(open('scripts/generate_targets.py').read())"— syntax clean.SystemExit/ import-time errors)."minimal"+ 4"mid"insertions, each directly below a matchingDESKTOP_APPGROUPS_SELECTEDline — no mis-pairings.targets.yamllocally and confirm everydesktop-*target carries the rightDESKTOP_TIER.module_desktops installaccepts the generated targets (needs desktops: migrate from config/desktop/ tree to armbian-config module_desktops build#9683 to be live).