From 82fdf63711123d15ca53dacfb860413e00f0ed41 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 24 Apr 2019 20:53:45 -0400 Subject: [PATCH] build/envkernel: Fix packaging kernels that don't define a kbuild directory (!1779) When a kernel APKBUILD doesn't define a kbuild directory then run_abuild is passed an empty string and not a None value. --- pmb/build/envkernel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmb/build/envkernel.py b/pmb/build/envkernel.py index 968f91f6..f24aa6b1 100644 --- a/pmb/build/envkernel.py +++ b/pmb/build/envkernel.py @@ -142,7 +142,7 @@ def run_abuild(args, pkgname, arch, apkbuild_path, kbuild_out): pmb.build.copy_to_buildpath(args, pkgname) # Create symlink from abuild working directory to envkernel build directory - build_output = "" if kbuild_out is None else "/" + kbuild_out + build_output = "" if kbuild_out == "" else "/" + kbuild_out if build_output != "": if os.path.islink(chroot + "/mnt/linux/" + build_output) and \ os.path.lexists(chroot + "/mnt/linux/" + build_output):