summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2021-10-26 23:58:15 +0300
committerPatrick Williams <patrick@stwcx.xyz>2021-12-02 20:52:37 +0300
commit26f9276925b8c61df02d611156179b99a2359a42 (patch)
treeeaca14471fa9e29ef4c1ccdb7276f0a668254dca
parent39d68d4071b8e9b61210e8bbe65d68a9662d0f34 (diff)
downloadopenbmc-26f9276925b8c61df02d611156179b99a2359a42.tar.xz
x86-power-control: Switch to meson build
Change-Id: Ia32f0baf56fb7a3e035198ece7e74fe18f8fa05c Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
-rw-r--r--meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend2
-rw-r--r--meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend2
-rwxr-xr-xmeta-phosphor/recipes-x86/chassis/x86-power-control_git.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend
index 862f2f179c..59f307877d 100644
--- a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend
+++ b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend
@@ -1,5 +1,5 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-EXTRA_OECMAKE += "-DCHASSIS_SYSTEM_RESET=ON"
+EXTRA_OEMESON += "-Dchassis-system-reset=enabled"
SRC_URI:append:yosemitev2 = " file://power-config-host1.json"
SRC_URI:append:yosemitev2 = " file://power-config-host2.json"
diff --git a/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend
index b27f9080bd..e4d066bc6c 100644
--- a/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend
@@ -1,2 +1,2 @@
# Use PLT_RST to detect warm resets
-EXTRA_OECMAKE:intel += "-DUSE_PLT_RST=ON"
+EXTRA_OEMESON:intel += "-Duse-plt-rst=enabled"
diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb
index 04fd5dc63a..f510f35503 100755
--- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb
+++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-inherit cmake systemd
+inherit meson systemd pkgconfig
inherit obmc-phosphor-dbus-service
def get_service(d):