[PATCH] kernel: Permit overriding of KERNEL_IMAGETYPE_FOR_MAKE

[PATCH] kernel: Permit overriding of KERNEL_IMAGETYPE_FOR_MAKE

[Mike Crowe]

Commit a1690131691507bbf5853540229b3ad775b836bf removed the ability of
recipes to set KERNEL_IMAGETYPE_FOR_MAKE. This can be fixed by only
setting KERNEL_IMAGETYPE_FOR_MAKE if it doesn't already have a
value. This should hopefully be a good enough approximation to the
behaviour prior to that commit to keep such recipes working.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
 meta/classes/kernel.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5e8b6cf..8d780c3 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -21,7 +21,8 @@ python __anonymous () {
 
     kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
 
-    d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", re.sub(r'\.gz$', '', kerneltype))
+    if not d.getVar("KERNEL_IMAGETYPE_FOR_MAKE", False):
+        d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", re.sub(r'\.gz$', '', kerneltype))
 
     image = d.getVar('INITRAMFS_IMAGE', True)
     if image:
-- 
2.1.4

Re: [PATCH] kernel: Permit overriding of KERNEL_IMAGETYPE_FOR_MAKE

[Phil Blundell]

On Thu, 2015-11-05 at 14:47 +0000, Mike Crowe wrote:
> Commit a1690131691507bbf5853540229b3ad775b836bf removed the ability
> of
> recipes to set KERNEL_IMAGETYPE_FOR_MAKE. This can be fixed by only
> setting KERNEL_IMAGETYPE_FOR_MAKE if it doesn't already have a
> value. This should hopefully be a good enough approximation to the
> behaviour prior to that commit to keep such recipes working.
> 
> Signed-off-by: Mike Crowe <mac@mcrowe.com>

Does anybody know why this patch was not merged?  I couldn't find any
comments on the list.

(It needs adjusting slightly to apply against current master due to
other changes to kernel.bbclass in the meantime.)

thanks

p.

Re: [PATCH] kernel: Permit overriding of KERNEL_IMAGETYPE_FOR_MAKE

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

On 11 October 2016 at 15:04, Phil Blundell <pb@pbcl.net> wrote:

> Does anybody know why this patch was not merged?  I couldn't find any
> comments on the list.
>
> (It needs adjusting slightly to apply against current master due to
> other changes to kernel.bbclass in the meantime.)
>

Slipped through the crack most likely if there were no comments.  Cookie
for anyone who rebase and tests that it works!

Ross

[-- Attachment #2: Type: text/html, Size: 839 bytes --]

[PATCH] kernel: Permit overriding of KERNEL_IMAGETYPE_FOR_MAKE

[Mike Crowe]

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.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
A similar change was originally submitted 2.5 years ago as
https://patchwork.openembedded.org/patch/106849/ but fell through the
cracks.

meta/classes/kernel.bbclass | 11 ++++++-----
 1 file 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 () {
         types = (alttype + ' ' + types).strip()
     d.setVar('KERNEL_IMAGETYPES', types)
 
-    # some commonly used kernel images aren't generated by the kernel build system, such as vmlinux.gz
-    # typeformake lists only valid kernel make targets, and post processing can be done after the kernel
-    # is built (such as using gzip to compress vmlinux)
-    typeformake = types.replace('vmlinux.gz', 'vmlinux')
-    d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake)
+    if not d.getVar('KERNEL_IMAGETYPE_FOR_MAKE'):
+        # some commonly used kernel images aren't generated by the kernel build system, such as vmlinux.gz
+        # typeformake lists only valid kernel make targets, and post processing can be done after the kernel
+        # is built (such as using gzip to compress vmlinux)
+        typeformake = types.replace('vmlinux.gz', 'vmlinux')
+        d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake)
 
     for type in types.split():
         typelower = type.lower()
-- 
2.11.0