build --strict: use pmb.chroot.init_keys (MR 2110)
Fix the issue of having the postmarketOS binary repository key deleted from the chroots after "abuild undeps" removes the postmarketos-keys package. This happens if e.g. building two device packages in a row (as they depend on postmarketos-base, which depends on postmarketos-keys in current pmaports.git master). I've also considered installing the postmarketos-keys next to alpine-base in new chroots. But this would introduce a bootstrap problem, since you can't install the postmarketos-keys package unless it already exists in the repository. We'd run into that when building the next release.
This commit is contained in:
parent
9b7feadca6
commit
6fde1f0851
|
@ -464,6 +464,9 @@ def finish(args, apkbuild, arch, output, strict=False, suffix="native"):
|
||||||
logging.info("(" + suffix + ") uninstall build dependencies")
|
logging.info("(" + suffix + ") uninstall build dependencies")
|
||||||
pmb.chroot.user(args, ["abuild", "undeps"], suffix, "/home/pmos/build",
|
pmb.chroot.user(args, ["abuild", "undeps"], suffix, "/home/pmos/build",
|
||||||
env={"SUDO_APK": "abuild-apk --no-progress"})
|
env={"SUDO_APK": "abuild-apk --no-progress"})
|
||||||
|
# If the build depends contain postmarketos-keys or postmarketos-base,
|
||||||
|
# abuild will have removed the postmarketOS repository key (pma#1230)
|
||||||
|
pmb.chroot.init_keys(args)
|
||||||
|
|
||||||
|
|
||||||
def package(args, pkgname, arch=None, force=False, strict=False,
|
def package(args, pkgname, arch=None, force=False, strict=False,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright 2021 Oliver Smith
|
# Copyright 2021 Oliver Smith
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
from pmb.chroot.init import init
|
from pmb.chroot.init import init, init_keys
|
||||||
from pmb.chroot.mount import mount, mount_native_into_foreign
|
from pmb.chroot.mount import mount, mount_native_into_foreign
|
||||||
from pmb.chroot.root import root
|
from pmb.chroot.root import root
|
||||||
from pmb.chroot.user import user
|
from pmb.chroot.user import user
|
||||||
|
|
Loading…
Reference in New Issue