Skip to content
Snippets Groups Projects

linux-purism-librem5: add pmb:kconfigcheck-librem5

Merged Imported linux-purism-librem5: add pmb:kconfigcheck-librem5
librem5-kernel into master
Merged Imported Administrator requested to merge librem5-kernel into master
  1. Oct 23, 2024
    • Oliver Smith's avatar
      linux-purism-librem5: add pmb:kconfigcheck-librem5 (MR 5633) · 378cbbb2
      Oliver Smith authored and Newbyte's avatar Newbyte committed 
      Follow up to MR 5562, which introduced category:librem5. Add the related
option, so CI actually enforces this category for the Librem 5.

[ci:skip-vercheck]: no need to rebuild for this
      Verified
      378cbbb2
    • Oliver Smith's avatar
      CI: common.run_pmbootstrap: use simple check=True (MR 5633) · a6f188af
      Oliver Smith authored and Newbyte's avatar Newbyte committed 
      Use check=True instead of running check_returncode() afterwards, it has
the same effect and is shorter.
      Verified
      a6f188af
    • Oliver Smith's avatar
      CI: apkbuild_linting: fix missing output (MR 5633) · 4ef0a4e9
      Oliver Smith authored and Newbyte's avatar Newbyte committed 
      pmbootstrap used to exit with 0 if "pmbootstrap lint" failed. This was
the case in 2.3.x too, but I assumed this was a regression and fixed it
recently in pmbootstrap MR 2398.

It turns out that the CI code relied on this assumption, it captured the
output of "pmbootstrap lint", and only after it is done it checks if the
output wasn't empty and prints it in that case followed by exit 1.

Now that pmbootstrap actually exits with 1, CI already fails at
"common.run_pmbootstrap" and doesn't get to the part where it would be
printed.

I think "exit 1" on error is actually the right thing to do in
pmbootstrap, so I'll leave that in. Adjust CI to just run "pmbootstrap
lint", removing the additional output capture logic that isn't used
anywhere besides here. This also has the advantage that we get the
output "live", without buffering it completely first.
      Verified
      4ef0a4e9