diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-02-20 04:45:05 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-02-20 04:49:38 +0300 |
| commit | aef980975e4ed5f11b990decee6903178188a363 (patch) | |
| tree | 9dccce5cd34fc2f9dee45aa1f22d0fe0673756ec /setup | |
| parent | 2f792172a5d898b2e31bfcba2d45ab899c0ff630 (diff) | |
| download | openbmc-aef980975e4ed5f11b990decee6903178188a363.tar.xz | |
setup: skip non-phosphor machines
We already had logic to skip non-phosphor machines in the
'list' operation, but did not skip those machines when targeting
them. Those machines are almost certain to not operate as
expected and in some cases, such as EVB models, we have two
meta-layers associated with the machine. Skipping non-phosphor
machines ensures that the setup script picks the right
configuration and does not attempt to target a machine that won't
work.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: If68c27e2a8675405672df497827dde6e86147108
Diffstat (limited to 'setup')
| -rwxr-xr-x | setup | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -47,6 +47,15 @@ machine() { name=${cfg##*/} name=${name%.conf} tmpl=${cfg%/machine/*.conf} + + # Skip any machines that don't support meta-phosphor. + if [ ! -e $tmpl/bblayers.conf.sample ]; then + continue + fi + if ! grep -q "##OEROOT##/meta-phosphor" $tmpl/bblayers.conf.sample; then + continue + fi + # If a target is specified, then check for a match, # otherwise just list what we've discovered if [ -n "$target" ]; then @@ -62,9 +71,7 @@ machine() { fi return fi - elif test -e $tmpl/bblayers.conf.sample && \ - grep -q "##OEROOT##/meta-phosphor" $tmpl/bblayers.conf.sample; - then + else echo "${name}" fi done |