Skip to content

Commit 96274c2

Browse files
committed
targets: set DESKTOP_TIER per block, keyed on DESKTOP_APPGROUPS_SELECTED
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.
1 parent 264b125 commit 96274c2

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

scripts/generate_targets.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,7 @@ def generate_stable_yaml(conf_wip_boards, manual_content=""):
902902
DESKTOP_ENVIRONMENT: "xfce"
903903
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
904904
DESKTOP_APPGROUPS_SELECTED: "programming"
905+
DESKTOP_TIER: "mid"
905906
items:
906907
- *stable-current-slow-hdmi
907908
"""
@@ -927,6 +928,7 @@ def generate_stable_yaml(conf_wip_boards, manual_content=""):
927928
DESKTOP_ENVIRONMENT: "gnome"
928929
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
929930
DESKTOP_APPGROUPS_SELECTED: "programming"
931+
DESKTOP_TIER: "mid"
930932
items:
931933
"""
932934
if current_fast:
@@ -955,6 +957,7 @@ def generate_stable_yaml(conf_wip_boards, manual_content=""):
955957
DESKTOP_ENVIRONMENT: "kde-neon"
956958
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
957959
DESKTOP_APPGROUPS_SELECTED: "programming"
960+
DESKTOP_TIER: "mid"
958961
items:
959962
- *stable-current-fast-hdmi
960963
"""
@@ -980,6 +983,7 @@ def generate_stable_yaml(conf_wip_boards, manual_content=""):
980983
DESKTOP_ENVIRONMENT: "xfce"
981984
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
982985
DESKTOP_APPGROUPS_SELECTED: "programming"
986+
DESKTOP_TIER: "mid"
983987
items:
984988
- *stable-legacy-fast-hdmi
985989
"""
@@ -1001,6 +1005,7 @@ def generate_stable_yaml(conf_wip_boards, manual_content=""):
10011005
DESKTOP_ENVIRONMENT: "xfce"
10021006
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
10031007
DESKTOP_APPGROUPS_SELECTED: ""
1008+
DESKTOP_TIER: "minimal"
10041009
items:
10051010
"""
10061011
if current_riscv64:
@@ -1170,6 +1175,7 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
11701175
DESKTOP_ENVIRONMENT: "gnome"
11711176
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
11721177
DESKTOP_APPGROUPS_SELECTED: ""
1178+
DESKTOP_TIER: "minimal"
11731179
items:
11741180
- *nightly-fast-hdmi
11751181
"""
@@ -1191,6 +1197,7 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
11911197
DESKTOP_ENVIRONMENT: "xfce"
11921198
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
11931199
DESKTOP_APPGROUPS_SELECTED: ""
1200+
DESKTOP_TIER: "minimal"
11941201
items:
11951202
- *nightly-slow-hdmi
11961203
"""
@@ -1212,6 +1219,7 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
12121219
DESKTOP_ENVIRONMENT: "xfce"
12131220
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
12141221
DESKTOP_APPGROUPS_SELECTED: ""
1222+
DESKTOP_TIER: "minimal"
12151223
items:
12161224
- *nightly-riscv64
12171225
"""
@@ -1453,6 +1461,7 @@ def generate_community_yaml(csc_tvb_boards, manual_content=""):
14531461
DESKTOP_ENVIRONMENT: "gnome"
14541462
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
14551463
DESKTOP_APPGROUPS_SELECTED: ""
1464+
DESKTOP_TIER: "minimal"
14561465
items:
14571466
- *community-current-fast-hdmi
14581467
"""
@@ -1478,6 +1487,7 @@ def generate_community_yaml(csc_tvb_boards, manual_content=""):
14781487
DESKTOP_ENVIRONMENT: "kde-neon"
14791488
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
14801489
DESKTOP_APPGROUPS_SELECTED: ""
1490+
DESKTOP_TIER: "minimal"
14811491
items:
14821492
- *community-current-fast-hdmi
14831493
"""
@@ -1503,6 +1513,7 @@ def generate_community_yaml(csc_tvb_boards, manual_content=""):
15031513
DESKTOP_ENVIRONMENT: "xfce"
15041514
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
15051515
DESKTOP_APPGROUPS_SELECTED: ""
1516+
DESKTOP_TIER: "minimal"
15061517
items:
15071518
"""
15081519
if current_slow:
@@ -1529,6 +1540,7 @@ def generate_community_yaml(csc_tvb_boards, manual_content=""):
15291540
DESKTOP_ENVIRONMENT: "xfce"
15301541
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
15311542
DESKTOP_APPGROUPS_SELECTED: ""
1543+
DESKTOP_TIER: "minimal"
15321544
items:
15331545
"""
15341546
if current_riscv64:

0 commit comments

Comments
 (0)