From ca7ac4c704db6d78243ec6f8fec6ba5167e24394 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Tue, 10 Aug 2021 23:27:43 -0700
Subject: [PATCH] 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
---
 pmb/chroot/initfs.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pmb/chroot/initfs.py b/pmb/chroot/initfs.py
index 9bc27773..8aa9f05b 100644
--- a/pmb/chroot/initfs.py
+++ b/pmb/chroot/initfs.py
@@ -12,16 +12,20 @@ def build(args, flavor, suffix):
     # Update mkinitfs and hooks
     pmb.chroot.apk.install(args, ["postmarketos-mkinitfs"], suffix)
     pmb.chroot.initfs_hooks.update(args, suffix)
+    pmaports_cfg = pmb.config.pmaports.read_config(args)
 
     # Call mkinitfs
     logging.info(f"({suffix}) mkinitfs {flavor}")
-    release_file = (f"{args.work}/chroot_{suffix}/usr/share/kernel/"
-                    f"{flavor}/kernel.release")
-    with open(release_file, "r") as handle:
-        release = handle.read().rstrip()
-    pmb.chroot.root(args, ["mkinitfs", "-o",
-                           f"/boot/initramfs-{flavor}", release],
-                    suffix)
+    if pmaports_cfg.get("supported_mkinitfs_without_flavors", False):
+        pmb.chroot.root(args, ["mkinitfs"], suffix)
+    else:
+        release_file = (f"{args.work}/chroot_{suffix}/usr/share/kernel/"
+                        f"{flavor}/kernel.release")
+        with open(release_file, "r") as handle:
+            release = handle.read().rstrip()
+            pmb.chroot.root(args, ["mkinitfs", "-o",
+                                   f"/boot/initramfs-{flavor}", release],
+                            suffix)
 
 
 def extract(args, flavor, suffix, extra=False):