Caleb Connolly authored 4 months ago and Oliver Smith committed 4 months ago

the kernel has pending patches in -next which adjust the generated
Makefile in the output directory to include the source tree makefile
with an absolute path, this breaks envkernel which relies on it being a
relative path.

Fix this by mounting our own Makefile instead using the relative path.

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

Caleb Connolly authored 4 months ago and Oliver Smith committed 4 months ago

We used to use .output as the default kbuild_out but this was removed
recently, add it back!

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

This commit removes separator in split function arguments, so arrays
where items are separates by tabulation don't fail to parse properly.

Caleb Connolly authored 4 months ago and Oliver Smith committed 4 months ago

Pmbootstrap finds all its host dependencies during init, ensure we do
that for pytest too.

Adapt require_programs() to use subprocess directly rather than have to
solve the weird dependency chain of pmb.helpers.run which depends on the
global context being initialised before it's usable.

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

Caleb Connolly authored 5 months ago and Oliver Smith committed 4 months ago

Add some tests to ensure that we spit out correct deviceinfo options for
boot images of header v0, 2, and 3.

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

Caleb Connolly authored 5 months ago and Oliver Smith committed 4 months ago

Add some unit tests to ensure that the parser correctly detects boot
images with header v0, 2, and 3.

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

Caleb Connolly authored 5 months ago and Oliver Smith committed 4 months ago

make sure that calls to get_upstream_remote() will succeed by setting
pmb.config.git_repos() for the entire run. This might pollute some other
tests...

TODO: make less things depend on pmaports being cloned...

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

Caleb Connolly authored 4 months ago and Oliver Smith committed 4 months ago

This test includes a binary blob which we want to avoid in our codebase.

It is also better suited as a unit test where it can contribute to code
coverage. Revert this and use a unit test version instead.

This reverts commit d19de946.

Closes postmarketOS/pmbootstrap#2501

I think this is easier to read and has more obvious error handling.

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

pmbootstrap qemu did not respect architecture-specfic QEMU command name
mappings.

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

Previously, it would only fall back to parsing all APKBUILDs if a main
package was guessed for this potential subpackage. We do however want to
scan all APKBUILDs in case the package is provided by one of the
packages in pmaports.

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

g++ is a subpackage of gcc, but cannot be detected as such easily by
pmbootstrap. This is because g++ is not gcc-g++ or any other variant of
such package names. Similarly, the detection for musl-dev-ppc64le and
other architectures is broken, since the -dev suffix detection does not
work if there is an architecture suffix.

To fix it, add special case handling for cross toolchain and packages
and have that fixup the -dev cases and hardcode g++ as a subpackage of
gcc.

To reproduce:
- Generate ppc64le cross packages:
  pmbootstrap aportgen gcc-ppc64le musl-ppc64le
- Build a package (to trigger building cross compilers):
  pmbootstrap build hello-world --arch=ppc64le

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

self.arch is a property and calls Arch.from_str, which errors upon
encountering an unknown architecture. Therefore, the error message is
changed and needs to be adjusted in the tests. Since Arch.supported is a
set, error messages were not deterministic before, so we need to sort
the list of architectures now.

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

riscv64 is supported but currently not covered by the arch test suite.

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

Signed-off-by: Robert Eckelmann <longnoserob@postmarketos.org>

Caleb Connolly authored 4 months ago and Newbyte committed 4 months ago

Otherwise abuild will try and fail to create /dev/null

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
[ci:skip-build]: already built successfully in CI

Caleb Connolly authored 4 months ago and Oliver Smith committed 4 months ago

recent changes to the kernels build infra in -next seem to have exposed
some issues with "pmbootstrap build --envkernel", specifically in the
case where the APKBUILD doesn't build out-of-tree.

We used to rely on the fact that the kernel output directory contains a
Makefile which points to the source directory, however this Makefile
now(?) contains an absolute path on the host, which won't match what's
in the chroot.

As a result, it's now necessary to build with the same output directory
as the APKBUILD.

We probably need some smarter code here... and/or more consistent
APKBUILDs.

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

Minecrell authored 4 months ago and Oliver Smith committed 4 months ago

This can otherwise fail if the package was only built for some
architectures so far, but not for the architecture that is being generated.

E.g. right now musl-1.2.5-r6 was built already for x86_64 but not aarch64,
which causes errors like the following when running "pmbootstrap aportgen
musl-x86_64" on aarch64:

>>> musl-x86_64: Fetching musl-1.2.5-r5-x86_64-edge.apk::http://dl-4.alpinelinux.org/alpine//edge/main/x86_64/musl-1.2.5-r5.apk
Connecting to dl-4.alpinelinux.org (147.75.40.42:80)
Connecting to dl-4.alpinelinux.org (147.75.40.42:443)
wget: server returned error: HTTP/1.1 404 Not Found
>>> ERROR: musl-x86_64: checksum failed

Iuri Jikidze authored 4 months ago and Newbyte committed 4 months ago

Fixes bec2a4b1

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

"y" only works here by accident as it's considered truthy by Python and
as such gets handled equivalently to True in the current implementation
of pmb.helpers.cli.confirm(), but it's still relying on unintended
behaviour. Change this to use a bool as intended.

After extending CI to always run "pmbootstrap zap -a" it revealed
another bug: we did not ensure at this point that apk.static is
available. Rung apk_static.init() to ensure it gets downloaded and
extracted at this point if it is missing.

Make sure we don't regress in "pmbootstrap zap -a" by running it after
each integration test.

The tmp dir is owned by root, when it gets created earlier by apk
running as root to store the apk progress fifo. Use another directory to
work around this for now (getting close to the 3.0.0 release), we can
rework the apk progress fifo later on if we want.

Fixes: issue 2491

Replace aports -> pmaports in these messages.

$ pmbootstrap build systemd
[17:37:02] NOTE: The package 'systemd' exists in extra-repos/systemd, but systemd is currently disabled
[17:37:02] ERROR: Could not find package 'systemd' in pmaports

If the user tries to build a package, but it can't be found: check if
systemd is disabled and the package is in extra-repos/systemd, display a
hint about it.

$ pmbootstrap build systemd
[17:33:53] NOTE: The package 'systemd' exists in extra-repos/systemd, but systemd is currently disabled
[17:33:53] ERROR: Could not find aport for package: systemd

Fixes: issue 2398

Replace the boolean skip_extra_repos with a new with_extra_repos
argument that can be default, enabled or disabled.

This will be used to explicitly enable extra repos in a package search
even if systemd is currently disabled, so we can display a hint when a
package was not found because systemd is disabled in a follow-up patch.

Use the nice @Cache decorator that Caleb introduced earlier.

This caused a regression in CI tests.
This reverts commit 6ee82740.

Related: issue 2497

This caused a regression in CI tests.
This reverts commit ae356031.

Related: issue 2497

This caused a regression in CI tests.
This reverts commit b888ddde.

Related: issue 2497