| commit | cdc3b23921bc2804b06abd6812839c84e01cec80 | [log] [tgz] |
|---|---|---|
| author | Kun Yi <kunyi@google.com> | Mon Oct 09 23:17:08 2017 -0700 |
| committer | Kun Yi <kunyi@google.com> | Wed Oct 18 14:18:50 2017 -0700 |
| tree | 6d3f0b21d4d641b34ca50d044c1f1ff66af94249 | |
| parent | 2a595c5906c85313829b026e3c995e59d43d11a2 [diff] [blame] |
Fix YAML overriding. bitbake tasks use python3, under which filter() returns a filter object which doesn't enumerate as list. As a result none of the overriding YAMLs takes effect. Use list expansion instead. Discussion for context: https://lists.ozlabs.org/pipermail/openbmc/2017-October/009521.html Fixes openbmc/openbmc#2469. Change-Id: I37cc7fc14b6f91c4eb1fb199d7cff52d93c9ad2a Signed-off-by: Kun Yi <kunyi@google.com>
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb index 9a46307..7417ec3 100644 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
@@ -91,7 +91,7 @@ if os.stat(os.path.join(sensorsdir, 'sensor.yaml')).st_size == 0: return fetch = bb.fetch2.Fetch([], d) - override_urls = filter(lambda f: f.endswith('.hardcoded.yaml'), fetch.urls) + override_urls = [url for url in fetch.urls if url.endswith('.hardcoded.yaml')] for url in override_urls: bb.debug(2, 'Overriding with source: ' + url) local_base = os.path.basename(fetch.localpath(url))