Skip to content

Commit 8a4bb1a

Browse files
committed
Add KDE Neon and RISC-V XFCE desktop targets, simplify desktop app groups
- Add KDE Neon desktop builds for fast HDMI boards in stable and community releases - Add XFCE desktop for RISC-V boards in standard support - Remove 'browsers' from DESKTOP_APPGROUPS_SELECTED, keep only 'programming' - Update exposed.map to include KDE Neon patterns for fast boards - Remove manual KDE Neon UEFI target (now generated) Signed-off-by: Igor Pecovnik <igor@armbian.com>
1 parent 5b4de81 commit 8a4bb1a

File tree

2 files changed

+89
-32
lines changed

2 files changed

+89
-32
lines changed

release-targets/targets-release-standard-support.manual

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,3 @@ desktop-stable-ubuntu-cinnamon-uefi:
7474
items:
7575
- { BOARD: uefi-arm64, BRANCH: current, ENABLE_EXTENSIONS: "v4l2loopback-dkms,mesa-vpu" }
7676
- { BOARD: uefi-x86, BRANCH: current, ENABLE_EXTENSIONS: "v4l2loopback-dkms,mesa-vpu,nvidia" }
77-
78-
79-
# Ubuntu noble KDE Neon desktop - UEFI only
80-
desktop-stable-ubuntu-kdeneon-uefi:
81-
enabled: yes
82-
configs: [ armbian-images ]
83-
pipeline:
84-
gha: *armbian-gha
85-
build-image: "yes"
86-
vars:
87-
RELEASE: noble
88-
BUILD_MINIMAL: "no"
89-
BUILD_DESKTOP: "yes"
90-
DESKTOP_ENVIRONMENT: "kde-neon"
91-
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
92-
DESKTOP_APPGROUPS_SELECTED: "browsers,programming"
93-
items:
94-
- { BOARD: uefi-arm64, BRANCH: current, ENABLE_EXTENSIONS: "v4l2loopback-dkms,mesa-vpu" }
95-
- { BOARD: uefi-x86, BRANCH: current, ENABLE_EXTENSIONS: "v4l2loopback-dkms,mesa-vpu,nvidia" }

scripts/generate_targets.py

Lines changed: 89 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ def generate_stable_yaml(conf_wip_boards, manual_content=""):
654654
BUILD_DESKTOP: "yes"
655655
DESKTOP_ENVIRONMENT: "xfce"
656656
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
657-
DESKTOP_APPGROUPS_SELECTED: "browsers,programming"
657+
DESKTOP_APPGROUPS_SELECTED: "programming"
658658
items:
659659
- *stable-current-slow-hdmi
660660
"""
@@ -677,19 +677,66 @@ def generate_stable_yaml(conf_wip_boards, manual_content=""):
677677
BUILD_DESKTOP: "yes"
678678
DESKTOP_ENVIRONMENT: "gnome"
679679
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
680-
DESKTOP_APPGROUPS_SELECTED: "browsers,programming"
680+
DESKTOP_APPGROUPS_SELECTED: "programming"
681+
items:
682+
- *stable-current-fast-hdmi
683+
"""
684+
if vendor_fast:
685+
yaml += ' - *stable-vendor-fast-hdmi\n'
686+
687+
# Ubuntu stable KDE Neon desktop (fast HDMI only)
688+
if current_fast:
689+
yaml += """
690+
# Ubuntu stable KDE Neon desktop (fast HDMI only)
691+
desktop-stable-ubuntu-kde-neon:
692+
enabled: yes
693+
configs: [ armbian-images ]
694+
pipeline:
695+
gha: *armbian-gha
696+
build-image: "yes"
697+
vars:
698+
RELEASE: noble
699+
BUILD_MINIMAL: "no"
700+
BUILD_DESKTOP: "yes"
701+
DESKTOP_ENVIRONMENT: "kde-neon"
702+
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
703+
DESKTOP_APPGROUPS_SELECTED: "programming"
681704
items:
682705
- *stable-current-fast-hdmi
683706
"""
684707
if vendor_fast:
685708
yaml += ' - *stable-vendor-fast-hdmi\n'
686709

710+
# Ubuntu stable XFCE desktop for RISC-V boards
711+
if current_riscv64 or vendor_riscv64:
712+
yaml += """
713+
# Ubuntu stable XFCE desktop for RISC-V boards
714+
desktop-stable-ubuntu-riscv64-xfce:
715+
enabled: yes
716+
configs: [ armbian-images ]
717+
pipeline:
718+
gha: *armbian-gha
719+
build-image: "yes"
720+
vars:
721+
RELEASE: noble
722+
BUILD_MINIMAL: "no"
723+
BUILD_DESKTOP: "yes"
724+
DESKTOP_ENVIRONMENT: "xfce"
725+
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
726+
DESKTOP_APPGROUPS_SELECTED: ""
727+
items:
728+
"""
729+
if current_riscv64:
730+
yaml += ' - *stable-current-riscv64\n'
731+
if vendor_riscv64:
732+
yaml += ' - *stable-vendor-riscv64\n'
733+
687734
if manual_content:
688735
# Indent manual content by 2 spaces to be under targets:
689736
indented_manual = '\n'.join(' ' + line if line.strip() else line for line in manual_content.split('\n'))
690737
yaml += '\n' + indented_manual
691738

