From 88f28f6685973b657d7312bbe399794455f91bd0 Mon Sep 17 00:00:00 2001
From: Eddie James <eajames@linux.ibm.com>
Date: Wed, 20 Oct 2021 16:41:29 -0500
Subject: openpower: occ: Update recipe for meson build

Adjust various parameters to build the repository with meson.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Change-Id: I27e0fe96efec83646ee8aa8328dd32755d3816ad
---
 .../recipes-phosphor/occ/openpower-occ-control.inc         |  2 +-
 .../recipes-phosphor/occ/openpower-occ-control_git.bb      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'meta-openpower')

diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
index 182cf73e60..db1d06536c 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/openpower-occ-control"
-SRCREV = "379234643e8a9b10ca1b98ddfea1a23e4db01d19"
+SRCREV = "6b234c155431d4a1f721e347deeee0743ec7acb5"
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 4408291756..b78b85bfb9 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('OBMC_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,\
         ,\
         "
 
-- 
cgit v1.2.3