diff options
| author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
| commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
| tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /meta-fii/meta-kudo/conf | |
| parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
| parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
| download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz | |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-fii/meta-kudo/conf')
| -rw-r--r-- | meta-fii/meta-kudo/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta-fii/meta-kudo/conf/machine/kudo.conf | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf index d2b0e57e2..09535e909 100644 --- a/meta-fii/meta-kudo/conf/layer.conf +++ b/meta-fii/meta-kudo/conf/layer.conf @@ -8,3 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "kudo-layer" BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/" LAYERSERIES_COMPAT_kudo-layer = "hardknott honister" +LAYERDEPENDS_kudo-layer = "core phosphor-layer google-layer fii-layer" diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 9f64c476b..b53cc46df 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -22,7 +22,7 @@ IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" SERIAL_CONSOLES = "115200;ttyS0" -OBMC_MACHINE_FEATURES += " \ +MACHINE_FEATURES += " \ obmc-host-ipmi \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ @@ -37,4 +37,8 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/bmc-update = "kudo-bmc-update" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-kudo-apps" # Remove unneeded binaries from image -IMAGE_FEATURES:remove = "obmc-health-monitor" +IMAGE_FEATURES:remove = "obmc-health-monitor \ + obmc-fan-control \ + obmc-inventory \ + " + |