a7y18lte-pmos/pmos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: stop verifying kernel subpackage names (!907)

Browse Source 
At the moment we check that the kernel variants for a device package
match the suffix of an existing linux-postmarketos-<suffix> package.

However, in most cases the name of the kernel subpackage has nothing
to do with the actual kernel that is used:

  - the kernel subpackages usually have generic names like "mainline" or
    "downstream", which have nothing to do with the actual suffixes like
    "qcom-msm8916", "allwinner" or "novathor"

  - pine64-dontbeevil uses kernel subpackages to switch between
    "longts" and "shortts" device tree variants. Both are actually
    using linux-postmarketos-allwinner.

So far we have been whitelisting names like "longts" or "shortts",
but the check does not seem very useful overall.

Removing it fixes the following CI failure for MSM8916:
  RuntimeError: Invalid kernel subpackage name 'mainline-modem',
  valid: ['downstream', 'rpi', 'rpi2', 'longts', 'shortts', 'stable', 'mainline',
          'allwinner', 'qcom-msm8916', 'qcom-msm8974', 'novathor']
This commit is contained in:
Minecrell 2020-01-27 21:09:44 +01:00 committed by Luca Weiss
parent 1611c6c70f
commit f7a4fcc3e7
No known key found for this signature in database
GPG Key ID: 72D843B89D4DD756
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci/testcases/test_aports.py
View File

@ -127,13 +127,7 @@ def test_aports_device_kernel(args):
Verify the kernels specified in the device packages: Verify the kernels specified in the device packages:
* Kernel must not be in depends when kernels are in subpackages * Kernel must not be in depends when kernels are in subpackages
* Check if only one kernel is defined in depends * Check if only one kernel is defined in depends
* Validate kernel subpackage names
""" """
# Generate list of valid subpackages
valid_subpackages = ["downstream", "rpi", "rpi2", "longts", "shortts"]
for path in glob.glob(args.aports + "/main/linux-postmarketos-*"):
suffix = os.path.basename(path)[len("linux-postmarketos-"):]
valid_subpackages.append(suffix)
# Iterate over device aports # Iterate over device aports
for path in glob.glob(args.aports + "/device/device-*/APKBUILD"): for path in glob.glob(args.aports + "/device/device-*/APKBUILD"):
@ -166,11 +160,3 @@ def test_aports_device_kernel(args):
" multiple kernels in depends (see" " multiple kernels in depends (see"
" <https://postmarketos.org/devicepkg>): " + " <https://postmarketos.org/devicepkg>): " +
path) path)
# Verify subpackages
if kernels_subpackages:
for subpackage in kernels_subpackages:
if subpackage not in valid_subpackages:
raise RuntimeError("Invalid kernel subpackage name '" +
subpackage + "', valid: " +
str(valid_subpackages))