diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 14:27:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | 65133015b1cf545a0c86177ce471a0b2b9340d5c (patch) | |
tree | 2d24b99d759e7b7e611217dcc686ae0fe85a671e /meta/lib/oe/classextend.py | |
parent | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (diff) | |
download | poky-65133015b1cf545a0c86177ce471a0b2b9340d5c.tar.gz |
meta: Manual override fixes
The automated conversion of OE-Core to use the new override sytax isn't
perfect. This patches some mis-converted lines and some lines which were missed
by the automation.
(From OE-Core rev: 4e9a06b64b43131b731fb59a0305f78a98e27fbd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/classextend.py')
-rw-r--r-- | meta/lib/oe/classextend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index d3d8fbe724..e08d788b75 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py | |||
@@ -87,7 +87,7 @@ class ClassExtender(object): | |||
87 | def map_depends_variable(self, varname, suffix = ""): | 87 | def map_depends_variable(self, varname, suffix = ""): |
88 | # We need to preserve EXTENDPKGV so it can be expanded correctly later | 88 | # We need to preserve EXTENDPKGV so it can be expanded correctly later |
89 | if suffix: | 89 | if suffix: |
90 | varname = varname + "_" + suffix | 90 | varname = varname + ":" + suffix |
91 | orig = self.d.getVar("EXTENDPKGV", False) | 91 | orig = self.d.getVar("EXTENDPKGV", False) |
92 | self.d.setVar("EXTENDPKGV", "EXTENDPKGV") | 92 | self.d.setVar("EXTENDPKGV", "EXTENDPKGV") |
93 | deps = self.d.getVar(varname) | 93 | deps = self.d.getVar(varname) |
@@ -142,7 +142,7 @@ class ClassExtender(object): | |||
142 | if pkg_mapping[0].startswith("${") and pkg_mapping[0].endswith("}"): | 142 | if pkg_mapping[0].startswith("${") and pkg_mapping[0].endswith("}"): |
143 | continue | 143 | continue |
144 | for subs in variables: | 144 | for subs in variables: |
145 | self.d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs, pkg_mapping[1])) | 145 | self.d.renameVar("%s:%s" % (subs, pkg_mapping[0]), "%s:%s" % (subs, pkg_mapping[1])) |
146 | 146 | ||
147 | class NativesdkClassExtender(ClassExtender): | 147 | class NativesdkClassExtender(ClassExtender): |
148 | def map_depends(self, dep): | 148 | def map_depends(self, dep): |