mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 18:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib/packagedata: Fix for new overrides

Browse Source 
Fix read_subpkgdata_dict to account for the new override operator being
":" instead of "_"

(From OE-Core rev: 0b04ae769d4fad2caaa858803d8fbbbaec689541)

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>
This commit is contained in:
Joshua Watt
2021-08-12 15:04:12 -05:00
committed by Richard Purdie
parent fa6c07bc1a
commit 8a09663e7c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/lib/oe/packagedata.py
View File

@@ -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