From d1a33855271c86c3f976eae72355856adaaf3c8e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 6 Sep 2016 22:13:46 -0400 Subject: remove VIRTUAL-RUNTIME_xxx_ctl These variables don't do anything functionally at the moment and the idea is better implemented with a packagegroup anyway. Change-Id: I026989df7a1169d44ff1a532731c97930c95d293 Signed-off-by: Brad Bishop --- .../meta-openpower/conf/machine/include/openpower.inc | 12 ------------ .../packagegroups/packagegroup-obmc-phosphor-apps.bb | 9 --------- meta-phosphor/conf/machine/include/sample.inc | 12 ------------ 3 files changed, 33 deletions(-) diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index 445a916d7..314fdd484 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -7,18 +7,6 @@ OBMC_MACHINE_FEATURES += "\ openpower-pflash \ " -VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \ - skeleton \ - " -VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl = " \ - skeleton \ - " -VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \ - skeleton \ - " -VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \ - skeleton \ - " VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ host-ipmid-oem \ host-ipmid-fru \ diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb index d1777e2e7..d4f636cca 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb @@ -5,11 +5,6 @@ inherit packagegroup inherit obmc-phosphor-utils inherit obmc-phosphor-license -VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl ?= "virtual/obmc-phosphor-fan-ctl" -VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl ?= "virtual/obmc-phosphor-sensor-ctl" -VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl ?= "virtual/obmc-phosphor-chassis-ctl" -VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl ?= "virtual/obmc-phosphor-flash-ctl" - PROVIDES = "${PACKAGES}" PACKAGES = " \ packagegroup-obmc-phosphor-apps-extras \ @@ -38,28 +33,24 @@ SUMMARY_packagegroup-obmc-phosphor-apps-fan-mgmt = "Fan management support" RDEPENDS_packagegroup-obmc-phosphor-apps-fan-mgmt = \ "${@cf_enabled("obmc-phosphor-fan-mgmt", " \ virtual-obmc-fan-mgmt \ - ${VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl} \ ", d)}" SUMMARY_packagegroup-obmc-phosphor-apps-chassis-mgmt = "Chassis management support" RDEPENDS_packagegroup-obmc-phosphor-apps-chassis-mgmt = "\ ${@cf_enabled("obmc-phosphor-chassis-mgmt", " \ virtual-obmc-chassis-mgmt \ - ${VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl} \ ", d)}" SUMMARY_packagegroup-obmc-phosphor-apps-sensor-mgmt = "Sensor management support" RDEPENDS_packagegroup-obmc-phosphor-apps-sensor-mgmt = "\ ${@cf_enabled("obmc-phosphor-sensor-mgmt", " \ virtual-obmc-sensor-mgmt \ - ${VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl} \ ", d)}" SUMMARY_packagegroup-obmc-phosphor-apps-flash-mgmt = "Flash management support" RDEPENDS_packagegroup-obmc-phosphor-apps-flash-mgmt = "\ ${@cf_enabled("obmc-phosphor-flash-mgmt", " \ virtual-obmc-flash-mgmt \ - ${VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl} \ ", d)}" SUMMARY_packagegroup-obmc-phosphor-apps-event-mgmt = "Event management support" diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc index 272f8387e..91c1d66db 100644 --- a/meta-phosphor/conf/machine/include/sample.inc +++ b/meta-phosphor/conf/machine/include/sample.inc @@ -5,18 +5,6 @@ OBMC_MACHINE_FEATURES += "\ obmc-phosphor-flash-mgmt \ " -VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \ - obmc-phosphor-example-sdbus \ - " -VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl = " \ - obmc-phosphor-example-sdbus \ - " -VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \ - obmc-phosphor-example-pydbus \ - " -VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \ - obmc-phosphor-example-pydbus \ - " VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ host-ipmid-oem \ host-ipmid-fru \ -- cgit v1.2.1