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
This commit is contained in:
Oliver Smith 2024-02-18 20:05:08 +00:00 committed by Pablo Correa Gómez
parent bf944e6c06
commit ff20316ff3
No known key found for this signature in database
GPG key ID: 7A342565FF635F79

View file

@ -17,14 +17,6 @@ def device_dependency_check(apkbuild, path):
(e.g. because it should be in a subpackage instead). """ (e.g. because it should be in a subpackage instead). """
for depend in apkbuild["depends"]: 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"
" <https://postmarketos.org/devicepkg>.")
if depend == "mesa-dri-gallium": if depend == "mesa-dri-gallium":
raise RuntimeError(f"{path}: mesa-dri-gallium shouldn't be in" raise RuntimeError(f"{path}: mesa-dri-gallium shouldn't be in"
" depends anymore (see pmaports!3478)") " depends anymore (see pmaports!3478)")
@ -46,7 +38,7 @@ def test_aports_device(args):
raise RuntimeError("Missing 'postmarketos-base' in depends of " + raise RuntimeError("Missing 'postmarketos-base' in depends of " +
path) path)
# Depends: Must not have firmware packages # Depends: Must not have specific packages
for depend in apkbuild["depends"]: for depend in apkbuild["depends"]:
device_dependency_check(apkbuild, path) device_dependency_check(apkbuild, path)