From e4875e54fae7afb348ba8cc599f517488304fdca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Sz=C3=B6ll=C5=91si?= Date: Sun, 25 Feb 2018 18:44:01 +0100 Subject: [PATCH] Fix menuconfig arch check (#1259) We don't use 'arch="all"' in our kernels anymore (that does not make sense, since each arch needs its own kernel config). This patch fixes the menuconfig code to work with multiple values in the "arch" field. --- pmb/build/menuconfig.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pmb/build/menuconfig.py b/pmb/build/menuconfig.py index 8c1eae47..aca7740b 100644 --- a/pmb/build/menuconfig.py +++ b/pmb/build/menuconfig.py @@ -33,13 +33,14 @@ def get_arch(args, apkbuild): Get the architecture, that the user wants to run menuconfig on, depending on the APKBUILD and on the --arch parameter. - :param apkbuild: looks like: {"pkgname": "linux-...", "arch": ["all"]} + :param apkbuild: looks like: {"pkgname": "linux-...", + "arch": ["x86_64", "armhf", "aarch64"]} or: {"pkgname": "linux-...", "arch": ["armhf"]} """ pkgname = apkbuild["pkgname"] # Multiple architectures (requires --arch) - if "all" in apkbuild["arch"]: + if len(apkbuild["arch"]) > 1: if args.arch is None: raise RuntimeError("Package '" + pkgname + "' supports multiple" " architectures, please use '--arch' to specify"