kmscube: support MSM/freedreno and KGSL/Adreno graphics stacks with debusine

Runner/config/pkg_command_map.conf

@@ -1,40 +1,30 @@
 # qcom-linux-testkit command-to-package map
 #
 # Format:
-#   os-id:command=package package2 ...
-#   provider:command=package package2 ...
-#   os-id:TESTNAME:command=package package2 ...
-#   provider:TESTNAME:command=package package2 ...
-#
-# Lookup order:
-#   1. os-id:TESTNAME:command
-#   2. provider:TESTNAME:command
-#   3. os-id:command
-#   4. provider:command
-#
-# The right-hand side is a required package set.
-# All packages listed on the same line are installed when that exact
-# dependency command is missing.
-#
-# Use TESTNAME-scoped mappings for large feature stacks so only that test
-# installs those packages.
-#
-# The provider installs package names through the active package manager.
-# It does not scrape raw package pool directories.
-#
-# For apt:
-#   - Internal repositories should be provided through *.sources files.
-#   - Public repositories can use the target's existing apt sources.
-#   - Local package locations should be exposed as a local apt repository
-#     through a *.sources file under:
-#
-#       /opt/qcom-testkit/metadata/*.sources
-#
-# Apt selects the latest candidate version from repository metadata.
-# Do not encode versions here unless strict pinning is required.
+# os-id:command=package package2 ...
+# provider:command=package package2 ...
+# os-id:TESTNAME:command=package package2 ...
+# provider:TESTNAME:command=package package2 ...
+# os-id:package-set:<set-name>=package package2 ...
+# provider:package-set:<set-name>=package package2 ...
+#
+# Lookup order for command dependencies:
+# 1. os-id:TESTNAME:command
+# 2. provider:TESTNAME:command
+# 3. os-id:command
+# 4. provider:command
+#
+# Lookup order for package sets:
+# 1. os-id:package-set:<set-name>
+# 2. provider:package-set:<set-name>
 #
 # Do not assume command name equals package name.
 
+# ---------------------------------------------------------------------------
+# Common apt provider mappings.
+# Applies to Debian/Ubuntu apt-based rootfs.
+# ---------------------------------------------------------------------------
+
 apt:modetest=libdrm-tests
 apt:kmscube=kmscube
 apt:glmark2=glmark2
@@ -78,7 +68,7 @@ rpm:efivar=efivar
 
 # ---------------------------------------------------------------------------
 # Common opkg provider mappings.
-# Override per distro if package names differ.
+# Applies to opkg-based images.
 # ---------------------------------------------------------------------------
 
 opkg:modetest=libdrm-tests
@@ -102,51 +92,50 @@ opkg:efivar=efivar
 # ---------------------------------------------------------------------------
 # Qualcomm sensors test-specific package set.
 #
-# These mappings are TESTNAME-scoped, so sensor packages are installed only
-# when the sensor test runs and check_dependencies() checks sns_test.
-#
-# Update TESTNAME/command if the actual sensor test uses a different
-# TESTNAME or dependency binary.
+# TESTNAME-scoped so sensor packages are installed only when the Sensors test
+# checks for sns_test.
 # ---------------------------------------------------------------------------
- 
+
 apt:Sensors:sns_test=qcom-sensors-api qcom-sensors-core qcom-sensors-registry qcom-sensors-services qcom-sensors-test-core qcom-sensors-test-apps
 rpm:Sensors:sns_test=qcom-sensors-api qcom-sensors-core qcom-sensors-registry qcom-sensors-services qcom-sensors-test-core qcom-sensors-test-apps
 opkg:Sensors:sns_test=qcom-sensors-api qcom-sensors-core qcom-sensors-registry qcom-sensors-services qcom-sensors-test-core qcom-sensors-test-apps
