[OE-core][PATCH] lib/packagedata: Fix for new overrides
From: Joshua Watt <hidden>
Date: 2021-08-12 20:04:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Fix read_subpkgdata_dict to account for the new override operator being ":" instead of "_" Signed-off-by: Joshua Watt <redacted> --- meta/lib/oe/packagedata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index d7914524b5..c6f96d81fd 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
--
2.32.0