From ff20316ff38d371771482c752e8e9408cad0a03b Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 18 Feb 2024 20:05:08 +0000 Subject: [PATCH] CI: allow firmware packages as deps of device pkgs (MR 4839) We have decided to not use the non-free firmware subpackages anymore, read the details in the blog post. Allow direct dependencies from the device packages to the firmware packages. Related: https://postmarketos.org/edge/2024/02/15/default-nonfree-fw/ [ci:skip-build]: already built successfully in CI --- .ci/testcases/test_device.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.ci/testcases/test_device.py b/.ci/testcases/test_device.py index 20aca4e73..3b5236f61 100644 --- a/.ci/testcases/test_device.py +++ b/.ci/testcases/test_device.py @@ -17,14 +17,6 @@ def device_dependency_check(apkbuild, path): (e.g. because it should be in a subpackage instead). """ for depend in apkbuild["depends"]: - if depend == "linux-firmware-none": - continue - if (depend.startswith("firmware-") or - depend.startswith("linux-firmware")): - raise RuntimeError("Firmware package '" + depend + "' found in" - " depends of " + path + ". These go into" - " subpackages now, see" - " .") if depend == "mesa-dri-gallium": raise RuntimeError(f"{path}: mesa-dri-gallium shouldn't be in" " depends anymore (see pmaports!3478)") @@ -46,7 +38,7 @@ def test_aports_device(args): raise RuntimeError("Missing 'postmarketos-base' in depends of " + path) - # Depends: Must not have firmware packages + # Depends: Must not have specific packages for depend in apkbuild["depends"]: device_dependency_check(apkbuild, path)