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:55 +0100 |
commit | 8a09663e7c66de743c0558297f3dcfd27542fa05 (patch) | |
tree | 5d9a89cd298b9864f2815985b54828fe6a7c8cd1 /meta/lib/oe/packagedata.py | |
parent | fa6c07bc1a585f204dbdc28704f61448edb8fdc8 (diff) | |
download | poky-8a09663e7c66de743c0558297f3dcfd27542fa05.tar.gz |
lib/packagedata: Fix for new overrides
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>
Diffstat (limited to 'meta/lib/oe/packagedata.py')
-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): | |||
45 | return read_pkgdatafile(fn) | 45 | return read_pkgdatafile(fn) |
46 | 46 | ||
47 | # | 47 | # |
48 | # Collapse FOO_pkg variables into FOO | 48 | # Collapse FOO:pkg variables into FOO |
49 | # | 49 | # |
50 | def read_subpkgdata_dict(pkg, d): | 50 | def read_subpkgdata_dict(pkg, d): |
51 | ret = {} | 51 | ret = {} |
52 | subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d)) | 52 | subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d)) |
53 | for var in subd: | 53 | for var in subd: |
54 | newvar = var.replace("_" + pkg, "") | 54 | newvar = var.replace(":" + pkg, "") |
55 | if newvar == var and var + "_" + pkg in subd: | 55 | if newvar == var and var + ":" + pkg in subd: |
56 | continue | 56 | continue |
57 | ret[newvar] = subd[var] | 57 | ret[newvar] = subd[var] |
58 | return ret | 58 | return ret |