-
-# If the sensor test requires development/header packages, use the below
-# TESTNAME-specific mapping instead of the smaller runtime-only mapping above.
-#
-# apt:Sensors_Validation:sns_test=qcom-sensors-api qcom-sensors-api-dev qcom-sensors-core qcom-sensors-core-dev qcom-sensors-registry qcom-sensors-services qcom-sensors-test-core qcom-sensors-test-core-dev qcom-sensors-test-apps
-# rpm:Sensors_Validation:sns_test=qcom-sensors-api qcom-sensors-api-dev qcom-sensors-core qcom-sensors-core-dev qcom-sensors-registry qcom-sensors-services qcom-sensors-test-core qcom-sensors-test-core-dev qcom-sensors-test-apps
-# opkg:Sensors_Validation:sns_test=qcom-sensors-api qcom-sensors-api-dev qcom-sensors-core qcom-sensors-core-dev qcom-sensors-registry qcom-sensors-services qcom-sensors-test-core qcom-sensors-test-core-dev qcom-sensors-test-apps
 
 # ---------------------------------------------------------------------------
-# Optional OS-specific overrides can be added below.
+# Qualcomm FastRPC package set.
 #
-# OS-specific mappings override provider mappings.
+# Used by tests that explicitly call:
+# pkg_ensure_package_set fastrpc
+# or:
+# pkg_ensure_optional_package_set fastrpc ...
 #
-# Examples:
-# qcom-distro:media-ctl=v4l-utils
-# qcom-distro:Video_V4L2_Runner:yavta=qcom-yavta
-# debian:modetest=libdrm-tests
-# ubuntu:modetest=libdrm-tests
-# centos:modetest=libdrm-tests
+# No qcom-distro/rpm mapping is provided, so Yocto remains no-op unless a
+# supported mapping is added later.
 # ---------------------------------------------------------------------------
 
+debian:package-set:fastrpc=fastrpc-support fastrpc-tests
+ubuntu:package-set:fastrpc=fastrpc-support fastrpc-tests
+
 # ---------------------------------------------------------------------------
-# Generic package sets.
+# Qualcomm Graphics / Adreno optional overlay package set.
 #
-# Format:
-#   provider:package-set:<set-name>=pkg1 pkg2 ...
-#   os-id:package-set:<set-name>=pkg1 pkg2 ...
+# Installed only when the test explicitly requests optional overlay recovery,
+# for example:
+# ./run.sh --overlay
+#
+# Currently available from qli-staging. Once promoted to qli, only the source
+# selection in the caller needs to change. The package-set name remains graphics.
 #
-# These are package-level dependencies, not command dependencies.
-# They are useful when a test needs a package stack even if the command is
-# already present or the package is expected to be installed in the rootfs.
+# DKMS packages are skipped by lib_pkg_provider.sh when matching kernel headers
+# are unavailable. Remaining userspace packages continue to install.
+#
+# No qcom-distro/rpm mapping is provided, so Yocto remains no-op.
 # ---------------------------------------------------------------------------
 
-#apt:package-set:fastrpc=fastrpc-support fastrpc-tests
-debian:package-set:fastrpc=fastrpc-support fastrpc-tests
-ubuntu:package-set:fastrpc=fastrpc-support fastrpc-tests
-# Add CentOS only when rpm package names/repo are confirmed:
-# centos:package-set:fastrpc=fastrpc-support fastrpc-tests
+# Qualcomm proprietary graphics overlay package set.
+debian:package-set:graphics=kgsl-dkms adreno-common libgbm-msm1 adreno-gles1 adreno-gles2 adreno-egl1 adreno-vulkan-icd adreno-opencl-icd adreno-opencl-dev
+
+# Upstream Debian Mesa/freedreno userspace required by the default KMSCube run.
+debian:package-set:graphics-base=libegl-mesa0 libgl1-mesa-dri libgbm1 libegl1 libgles2 mesa-utils
+
+# TODO on ubuntu
+ubuntu:package-set:graphics=kgsl-dkms adreno-common adreno-gles1 adreno-gles2 adreno-egl1 adreno-vulkan-icd adreno-opencl-icd adreno-opencl-dev