From 26f9276925b8c61df02d611156179b99a2359a42 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Tue, 26 Oct 2021 13:58:15 -0700 Subject: x86-power-control: Switch to meson build Change-Id: Ia32f0baf56fb7a3e035198ece7e74fe18f8fa05c Signed-off-by: Jason M. Bills --- meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend | 2 +- .../meta-common/recipes-x86/chassis/x86-power-control_%.bbappend | 2 +- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 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 862f2f179..59f307877 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 b27f9080b..e4d066bc6 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 04fd5dc63..f510f3550 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): -- cgit v1.2.3