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-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb | |
| 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-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb')
| -rw-r--r-- | meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 440829175..804084e1d 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" PR = "r1" PV = "1.0+git${SRCPV}" -inherit autotools \ +inherit meson \ pkgconfig \ obmc-phosphor-dbus-service \ python3native \ @@ -39,11 +39,11 @@ DEPENDS += " \ RDEPENDS:${PN} += "phosphor-state-manager-obmc-targets" -EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN} \ - PS_DERATING_FACTOR=${POWER_SUPPLY_DERATING_FACTOR} \ +EXTRA_OEMESON = " \ + -Dyamldir=${STAGING_DATADIR_NATIVE}/${PN} \ + -Dps-derating-factor=${POWER_SUPPLY_DERATING_FACTOR} \ " -EXTRA_OECONF:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' --enable-i2c-occ', '', d)}" +EXTRA_OEMESON:append = "${@bb.utils.contains('MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" OCC_ENABLE = "enable" OCC_DISABLE = "disable" @@ -91,8 +91,8 @@ RDEPENDS:${PN}:remove:class-nativesdk += "phosphor-state-manager-obmc-targets" # Provide a means to enable/disable install_error_yaml feature PACKAGECONFIG ??= "install_error_yaml" PACKAGECONFIG[install_error_yaml] = "\ - --enable-install_error_yaml,\ - --disable-install_error_yaml,\ + -Dinstall-error-yaml=enabled,\ + -Dinstall-error-yaml=disabled,\ ,\ " |