[OE-core] [PATCH] kernel-fitimage: avoid duplicated items in KERNEL_IMAGETYPE_FOR_MAKE

liu.ming50 at gmail.com liu.ming50 at gmail.com
Mon Jan 13 21:21:31 UTC 2020


From: Ming Liu <liu.ming50 at gmail.com>

When replacementtype is already in KERNEL_IMAGETYPE_FOR_MAKE, we do not
have to replace fitImage with it again, that will lead to duplicated
items in KERNEL_IMAGETYPE_FOR_MAKE.

Signed-off-by: Ming Liu <liu.ming50 at gmail.com>
---
 meta/classes/kernel-fitimage.bbclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index ec18a3d..acdd679 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -25,8 +25,12 @@ python __anonymous () {
         # to kernel.bbclass . We have to override it, since we pack zImage
         # (at least for now) into the fitImage .
         typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or ""
-        if 'fitImage' in typeformake.split():
-            d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', replacementtype))
+        typeformakelist = typeformake.split()
+        if 'fitImage' in typeformakelist:
+            if replacementtype in typeformakelist:
+                d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', ''))
+            else:
+                d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', replacementtype))
 
         image = d.getVar('INITRAMFS_IMAGE')
         if image:
-- 
2.7.4



More information about the Openembedded-core mailing list