From e14a823fda3e904fcc972077689837819cfd71fe Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 3 Jan 2021 10:55:13 +0100 Subject: [PATCH] envkernel.py: don't search for kbuild_out if _outdir is set (MR 2012) Patch by Oliver, fixes https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2000 --- pmb/build/envkernel.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pmb/build/envkernel.py b/pmb/build/envkernel.py index 382e0940..dfe04151 100644 --- a/pmb/build/envkernel.py +++ b/pmb/build/envkernel.py @@ -166,14 +166,17 @@ def package_kernel(args): "argument.") aport = pmb.helpers.pmaports.find(args, pkgname) - function_body = pmb.parse.function_body(aport + "/APKBUILD", "package") - kbuild_out = find_kbuild_output_dir(args, function_body) modify_apkbuild(args, pkgname, aport) apkbuild_path = args.work + "/aportgen/APKBUILD" arch = args.deviceinfo["arch"] apkbuild = pmb.parse.apkbuild(args, apkbuild_path, check_pkgname=False) + if apkbuild["_outdir"]: + kbuild_out = apkbuild["_outdir"] + else: + function_body = pmb.parse.function_body(aport + "/APKBUILD", "package") + kbuild_out = find_kbuild_output_dir(args, function_body) suffix = pmb.build.autodetect.suffix(args, apkbuild, arch) # Install package dependencies