feat: multimedia variant improvements

.github/workflows/build-on-pr.yml

@@ -23,8 +23,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        suite: [trixie, forky]
-        variant: [default, weston-multimedia]
+        include:
+          - suite: trixie
+            variant: default
+          - suite: trixie
+            variant: weston-multimedia
+          - suite: forky
+            variant: default
     uses: ./.github/workflows/debos.yml
     permissions:
       contents: read

.github/workflows/build.yml

@@ -41,8 +41,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        suite: [trixie, forky]
-        variant: [default, weston-multimedia]
+        include:
+          - suite: trixie
+            variant: default
+          - suite: trixie
+            variant: weston-multimedia
+          - suite: forky
+            variant: default
     uses: ./.github/workflows/debos.yml
     permissions:
       contents: read

.github/workflows/debos.yml

@@ -86,7 +86,9 @@ jobs:
               ;;
             weston-multimedia)
               # configures a Weston session and installs the accelerated multimedia stack
-              variant_args='-t westonsession:true -t multimedia:true'
+              #
+              # the additional multimedia components require a larger image than default
+              variant_args='-t westonsession:true -t multimedia:true -t imagesize:8GiB'
               ;;
             *)
               echo "ERROR: unknown image variant '${VARIANT}'" >&2

Makefile

@@ -6,11 +6,14 @@
 
 # To build large images, the debos resource defaults are not sufficient. These
 # provide defaults that work for us as universally as we can manage.
+# The image recipe unpacks rootfs.tar into the scratch directory before copying
+# it into the filesystem image, so the scratch space has to be larger than the
+# biggest imagesize we build.
 FAKEMACHINE_BACKEND = $(shell [ -c /dev/kvm ] && echo kvm || echo qemu)
 FAKEMACHINE_OPTS ?= --fakemachine-backend $(FAKEMACHINE_BACKEND)
 
 EXTRA_DEBOS_OPTS ?=
-DEBOS_OPTS := $(FAKEMACHINE_OPTS) --memory 1GiB --scratchsize 6GiB $(EXTRA_DEBOS_OPTS)
+DEBOS_OPTS := $(FAKEMACHINE_OPTS) --memory 1GiB --scratchsize 12GiB $(EXTRA_DEBOS_OPTS)
 
 # Container support: auto-detect if debos is available, otherwise use container
 USE_CONTAINER ?= auto

README.md

@@ -142,7 +142,9 @@ A few options are provided in the debos recipes; for the root filesystem recipe:
   environment
 - `gnomedesktop`: install a GNOME desktop environment; default: console only environment
 - `westonsession`: install a Weston session; default: console only environment
-- `multimedia`: install the Qualcomm accelerated multimedia stack; default: don't install
+- `multimedia`: install the Qualcomm accelerated multimedia stack; default: don't install.
+  The stack is large and does not fit in the default image size, so build the image
+  recipe with `-t imagesize:8GiB`.
 - `overlays`: a `,`-separated list of rootfs overlays to add from
   `debos-recipes/overlays/`. See the *Supported overlays* section below.
 - `kernelpackages`: a `,`-separated list of kernel packages to install from

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

@@ -209,6 +209,7 @@ actions:
       "src:fastrpc:any"
       "src:firmware-free:any"
       "src:firmware-nonfree:any"
+      "src:greetd:any"
       "src:hexagon-dsp-binaries:any"
       "src:linux:any"
       "src:linux-signed-arm64:any"
@@ -818,12 +819,33 @@ actions:
       - adreno-opencl-icd
       - adreno-vulkan-icd
 
-      # CamX - only firmware available for now
+      # CamX
       # camx-dkms fails to build in fakemachine; see https://github.com/qualcomm-linux/pkg-camx-dkms/pull/42
       #- camx-dkms
+
+      # CamX device-specific firmware
       - camx-firmware-glymur
       - camx-firmware-hamoa
 
+      # CamX camera service
+      - qti-camera-server
+
+      # CamX device-specific runtime libraries
+      # camx-glymur and camx-hamoa are only built for trixie; see
+      # https://github.com/qualcomm-linux/pkg-camx-glymur/issues/8 and
+      # https://github.com/qualcomm-linux/pkg-camx-hamoa/issues/20
+{{- if eq $suite "trixie" }}
+      - camx-server-runtime-all
+{{- end }}
+
+      # CamX firmware
+      - camx-firmware-glymur
+      - camx-firmware-hamoa
+
+      # CamX test applications
+      - camx-nhx
+      - qcom-fastcv-utils
+
       # Iris Video Processing Unit
       - iris-vpu-dkms