From f2d7b5b2eea864daceaf68c0f6a1527f267064a2 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 15 Jan 2018 19:30:38 -0800 Subject: kernel: drop unnecessary True options from calls to getVar The older style calls (plus a bashism in kernel.bbclass, fixed separately) were introduced via the recent change to add support for multiple kernel packages: http://git.openembedded.org/openembedded-core/commit/?id=6c8c899849d101fd1b86aad0b8eed05c7c785924 (From OE-Core rev: e660ef68de3b3891a26ed6e10d96dc4efaf03ffc) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/kernel-module-split.bbclass | 6 +++--- meta/classes/kernel.bbclass | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass index 73c7f18c78..67ab4161da 100644 --- a/meta/classes/kernel-module-split.bbclass +++ b/meta/classes/kernel-module-split.bbclass @@ -30,7 +30,7 @@ do_install_append() { PACKAGESPLITFUNCS_prepend = "split_kernel_module_packages " -KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME", True) or "kernel" }-modules" +KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or "kernel" }-modules" KERNEL_MODULE_PACKAGE_PREFIX ?= "" KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${KERNEL_VERSION}" @@ -129,8 +129,8 @@ python split_kernel_module_packages () { postfix = format.split('%s')[1] d.setVar('RPROVIDES_' + pkg, pkg.replace(postfix, '')) - kernel_package_name = d.getVar("KERNEL_PACKAGE_NAME", True) or "kernel" - kernel_version = d.getVar("KERNEL_VERSION", True) + kernel_package_name = d.getVar("KERNEL_PACKAGE_NAME") or "kernel" + kernel_version = d.getVar("KERNEL_VERSION") module_regex = '^(.*)\.k?o$' diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 6f01d87004..1ecb840caf 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -1,9 +1,9 @@ inherit linux-kernel-base kernel-module-split KERNEL_PACKAGE_NAME ??= "kernel" -KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel") else d.getVar("KERNEL_PACKAGE_NAME", True) }" +KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" -PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel") else "" }" +PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }" DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native" PACKAGE_WRITE_DEPS += "depmodwrapper-cross" @@ -37,8 +37,8 @@ KERNEL_VERSION_PKG_NAME = "${@legitimize_package_name(d.getVar('KERNEL_VERSION') KERNEL_VERSION_PKG_NAME[vardepvalue] = "${LINUX_VERSION}" python __anonymous () { - pn = d.getVar("PN", True) - kpn = d.getVar("KERNEL_PACKAGE_NAME", True) + pn = d.getVar("PN") + kpn = d.getVar("KERNEL_PACKAGE_NAME") # XXX Remove this after bug 11905 is resolved # FILES_${KERNEL_PACKAGE_NAME}-dev doesn't expand correctly @@ -52,7 +52,7 @@ python __anonymous () { # kernel recipes (I.e. where KERNEL_PACKAGE_NAME != kernel) so that they # may build in parallel with the default kernel without clobbering. if kpn != "kernel": - workdir = d.getVar("WORKDIR", True) + workdir = d.getVar("WORKDIR") sourceDir = os.path.join(workdir, 'kernel-source') artifactsDir = os.path.join(workdir, 'kernel-build-artifacts') d.setVar("STAGING_KERNEL_DIR", sourceDir) @@ -62,7 +62,7 @@ python __anonymous () { type = d.getVar('KERNEL_IMAGETYPE') or "" alttype = d.getVar('KERNEL_ALT_IMAGETYPE') or "" types = d.getVar('KERNEL_IMAGETYPES') or "" - kname = d.getVar('KERNEL_PACKAGE_NAME', True) or "kernel" + kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel" if type not in types.split(): types = (type + ' ' + types).strip() if alttype not in types.split(): -- cgit v1.2.3-54-g00ecf