diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-02 12:11:06 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-11-03 08:03:58 -0200 |
commit | a5656e55e2a39a20767e939710165841f7f53e03 (patch) | |
tree | fe84b84667e1eb997e4ddd6709f383d8632d8082 /recipes-kernel | |
parent | 7717fe4a8ffd57c85e6c43e8de1fab8993b2bf08 (diff) | |
download | meta-freescale-a5656e55e2a39a20767e939710165841f7f53e03.tar.gz |
linux-mgftool: Fix taskhash changed error
We need to expand KERNEL_VERSION at runtime, not at parse time. The
class extension code can expand variables early so remove the variable
from the datastore temporarily.
Change-Id: Ic0c8c8f62447e8368ce19c2420812f75009a295f
Reported-by: Jun Zhu <junzhu@nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-mfgtool.inc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-mfgtool.inc b/recipes-kernel/linux/linux-mfgtool.inc index 8701aff5..d6a2fa50 100644 --- a/recipes-kernel/linux/linux-mfgtool.inc +++ b/recipes-kernel/linux/linux-mfgtool.inc | |||
@@ -42,6 +42,14 @@ python () { | |||
42 | 42 | ||
43 | from oe.classextend import ClassExtender | 43 | from oe.classextend import ClassExtender |
44 | 44 | ||
45 | # We need to expand KERNEL_VERSION at runtime, not at parse time | ||
46 | # The class extension code can expand variables early so remove | ||
47 | # the variable from the datastore temporarily and then restore | ||
48 | kernver = d.getVar("KERNEL_VERSION", False) | ||
49 | kernverpkgname = d.getVar("KERNEL_VERSION_PKG_NAME", False) | ||
50 | d.delVar("KERNEL_VERSION") | ||
51 | d.delVar("KERNEL_VERSION_PKG_NAME") | ||
52 | |||
45 | class LinuxMfgToolExtender(ClassExtender): | 53 | class LinuxMfgToolExtender(ClassExtender): |
46 | def extend_name(self, name): | 54 | def extend_name(self, name): |
47 | if name.startswith("rtld"): | 55 | if name.startswith("rtld"): |
@@ -63,6 +71,9 @@ python () { | |||
63 | 71 | ||
64 | clsextend.map_packagevars() | 72 | clsextend.map_packagevars() |
65 | clsextend.map_regexp_variable("PACKAGES_DYNAMIC") | 73 | clsextend.map_regexp_variable("PACKAGES_DYNAMIC") |
74 | |||
75 | d.setVar("KERNEL_VERSION", kernver) | ||
76 | d.setVar("KERNEL_VERSION_PKG_NAME", kernverpkgname) | ||
66 | } | 77 | } |
67 | 78 | ||
68 | addhandler mfgtool_recipe_handler | 79 | addhandler mfgtool_recipe_handler |