diff options
| author | Kun Yi <kunyi@google.com> | 2017-10-09 23:17:08 -0700 |
|---|---|---|
| committer | Kun Yi <kunyi@google.com> | 2017-10-18 14:18:50 -0700 |
| commit | cdc3b23921bc2804b06abd6812839c84e01cec80 (patch) | |
| tree | 6d3f0b21d4d641b34ca50d044c1f1ff66af94249 /meta-phosphor | |
| parent | 2a595c5906c85313829b026e3c995e59d43d11a2 (diff) | |
| download | talos-openbmc-cdc3b23921bc2804b06abd6812839c84e01cec80.tar.gz talos-openbmc-cdc3b23921bc2804b06abd6812839c84e01cec80.zip | |
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>
Diffstat (limited to 'meta-phosphor')
4 files changed, 4 insertions, 4 deletions
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 9a4630705..7417ec322 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 @@ python do_merge_sensors () { 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)) diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb index 169b54772..a9955fe13 100644 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb @@ -41,7 +41,7 @@ python do_merge_sensor_config () { cmd.append(os.path.join(sensoryamldir, 'config.yaml')) fetch = os.listdir(sensoryamldir) - override_urls = filter(lambda f: f.endswith('-config.yaml'), fetch) + override_urls = [url for url in fetch if url.endswith('-config.yaml')] for url in override_urls: bb.debug(2, 'Merging extra configurations: ' + url) filename = os.path.join(sensoryamldir, url) diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb index 525a9fdff..10938c9e6 100644 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb @@ -48,7 +48,7 @@ python do_merge_settings () { cmd.append(os.path.join(settingsdir, 'defaults.yaml')) fetch = bb.fetch2.Fetch([], d) - override_urls = filter(lambda f: f.endswith('.override.yml'), fetch.urls) + override_urls = [url for url in fetch.urls if url.endswith('.override.yml')] for url in override_urls: bb.debug(2, 'Overriding with source: ' + url) local_base = os.path.basename(fetch.localpath(url)) diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb index 191a389ae..8e94d8f62 100644 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb +++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb @@ -36,7 +36,7 @@ python do_merge_settings () { cmd.append(os.path.join(d.getVar('S', True), 'settings.yaml')) fetch = bb.fetch2.Fetch([], d) - override_urls = filter(lambda f: f.endswith('.override.yml'), fetch.urls) + override_urls = [url for url in fetch.urls if url.endswith('.override.yml')] for url in override_urls: bb.debug(2, 'Overriding with source: ' + url) local_base = os.path.basename(fetch.localpath(url)) |
