From 98e4c2167e21dc2a30099ba8749d05ed7674552e Mon Sep 17 00:00:00 2001 From: Kuiying Wang Date: Mon, 28 Jan 2019 18:53:04 +0800 Subject: Enable x86-power-control recipe (From meta-intel rev: fbcd11d0ccbd820d67464782b3ac95e6ed16c211) Change-Id: Ia333dd6385b76e737f236f645cb8657b81290481 Signed-off-by: Kuiying Wang Signed-off-by: Brad Bishop --- .../meta-common/recipes-intel/chassis/x86-power-control_git.bb | 2 +- .../recipes-intel/packagegroups/packagegroup-intel-apps.bb | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb index c74c3a814..fedc8dc10 100755 --- a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb +++ b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb @@ -11,7 +11,7 @@ SRCREV = "80f6d927c220be0e638a0674a986429825a070aa" inherit cmake pkgconfig pythonnative systemd -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power@.service" +SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power@.service" # Force the standby target to run these services SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index 8c0076e8f..d69ea5197 100644 --- a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -23,10 +23,7 @@ RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" SUMMARY_${PN}-chassis = "Intel Chassis" RDEPENDS_${PN}-chassis = " \ - obmc-button-power \ - obmc-button-reset \ - obmc-control-chassis \ - obmc-op-control-power \ + x86-power-control \ obmc-host-failure-reboots \ " -- cgit v1.2.1