Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

aportgen: fix fork_alpine flag (MR 2252)

Browse source 
Broke during rework

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-06-08 01:45:36 +02:00 • committed by Oliver Smith
parent 34ee1cff69
commit d8d55c3e52
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pmb/aportgen/__init__.py
View file

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

4
pmb/config/init.py
View file

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

2
pmb/flasher/frontend.py
View file

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

2
pmb/flasher/variables.py
View file

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

2
pmb/helpers/frontend.py
View file

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