The default losetup implementation in Alpine and thus postmarketOS is
BusyBox losetup. It doesn't support the --json parameter, and so unless
the util-linux variant gets installed this code path won't work.
Installing additional packages during shutdown doesn't seem like a great
approach to me as it makes this code path more fragile and completely
breaks it if e.g. your Internet is out, so just bring back the old code
from shutdown.py in pmbootstrap 2.3.1 to do this job for us.

Co-developed-by: Oliver Smith <ollieparanoid@postmarketos.org>

Fixes 0975d064

Closes #2465
Supersedes: !2435

Looks like an unintended leftover from debugging.

I tested $ pmbootstrap shutdown with this and observed no problems. All
the mounts disappear in lsblk as expected.

Closes #2423

And fix type errors.

All typing errors found with --check-untyped-defs have been fixed, so
let's make mypy stricter now to avoid regressing this.

I'm not sure why this was annotated as a Sequence rather than list. The
function clearly returns a list, not a Sequence, and the commit that
originally did it[1] provides no justification. This causes problems
with mypy checks in other places, so let's just annotate this as
returning a list.

 [1]: 198f302a

Otherwise mypy cannot figure out the type of these.

Newbyte authored 6 months ago and Newbyte committed 6 months ago

Alpine stable's mypy is currently outdated and has bugs in its
handling of overloads. As such, just use mypy from pip so we don't have
to worry about working aroud bugs in old mypy versions.

[ci:skip-build]: already built successfully in CI

Newbyte authored 6 months ago and Newbyte committed 6 months ago

Works around circular import.

Newbyte authored 6 months ago and Newbyte committed 6 months ago

And adjust other code.

Closes #2455

Now that we have moved the kconfigcheck configuration into pmaports
branches via kconfigcheck.toml, it is time to get rid of the hardcoded
list of valid "pmb:kconfigcheck-…" options for APKBUILDs. Generate it
from the kconfigcheck.toml of the current branch, too.

These options are passed from "pmbootstrap lint" to "apkbuild-lint",
which we run in pmaports CI.

The output of apkbuild-lint is hard to spot among other log messages
from pmbootstrap, because it is not colorized.

Add "*** apkbuild-lint output ***"" before and after the output of
apkbuild-lint, so we get a standing out message in green around the
apkbuild-lint output.

It is not needed to run the linter as root, so don't do it. This is
probably a leftover from early days pmbootstrap, where pmaports.git
wasn't chowned by the user running pmbootstrap.

Here's the problem: Imagine a queue with 2 packages in it, the 1st
package uses crossdirect and the second uses cross-native. When building
the 1st package, pmb will configure the native chroot for crossdirect
as expected. When it gets to the 2nd package, the chroot env/config
might not be appropriate for actually doing a native cross compile.

This re-inits the cross compiler stuff if the cross compile method
changes while processing the queue.

Another approach that might solve this problem is to not re-use chroots
when building packages... I didn't think this was a good way to go
because it would greatly increase runtime (having to recreate chroots
multiple times)

When running some commands like "pmbootstrap chroot" or even
"pmbootstrap work_migrate", pmbootstrap will attempt to read the
pmaports.cfg from origin/master *before* doing the work dir migration.

In order to do this, the "get_upstream_remote" function tries to find
the upstream remote by URL. Let it search with the outdated URLs too, so
this doesn't fail right before migrating to the new URLs.

Newbyte authored 6 months ago and Oliver Smith committed 6 months ago

This could be re-purposed in the future in case we migrate URLs again.

Co-authored-by: Caleb Connolly <caleb@postmarketos.org>
Tweaked-by: Oliver Smith <ollieparanoid@postmarketos.org>

Casey authored 6 months ago and Oliver Smith committed 6 months ago

Now that we don't need weird apk-tools hacks for systemd, we can
re-implement this optimisation and always run apk static rather than
running apk through the chroot.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

Newbyte authored 6 months ago and Oliver Smith committed 6 months ago

Otherwise Arch may be None here which results in an error.

We moved from gitlab.com to gitlab.postmarketos.org.

Newbyte authored 6 months ago and Newbyte committed 6 months ago

This is section is not meant to represent my opinions, rather I seek to
document the status quo. I base the support range on what's been
reasoned in prior merge requests such as [1] and [2], as well as [3]
which only fixed CI in the one active stable release and left old stable
releases unfixed.

While I don't necessary think this is a great situation given that old
releases may sometimes be useful, extending the time pmbootstrap has to
support old releases would incur significant additional maintenance
effort and consequently require more discussion than just documenting
what's already happening. As such, I think this is the most reasonable
thing to do for now.

 [1]: https://gitlab.com/postmarketOS/pmbootstrap/-/merge_requests/2360#note_1999012908
 [2]: https://gitlab.com/postmarketOS/pmbootstrap/-/merge_requests/2417#note_2135527528
 [3]: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5676

Newbyte authored 6 months ago and Oliver Smith committed 6 months ago

This is probably a leftover from automatically reformatting this file.

The previous version would fail if the suffix contained a dash as well,
e.g. postmarketos-base-ui-audio-some-new-thing. Fix it and add example
comments.

For packages selected by the user (see last commit), set the
provider_priority to 999999 instead of 999. The previous number seems
not high enough, we might set this in the APKBUILDs.

Clayton Craft authored 6 months ago and Oliver Smith committed 6 months ago

Fixes #2456
Depends on https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/72741

We plan to ship systemd with split /usr until the /usr merge is complete
in Alpine. Let's not drop all our code yet but just forcefully disable
it.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

Similar to pkgrel but for pkgver. Useful when dealing with e.g.
metapackages.

[ci:skip-build]: already built successfully in CI

We no longer care about supporting Python versions older than 3.10,
which is when match was introduced.