From: Kai Kang <kai.kang@windriver.com>
Date: Thu, 21 Jul 2016 08:52:58 +0000 (+0800)
Subject: kernel-uimage.bbclass: indeed update var KERNEL_IMAGETYPE_FOR_MAKE
X-Git-Tag: uninative-1.3~184
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=392fc3cd276d5029314c7158245bc65dd82279cd;p=openembedded-core.git

kernel-uimage.bbclass: indeed update var KERNEL_IMAGETYPE_FOR_MAKE

The replace() method of the python string class doesn't replace
in-place, then the var KERNEL_IMAGETYPE_FOR_MAKE doesn't be updated as
design.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass
index 2a187f5492..340503a2d6 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -14,8 +14,7 @@ python __anonymous () {
         if d.getVar("KEEPUIMAGE", True) != 'yes':
             typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE", True) or ""
             if "uImage" in typeformake.split():
-                typeformake.replace('uImage', 'vmlinux')
-            d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake)
+                d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('uImage', 'vmlinux'))
 }
 
 do_uboot_mkimage() {