diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2018-01-15 19:30:38 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-18 23:28:41 +0000 |
| commit | e660ef68de3b3891a26ed6e10d96dc4efaf03ffc (patch) | |
| tree | e510e5925f74b1cf135a57f462f78ef45d29e016 /meta/classes/kernel.bbclass | |
| parent | 7dc7860691304d63e7ad728d2180474906fe0a5c (diff) | |
| download | openembedded-core-contrib-e660ef68de3b3891a26ed6e10d96dc4efaf03ffc.tar.gz | |
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
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/kernel.bbclass')
| -rw-r--r-- | meta/classes/kernel.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
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(): |