pmb/chroot/initfs: change invocation to support the new mkinitfs (MR 2093)
The new mkinitfs does not have options for kernel flavor or version A new pmaports.cfg variable, "supported_mkinitfs_without_flavors" is used to determine how to invoke mkinitfs
This commit is contained in:
parent
9ae2eef0f0
commit
ca7ac4c704
|
@ -12,16 +12,20 @@ def build(args, flavor, suffix):
|
||||||
# Update mkinitfs and hooks
|
# Update mkinitfs and hooks
|
||||||
pmb.chroot.apk.install(args, ["postmarketos-mkinitfs"], suffix)
|
pmb.chroot.apk.install(args, ["postmarketos-mkinitfs"], suffix)
|
||||||
pmb.chroot.initfs_hooks.update(args, suffix)
|
pmb.chroot.initfs_hooks.update(args, suffix)
|
||||||
|
pmaports_cfg = pmb.config.pmaports.read_config(args)
|
||||||
|
|
||||||
# Call mkinitfs
|
# Call mkinitfs
|
||||||
logging.info(f"({suffix}) mkinitfs {flavor}")
|
logging.info(f"({suffix}) mkinitfs {flavor}")
|
||||||
release_file = (f"{args.work}/chroot_{suffix}/usr/share/kernel/"
|
if pmaports_cfg.get("supported_mkinitfs_without_flavors", False):
|
||||||
f"{flavor}/kernel.release")
|
pmb.chroot.root(args, ["mkinitfs"], suffix)
|
||||||
with open(release_file, "r") as handle:
|
else:
|
||||||
release = handle.read().rstrip()
|
release_file = (f"{args.work}/chroot_{suffix}/usr/share/kernel/"
|
||||||
pmb.chroot.root(args, ["mkinitfs", "-o",
|
f"{flavor}/kernel.release")
|
||||||
f"/boot/initramfs-{flavor}", release],
|
with open(release_file, "r") as handle:
|
||||||
suffix)
|
release = handle.read().rstrip()
|
||||||
|
pmb.chroot.root(args, ["mkinitfs", "-o",
|
||||||
|
f"/boot/initramfs-{flavor}", release],
|
||||||
|
suffix)
|
||||||
|
|
||||||
|
|
||||||
def extract(args, flavor, suffix, extra=False):
|
def extract(args, flavor, suffix, extra=False):
|
||||||
|
|
Loading…
Reference in New Issue