diff options
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 @@ | |||
1 | inherit linux-kernel-base kernel-module-split | 1 | inherit linux-kernel-base kernel-module-split |
2 | 2 | ||
3 | KERNEL_PACKAGE_NAME ??= "kernel" | 3 | KERNEL_PACKAGE_NAME ??= "kernel" |
4 | KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel") else d.getVar("KERNEL_PACKAGE_NAME", True) }" | 4 | KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" |
5 | 5 | ||
6 | PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel") else "" }" | 6 | PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }" |
7 | DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native" | 7 | DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native" |
8 | PACKAGE_WRITE_DEPS += "depmodwrapper-cross" | 8 | PACKAGE_WRITE_DEPS += "depmodwrapper-cross" |
9 | 9 | ||
@@ -37,8 +37,8 @@ KERNEL_VERSION_PKG_NAME = "${@legitimize_package_name(d.getVar('KERNEL_VERSION') | |||
37 | KERNEL_VERSION_PKG_NAME[vardepvalue] = "${LINUX_VERSION}" | 37 | KERNEL_VERSION_PKG_NAME[vardepvalue] = "${LINUX_VERSION}" |
38 | 38 | ||
39 | python __anonymous () { | 39 | python __anonymous () { |
40 | pn = d.getVar("PN", True) | 40 | pn = d.getVar("PN") |
41 | kpn = d.getVar("KERNEL_PACKAGE_NAME", True) | 41 | kpn = d.getVar("KERNEL_PACKAGE_NAME") |
42 | 42 | ||
43 | # XXX Remove this after bug 11905 is resolved | 43 | # XXX Remove this after bug 11905 is resolved |
44 | # FILES_${KERNEL_PACKAGE_NAME}-dev doesn't expand correctly | 44 | # FILES_${KERNEL_PACKAGE_NAME}-dev doesn't expand correctly |
@@ -52,7 +52,7 @@ python __anonymous () { | |||
52 | # kernel recipes (I.e. where KERNEL_PACKAGE_NAME != kernel) so that they | 52 | # kernel recipes (I.e. where KERNEL_PACKAGE_NAME != kernel) so that they |
53 | # may build in parallel with the default kernel without clobbering. | 53 | # may build in parallel with the default kernel without clobbering. |
54 | if kpn != "kernel": | 54 | if kpn != "kernel": |
55 | workdir = d.getVar("WORKDIR", True) | 55 | workdir = d.getVar("WORKDIR") |
56 | sourceDir = os.path.join(workdir, 'kernel-source') | 56 | sourceDir = os.path.join(workdir, 'kernel-source') |
57 | artifactsDir = os.path.join(workdir, 'kernel-build-artifacts') | 57 | artifactsDir = os.path.join(workdir, 'kernel-build-artifacts') |
58 | d.setVar("STAGING_KERNEL_DIR", sourceDir) | 58 | d.setVar("STAGING_KERNEL_DIR", sourceDir) |
@@ -62,7 +62,7 @@ python __anonymous () { | |||
62 | type = d.getVar('KERNEL_IMAGETYPE') or "" | 62 | type = d.getVar('KERNEL_IMAGETYPE') or "" |
63 | alttype = d.getVar('KERNEL_ALT_IMAGETYPE') or "" | 63 | alttype = d.getVar('KERNEL_ALT_IMAGETYPE') or "" |
64 | types = d.getVar('KERNEL_IMAGETYPES') or "" | 64 | types = d.getVar('KERNEL_IMAGETYPES') or "" |
65 | kname = d.getVar('KERNEL_PACKAGE_NAME', True) or "kernel" | 65 | kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel" |
66 | if type not in types.split(): | 66 | if type not in types.split(): |
67 | types = (type + ' ' + types).strip() | 67 | types = (type + ' ' + types).strip() |
68 | if alttype not in types.split(): | 68 | if alttype not in types.split(): |