build phosphor-hwmon with meson
The repository supports it, so switch it over in bitbake.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I8d96c79b395ee2614ddd869091569f245426c5c7
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index fc565dc..b0631e6 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,5 +1,5 @@
FILESEXTRAPATHS_prepend_ethanolx := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_ethanolx = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_ethanolx = " -Dnegative-errno-on-fail=true"
CHIPS = " \
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index e69b83e..821c9b1 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_mtjade = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_mtjade = " -Dnegative-errno-on-fail=true"
CHIPS_mtjade = " \
bus@1e78a000/i2c-bus@100/tmp175@28 \
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index c7d3bfc..3aba6bb 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_romulus = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_romulus = " -Dnegative-errno-on-fail=true"
CHIPS = " \
bus@1e78a000/i2c-bus@440/w83773g@4c \
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 8841019..c9e7927 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_mihawk = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_mihawk = "-Dnegative-errno-on-fail=true"
SRC_URI_append_ibm-ac-server = " \
file://70-hwmon.rules \
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 3b41663..b856e66 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_fp5280g2= " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_fp5280g2= " -Dnegative-errno-on-fail=true"
CHIPS = " \
bus@1e78a000/i2c-bus@c0/tmp112@48 \
diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 780ffb7..ac03883 100644
--- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_on5263m5= " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_on5263m5= " -Dnegative-errno-on-fail=true"
CHIPS = " \
bus@1e78a000/i2c-bus@1c0/tmp112@48 \
diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 507954d..7a2345e 100644
--- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -2,7 +2,7 @@
#Licensed under BSD-3, see COPYING.BSD file for details."
FILESEXTRAPATHS_prepend_hr630 := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_hr630 = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_hr630 = " -Dnegative-errno-on-fail=true"
CHIPS = " \
bus@1e78a000/i2c-bus@40/tmp75@4e \
diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
index 6958eac..3a11ec7 100644
--- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
@@ -5,14 +5,11 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-inherit autotools pkgconfig
+inherit meson pkgconfig
inherit obmc-phosphor-systemd
PACKAGECONFIG ??= ""
-# Autotools configure option to enable/disable max31785-msl
-PACKAGECONFIG[max31785-msl] = "--enable-max31785-msl, --disable-max31785-msl"
-# Meson configure option to enable/disable max31785-msl
-# PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl=false"
+PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl=false"
PACKAGE_BEFORE_PN = "max31785-msl"
SYSTEMD_PACKAGES = "${PN} max31785-msl"
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index e41607a..9d0fbe2 100644
--- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_f0b = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_f0b = " -Dnegative-errno-on-fail=true"
NAME = " \
bus@1e78a000/i2c-bus@80/tmp421@4c \
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index c779b85..5f0517a 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -32,4 +32,4 @@
SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}"
-EXTRA_OECONF_append_gbs = " --enable-update-functional-on-fail"
+EXTRA_OEMESON_append_gbs = " -Dupdate-functional-on-fail=true"
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 938bfb6..9b2fe3a 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -37,4 +37,4 @@
PECIENVS = "obmc/hwmon/{0}"
SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}"
-EXTRA_OECONF_append_olympus-nuvoton = " --enable-update-functional-on-fail"
+EXTRA_OEMESON_append_olympus-nuvoton = " -Dupdate-functional-on-fail=true"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index cc05c01..89a0b74 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -23,4 +23,4 @@
ENVS = "obmc/hwmon/{0}"
SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}"
-EXTRA_OECONF_append_quanta-q71l = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_quanta-q71l = " -Dnegative-errno-on-fail=true"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 58e0c90..e06afb4 100644
--- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append = " -Dnegative-errno-on-fail=true"
ITEMS = "iio-hwmon-battery.conf"