diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-20 12:55:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-04 23:32:27 +0000 |
| commit | 1b6051e2613332bf6f19a683371e842bcda2115d (patch) | |
| tree | c23a7d3d4887d7c3583f71c2df6cf31c21a5a59e /meta/classes-recipe | |
| parent | ddd6ab4ac7d8972b11dedab0dc37a275ce4d6566 (diff) | |
| download | poky-1b6051e2613332bf6f19a683371e842bcda2115d.tar.gz | |
native: Drop special variable handling
Back when it was merged in https://git.yoctoproject.org/poky/commit/?id=c4257ed8b1040a5a0e9a95846d81961741239116
it appeared special handling in setVar was necessary. Likely due to
other fixes and improvements it no longer appears to be. The results of
"bitbake world -g" before and after this change are identical for oe-core
and meta-openembedded. Therefore drop the "parsing=True" special parameter to
setVar() meaning overrides can now be cleared.
This means that something like:
DEPENDS:append = " bash"
now functions as expected, adding bash to the target recipe and bash-native to
the native BBCLASSEXTENDED version.
Without this change, it would add bash to the native version as well as
bash-native which is clearly incorrect.
[YOCTO #15010]
(From OE-Core rev: 6e307036a130b6b3f7162ca81746a90efb7b30e3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 99a5105f7b5303cd36077b5910c662a865c1782c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
| -rw-r--r-- | meta/classes-recipe/native.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass index 61ad053def..1e94585f3e 100644 --- a/meta/classes-recipe/native.bbclass +++ b/meta/classes-recipe/native.bbclass | |||
| @@ -161,7 +161,7 @@ python native_virtclass_handler () { | |||
| 161 | newdeps.append(dep.replace(pn, bpn) + "-native") | 161 | newdeps.append(dep.replace(pn, bpn) + "-native") |
| 162 | else: | 162 | else: |
| 163 | newdeps.append(dep) | 163 | newdeps.append(dep) |
| 164 | d.setVar(varname, " ".join(newdeps), parsing=True) | 164 | d.setVar(varname, " ".join(newdeps)) |
| 165 | 165 | ||
| 166 | map_dependencies("DEPENDS", e.data, selfref=False) | 166 | map_dependencies("DEPENDS", e.data, selfref=False) |
| 167 | for pkg in e.data.getVar("PACKAGES", False).split(): | 167 | for pkg in e.data.getVar("PACKAGES", False).split(): |
