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

envkernel.py: don't search for kbuild_out if _outdir is set (MR 2012)

Browse source 
Patch by Oliver, fixes https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2000
This commit is contained in:
Henrik Grimler 2021-01-03 10:55:13 +01:00 • committed by Alexey Min
parent 6a4f012bf9
commit e14a823fda
No known key found for this signature in database
GPG key ID: 0B19D2A65870B448
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pmb/build/envkernel.py
View file

@ -166,14 +166,17 @@ def package_kernel(args):
"argument.") "argument.")
aport = pmb.helpers.pmaports.find(args, pkgname) 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) modify_apkbuild(args, pkgname, aport)
apkbuild_path = args.work + "/aportgen/APKBUILD" apkbuild_path = args.work + "/aportgen/APKBUILD"
arch = args.deviceinfo["arch"] arch = args.deviceinfo["arch"]
apkbuild = pmb.parse.apkbuild(args, apkbuild_path, check_pkgname=False) 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) suffix = pmb.build.autodetect.suffix(args, apkbuild, arch)
# Install package dependencies # Install package dependencies