diff options
| author |   Joshua Watt <JPEWhacker@gmail.com> | 2021-08-12 15:04:12 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-13 22:43:50 +0100 |
| commit | 0b04ae769d4fad2caaa858803d8fbbbaec689541 (patch) | |
| tree | 182392efefc6837173d5b413b4f839c3a7932f82 | |
| parent | 75d34259a715120be1d023e4fd7b6b4b125f2443 (diff) | |
| download | openembedded-core-0b04ae769d4fad2caaa858803d8fbbbaec689541.tar.gz | |
lib/packagedata: Fix for new overrides
Fix read_subpkgdata_dict to account for the new override operator being
":" instead of "_"
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/packagedata.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py index 22261d271e..0b17897e40 100644 --- a/meta/lib/oe/packagedata.py +++ b/meta/lib/oe/packagedata.py @@ -45,14 +45,14 @@ def read_pkgdata(pn, d): return read_pkgdatafile(fn) # -# Collapse FOO_pkg variables into FOO +# Collapse FOO:pkg variables into FOO # def read_subpkgdata_dict(pkg, d): ret = {} subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d)) for var in subd: - newvar = var.replace("_" + pkg, "") - if newvar == var and var + "_" + pkg in subd: + newvar = var.replace(":" + pkg, "") + if newvar == var and var + ":" + pkg in subd: continue ret[newvar] = subd[var] return ret |