692-
# Add riscv64 target if any riscv64 boards exist
739+
# Add riscv64 minimal target if any riscv64 boards exist
693740
if current_riscv64 or vendor_riscv64:
694741
yaml += """
695742
# Ubuntu stable minimal - RISC-V
@@ -837,7 +884,7 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
837884
BUILD_DESKTOP: "yes"
838885
DESKTOP_ENVIRONMENT: "gnome"
839886
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
840-
DESKTOP_APPGROUPS_SELECTED: "browsers,programming"
887+
DESKTOP_APPGROUPS_SELECTED: "programming"
841888
items:
842889
- *nightly-fast-hdmi
843890
"""
@@ -858,7 +905,7 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
858905
BUILD_DESKTOP: "yes"
859906
DESKTOP_ENVIRONMENT: "xfce"
860907
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
861-
DESKTOP_APPGROUPS_SELECTED: "browsers,programming"
908+
DESKTOP_APPGROUPS_SELECTED: "programming"
862909
items:
863910
- *nightly-slow-hdmi
864911
"""
@@ -1114,7 +1161,7 @@ def generate_community_yaml(csc_tvb_boards, manual_content=""):
11141161
BUILD_DESKTOP: "yes"
11151162
DESKTOP_ENVIRONMENT: "gnome"
11161163
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
1117-
DESKTOP_APPGROUPS_SELECTED: "browsers,programming"
1164+
DESKTOP_APPGROUPS_SELECTED: "programming"
11181165
items:
11191166
- *community-current-fast-hdmi
11201167
"""
@@ -1123,6 +1170,31 @@ def generate_community_yaml(csc_tvb_boards, manual_content=""):
11231170
if edge_fast:
11241171
yaml += ' - *community-edge-fast-hdmi\n'
11251172

1173+
# Ubuntu noble KDE Neon desktop for fast HDMI community boards
1174+
if current_fast or vendor_fast or edge_fast:
1175+
yaml += """
1176+
# Ubuntu noble KDE Neon desktop for fast HDMI community boards
1177+
community-noble-kde-neon:
1178+
enabled: yes
1179+
configs: [ armbian-community ]
1180+
pipeline:
1181+
gha: *armbian-gha
1182+
build-image: "yes"
1183+
vars:
1184+
RELEASE: noble
1185+
BUILD_MINIMAL: "no"
1186+
BUILD_DESKTOP: "yes"
1187+
DESKTOP_ENVIRONMENT: "kde-neon"
1188+
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
1189+
DESKTOP_APPGROUPS_SELECTED: "programming"
1190+
items:
1191+
- *community-current-fast-hdmi
1192+
"""
1193+
if vendor_fast:
1194+
yaml += ' - *community-vendor-fast-hdmi\n'
1195+
if edge_fast:
1196+
yaml += ' - *community-edge-fast-hdmi\n'
1197+
11261198
# Ubuntu noble XFCE desktop for slow HDMI community boards
11271199
if current_slow or vendor_slow or edge_slow:
11281200
yaml += """
@@ -1139,7 +1211,7 @@ def generate_community_yaml(csc_tvb_boards, manual_content=""):
11391211
BUILD_DESKTOP: "yes"
11401212
DESKTOP_ENVIRONMENT: "xfce"
11411213
DESKTOP_ENVIRONMENT_CONFIG_NAME: "config_base"
1142-
DESKTOP_APPGROUPS_SELECTED: "browsers,programming"
1214+
DESKTOP_APPGROUPS_SELECTED: "programming"
11431215
items:
11441216
"""
11451217
if current_slow:
@@ -1295,14 +1367,18 @@ def generate_exposed_map(conf_wip_boards, csc_tvb_boards=None):
12951367
if board_has_video and is_fast is not None:
12961368
# Determine desktop type based on hardware speed
12971369
if is_fast is True:
1298-
desktop_type = 'gnome_desktop'
1370+
# Fast boards get both GNOME and KDE Neon desktop patterns
1371+
for desktop_type in ['gnome_desktop', 'kde-neon_desktop']:
1372+
desktop_pattern = f"{dir_prefix}Armbian_{community_prefix}[0-9].*{board_pattern}_noble_{branch}_[0-9]*.[0-9]*.[0-9]*_{desktop_type}{file_ext}"
1373+
desktop_pattern_no_prefix = f"Armbian_{community_prefix}[0-9].*{board_pattern}_noble_{branch}_[0-9]*.[0-9]*.[0-9]*_{desktop_type}{file_ext}"
1374+
lines.append(desktop_pattern)
1375+
lines.append(desktop_pattern_no_prefix)
12991376
else: # is_fast is False (slow hardware)
13001377
desktop_type = 'xfce_desktop'
1301-
1302-
desktop_pattern = f"{dir_prefix}Armbian_{community_prefix}[0-9].*{board_pattern}_noble_{branch}_[0-9]*.[0-9]*.[0-9]*_{desktop_type}{file_ext}"
1303-
desktop_pattern_no_prefix = f"Armbian_{community_prefix}[0-9].*{board_pattern}_noble_{branch}_[0-9]*.[0-9]*.[0-9]*_{desktop_type}{file_ext}"
1304-
lines.append(desktop_pattern)
1305-
lines.append(desktop_pattern_no_prefix)
1378+
desktop_pattern = f"{dir_prefix}Armbian_{community_prefix}[0-9].*{board_pattern}_noble_{branch}_[0-9]*.[0-9]*.[0-9]*_{desktop_type}{file_ext}"
1379+
desktop_pattern_no_prefix = f"Armbian_{community_prefix}[0-9].*{board_pattern}_noble_{branch}_[0-9]*.[0-9]*.[0-9]*_{desktop_type}{file_ext}"
1380+
lines.append(desktop_pattern)
1381+
lines.append(desktop_pattern_no_prefix)
13061382
else:
13071383
# Headless boards: Ubuntu noble minimal
13081384
noble_minimal_pattern = f"{dir_prefix}Armbian_{community_prefix}[0-9].*{board_pattern}_noble_{branch}_[0-9]*.[0-9]*.[0-9]*_minimal{file_ext}"

0 commit comments

Comments
 (0)