summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2018-05-02 17:02:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-11 07:49:37 +0100
commit0ef7994fd0e41f413a8f3b9e85d4f98ea6107681 (patch)
tree1c69391ba600166246e23cfd0d59daee32873133 /meta
parentb7fd23f8839ab7e07e8e9b8992c5b106ce0667cd (diff)
downloadpoky-0ef7994fd0e41f413a8f3b9e85d4f98ea6107681.tar.gz
kernel: Permit overriding of KERNEL_IMAGETYPE_FOR_MAKE
Commit a1690131691507bbf5853540229b3ad775b836bf removed the ability of recipes to set KERNEL_IMAGETYPE_FOR_MAKE. Fix that by letting recipes continue to set their own KERNEL_IMAGETYPE_FOR_MAKE if they so wish. They may have been doing so for a while, and don't want to have their carefully-selected value trampled on by kernel.bbclass. This may be required if the recipe itself wants to build one type of kernel, but post-process it into a different type, rather like the vmlinux->vmlinux.gz support provided by kernel.bbclass. (From OE-Core rev: 38abd26fe7de321e0f1fc4895f754f34dee90f6c) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 78d6c30b07..6595a04fb1 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -69,11 +69,12 @@ python __anonymous () {
69 types = (alttype + ' ' + types).strip() 69 types = (alttype + ' ' + types).strip()
70 d.setVar('KERNEL_IMAGETYPES', types) 70 d.setVar('KERNEL_IMAGETYPES', types)
71 71
72 # some commonly used kernel images aren't generated by the kernel build system, such as vmlinux.gz 72 if not d.getVar('KERNEL_IMAGETYPE_FOR_MAKE'):
73 # typeformake lists only valid kernel make targets, and post processing can be done after the kernel 73 # some commonly used kernel images aren't generated by the kernel build system, such as vmlinux.gz
74 # is built (such as using gzip to compress vmlinux) 74 # typeformake lists only valid kernel make targets, and post processing can be done after the kernel
75 typeformake = types.replace('vmlinux.gz', 'vmlinux') 75 # is built (such as using gzip to compress vmlinux)
76 d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake) 76 typeformake = types.replace('vmlinux.gz', 'vmlinux')
77 d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake)
77 78
78 for type in types.split(): 79 for type in types.split():
79 typelower = type.lower() 80 typelower = type.lower()