aportgen: fix fork_alpine flag (MR 2252)

Broke during rework

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

pmb/aportgen/__init__.py

@@ -54,7 +54,7 @@ def properties(pkgname):
     raise ValueError("No generator available for " + pkgname + "!")
 
 
-def generate(pkgname, fork_alpine=False):
+def generate(pkgname, fork_alpine):
     if fork_alpine:
         prefix, folder, options = (pkgname, "temp",
                                    {"confirm_overwrite": True})

pmb/config/init.py

@@ -438,8 +438,8 @@ def ask_for_device(context: Context):
 
             # New port creation confirmed
             logging.info("Generating new aports for: {}...".format(device))
-            pmb.aportgen.generate(f"device-{device}")
-            pmb.aportgen.generate(f"linux-{device}")
+            pmb.aportgen.generate(f"device-{device}", False)
+            pmb.aportgen.generate(f"linux-{device}", False)
         elif any("archived" == x for x in device_path.parts):
             apkbuild = device_path.parent / "APKBUILD"
             archived = pmb.parse._apkbuild.archived(apkbuild)

pmb/flasher/frontend.py

@@ -137,7 +137,7 @@ def frontend(args: PmbArgs):
     action = args.action_flasher
     device = context.device
     deviceinfo = pmb.parse.deviceinfo()
-    method = args.flash_method or deviceinfo.flash_method or "none"
+    method = args.flash_method or deviceinfo.flash_method
 
     if method == "none" and action in ["boot", "flash_kernel", "flash_rootfs",
                                        "flash_lk2nd"]:

pmb/flasher/variables.py

@@ -6,7 +6,7 @@ from pmb.core.context import get_context
 from pmb.types import PmbArgs
 
 
-def variables(args: PmbArgs, flavor, method):
+def variables(args: PmbArgs, flavor: str, method: str):
     device = get_context().config.device
     deviceinfo = pmb.parse.deviceinfo()
     _cmdline = deviceinfo.kernel_cmdline or ""

pmb/helpers/frontend.py

@@ -96,7 +96,7 @@ def _install_ondev_verify_no_rootfs(device: str, ondev_cp: List[Tuple[str, str]]
 def aportgen(args: PmbArgs):
     for package in args.packages:
         logging.info("Generate aport: " + package)
-        pmb.aportgen.generate(args, package)
+        pmb.aportgen.generate(package, args.fork_alpine)
 
 
 def build(args: PmbArgs):