Skip to content

Commit a2ff815

Browse files
committed
feat(rootfs): Update package lists by distro-suite
Per distro and suite package installs: - fastrpc-support: skipped for noble (not yet available) - fastrpc-tests: only installed for trixie (only in trixie-overlay) - debugcc: skipped for noble (not available in Ubuntu noble) - Priority important/standard: use ?origin(Ubuntu) for Ubuntu builds instead of ?origin(Debian) Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
1 parent 6c695ca commit a2ff815

1 file changed

Lines changed: 31 additions & 6 deletions

File tree

debos-recipes/qualcomm-linux-debian-rootfs.yaml

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,10 @@ actions:
214214
- dosfstools
215215
# ext4 tools, notably e2fsck for the root filesystem
216216
- e2fsprogs
217-
# fastrpc support. fastrpc-tests pulls in the required stack
218-
- fastrpc-tests
217+
{{ if ne $suite "noble" }}
218+
# fastrpc support; not available in Ubuntu noble
219+
- fastrpc-support
220+
{{ end }}
219221
# fwupd tools, enable OTA EFI firmware capsule updates
220222
- fwupd
221223
# defaults to "systemd-sysv"; perhaps not needed
@@ -243,6 +245,15 @@ actions:
243245
# WPA / WPA2 / WPA3 client support
244246
- wpasupplicant
245247

248+
{{ if eq $suite "trixie" }}
249+
# fastrpc-tests is only available in trixie-overlay
250+
- action: apt
251+
description: Install fastrpc-tests (trixie only)
252+
recommends: true
253+
packages:
254+
- fastrpc-tests
255+
{{ end }}
256+
246257
- action: run
247258
description: Set hostname to "{{ $hostname }}"
248259
chroot: true
@@ -277,20 +288,32 @@ actions:
277288
)
278289
279290
# NB: Recommends pull in way too many packages, and we don't need to follow
280-
# Recommends reaching outside of this Priority level
291+
# Recommends reaching outside of each Priority level
292+
{{ if eq $distro "debian" }}
281293
- action: apt
282294
description: Install packages of priority "important" (only from Debian)
283295
recommends: false
284296
packages:
285297
- ?origin(Debian) ?priority(important)
286298

287-
# NB: Recommends pull in way too many packages, and we don't need to follow
288-
# Recommends reaching outside of this Priority level
289299
- action: apt
290300
description: Install packages of priority "standard" (only from Debian)
291301
recommends: false
292302
packages:
293303
- ?origin(Debian) ?priority(standard)
304+
{{ else if eq $distro "ubuntu" }}
305+
- action: apt
306+
description: Install packages of priority "important" (from Ubuntu)
307+
recommends: false
308+
packages:
309+
- ?origin(Ubuntu) ?priority(important)
310+
311+
- action: apt
312+
description: Install packages of priority "standard" (from Ubuntu)
313+
recommends: false
314+
packages:
315+
- ?origin(Ubuntu) ?priority(standard)
316+
{{ end }}
294317

295318
# TODO remove Priority: standard packages from this list?
296319
- action: apt
@@ -299,8 +322,10 @@ actions:
299322
packages:
300323
- alsa-utils
301324
- clinfo
302-
# used to debug clock issues
325+
{{ if ne $suite "noble" }}
326+
# used to debug clock issues; not available in Ubuntu noble
303327
- debugcc
328+
{{ end }}
304329
- device-tree-compiler
305330
- docker.io
306331
# used to debug ethernet speed auto-neg issues

0 commit comments

Comments
 (0)