From 09ad89864988c0bb83f170d8c1638df2cab01a20 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 6 Sep 2016 22:02:03 -0400 Subject: remove manager classes The value added by these classes is minimal and lowers the flexibility available to clients using them when it comes to packaging. Rename recipe virtuals - obmc-phosphor seems redundant. Align package virtual names with best practices (virtual-package). Change-Id: I34c3cb03f6b1d2aaa734ed02078b388667f70917 Signed-off-by: Brad Bishop --- .../meta-openpower/conf/machine/include/openpower.inc | 16 ++++++++-------- meta-phosphor/classes/obmc-phosphor-chassis-mgmt.bbclass | 4 ---- meta-phosphor/classes/obmc-phosphor-event-mgmt.bbclass | 4 ---- meta-phosphor/classes/obmc-phosphor-fan-mgmt.bbclass | 4 ---- meta-phosphor/classes/obmc-phosphor-flash-mgmt.bbclass | 4 ---- meta-phosphor/classes/obmc-phosphor-host-ipmi-hw.bbclass | 4 ---- meta-phosphor/classes/obmc-phosphor-sensor-mgmt.bbclass | 4 ---- meta-phosphor/classes/obmc-phosphor-system-mgmt.bbclass | 4 ---- meta-phosphor/classes/obmc-phosphor-user-mgmt.bbclass | 4 ---- .../recipes-phosphor/chassis/obmc-phosphor-chassisd.bb | 4 +++- .../recipes-phosphor/events/obmc-phosphor-event.bb | 4 +++- .../common/recipes-phosphor/fans/obmc-phosphor-fand.bb | 4 +++- .../recipes-phosphor/flash/obmc-phosphor-flashd.bb | 4 +++- .../common/recipes-phosphor/host-ipmid/btbridged.bb | 3 ++- .../recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb | 4 +++- .../common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb | 2 +- .../common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb | 2 +- .../recipes-phosphor/host-ipmid/host-ipmid-tool.bb | 2 +- .../common/recipes-phosphor/host-ipmid/host-ipmid.bb | 2 +- .../packagegroups/packagegroup-obmc-phosphor-apps.bb | 14 +++++++------- .../recipes-phosphor/sensors/obmc-phosphor-sensord.bb | 4 +++- .../common/recipes-phosphor/skeleton/skeleton.bb | 15 ++++++++++----- .../common/recipes-phosphor/system/obmc-phosphor-sysd.bb | 4 +++- .../common/recipes-phosphor/users/obmc-phosphor-user.bb | 4 +++- meta-phosphor/conf/machine/include/sample.inc | 16 ++++++++-------- 25 files changed, 63 insertions(+), 73 deletions(-) delete mode 100644 meta-phosphor/classes/obmc-phosphor-chassis-mgmt.bbclass delete mode 100644 meta-phosphor/classes/obmc-phosphor-event-mgmt.bbclass delete mode 100644 meta-phosphor/classes/obmc-phosphor-fan-mgmt.bbclass delete mode 100644 meta-phosphor/classes/obmc-phosphor-flash-mgmt.bbclass delete mode 100644 meta-phosphor/classes/obmc-phosphor-host-ipmi-hw.bbclass delete mode 100644 meta-phosphor/classes/obmc-phosphor-sensor-mgmt.bbclass delete mode 100644 meta-phosphor/classes/obmc-phosphor-system-mgmt.bbclass delete mode 100644 meta-phosphor/classes/obmc-phosphor-user-mgmt.bbclass 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 2ba09aa2f..445a916d7 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -25,11 +25,11 @@ VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ " VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" -PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "btbridged" -PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-event" -PREFERRED_PROVIDER_virtual/obmc-phosphor-fan-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-phosphor-user-mgmt = "obmc-phosphor-user" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "btbridged" +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "skeleton" +PREFERRED_PROVIDER_virtual/obmc-event-mgmt = "obmc-phosphor-event" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "skeleton" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "skeleton" +PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "skeleton" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "skeleton" +PREFERRED_PROVIDER_virtual/obmc-user-mgmt = "obmc-phosphor-user" diff --git a/meta-phosphor/classes/obmc-phosphor-chassis-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-chassis-mgmt.bbclass deleted file mode 100644 index edf18c03f..000000000 --- a/meta-phosphor/classes/obmc-phosphor-chassis-mgmt.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC chassis management. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-chassis-mgmt" -PROVIDES += "virtual/obmc-phosphor-chassis-mgmt" diff --git a/meta-phosphor/classes/obmc-phosphor-event-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-event-mgmt.bbclass deleted file mode 100644 index afab38f23..000000000 --- a/meta-phosphor/classes/obmc-phosphor-event-mgmt.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC event management. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-event-mgmt" -PROVIDES += "virtual/obmc-phosphor-event-mgmt" diff --git a/meta-phosphor/classes/obmc-phosphor-fan-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-fan-mgmt.bbclass deleted file mode 100644 index 2e64773b5..000000000 --- a/meta-phosphor/classes/obmc-phosphor-fan-mgmt.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC fan management. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-fan-mgmt" -PROVIDES += "virtual/obmc-phosphor-fan-mgmt" diff --git a/meta-phosphor/classes/obmc-phosphor-flash-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-flash-mgmt.bbclass deleted file mode 100644 index 4898c2051..000000000 --- a/meta-phosphor/classes/obmc-phosphor-flash-mgmt.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC flash management. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-flash-mgmt" -PROVIDES += "virtual/obmc-phosphor-flash-mgmt" diff --git a/meta-phosphor/classes/obmc-phosphor-host-ipmi-hw.bbclass b/meta-phosphor/classes/obmc-phosphor-host-ipmi-hw.bbclass deleted file mode 100644 index 974c01026..000000000 --- a/meta-phosphor/classes/obmc-phosphor-host-ipmi-hw.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC IPMI HW to DBUS translation. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-host-ipmi-hw" -PROVIDES += "virtual/obmc-phosphor-host-ipmi-hw" diff --git a/meta-phosphor/classes/obmc-phosphor-sensor-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-sensor-mgmt.bbclass deleted file mode 100644 index 0d9982e77..000000000 --- a/meta-phosphor/classes/obmc-phosphor-sensor-mgmt.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC sensor management. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-sensor-mgmt" -PROVIDES += "virtual/obmc-phosphor-sensor-mgmt" diff --git a/meta-phosphor/classes/obmc-phosphor-system-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-system-mgmt.bbclass deleted file mode 100644 index 07c89c472..000000000 --- a/meta-phosphor/classes/obmc-phosphor-system-mgmt.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC system management. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-system-mgmt" -PROVIDES += "virtual/obmc-phosphor-system-mgmt" diff --git a/meta-phosphor/classes/obmc-phosphor-user-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-user-mgmt.bbclass deleted file mode 100644 index 4b82f60b4..000000000 --- a/meta-phosphor/classes/obmc-phosphor-user-mgmt.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC user management. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-user-mgmt" -PROVIDES += "virtual/obmc-phosphor-user-mgmt" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb index d7a8ed998..b02787e54 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb @@ -2,8 +2,10 @@ SUMMARY = "Phosphor OpenBMC Chassis Management" DESCRIPTION = "Phosphor OpenBMC chassis management reference implementation." PR = "r1" -inherit obmc-phosphor-chassis-mgmt inherit obmc-phosphor-pydbus-service +PROVIDES += "virtual/obmc-chassis-mgmt" +RPROVIDES_${PN} += "virtual-obmc-chassis-mgmt" + S = "${WORKDIR}" SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/events/obmc-phosphor-event.bb b/meta-phosphor/common/recipes-phosphor/events/obmc-phosphor-event.bb index bd4d67896..43825f427 100644 --- a/meta-phosphor/common/recipes-phosphor/events/obmc-phosphor-event.bb +++ b/meta-phosphor/common/recipes-phosphor/events/obmc-phosphor-event.bb @@ -5,10 +5,12 @@ PR = "r1" inherit obmc-phosphor-license -inherit obmc-phosphor-event-mgmt inherit obmc-phosphor-dbus-service inherit obmc-phosphor-c-daemon +PROVIDES += "virtual/obmc-event-mgmt" +RPROVIDES_${PN} += "virtual-obmc-event-mgmt" + TARGET_CXXFLAGS += " -std=c++11 -fpic" TARGET_CFLAGS += " -fpic" diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb b/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb index 8c937c6ed..89ab36826 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb +++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb @@ -2,10 +2,12 @@ SUMMARY = "Phosphor OpenBMC Fan Management." DESCRIPTION = "Phosphor OpenBMC fan management reference implementation." PR = "r1" -inherit obmc-phosphor-fan-mgmt inherit obmc-phosphor-sdbus-service inherit obmc-phosphor-c-daemon +PROVIDES += "virtual/obmc-fan-mgmt" +RPROVIDES_${PN} += "virtual-obmc-fan-mgmt" + S = "${WORKDIR}" SRC_URI += "file://Makefile \ file://obmc-phosphor-fand.c \ diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb index 6e4c04a25..64a47a6cd 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb @@ -2,8 +2,10 @@ SUMMARY = "Phosphor OpenBMC Flash Management" DESCRIPTION = "Phosphor OpenBMC flash management reference implementation." PR = "r1" -inherit obmc-phosphor-flash-mgmt inherit obmc-phosphor-pydbus-service +PROVIDES += "virtual/obmc-flash-mgmt" +RPROVIDES_${PN} += "virtual-obmc-flash-mgmt" + S = "${WORKDIR}" SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb index 9ab154014..5bc8fbddb 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb @@ -7,7 +7,8 @@ inherit obmc-phosphor-c-daemon DBUS_SERVICE_${PN} = "org.openbmc.HostIpmi.service" -inherit obmc-phosphor-host-ipmi-hw +PROVIDES += "virtual/obmc-host-ipmi-hw" +RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" DEPENDS += "systemd" RDEPENDS_${PN} += "libsystemd" diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb index 2b27dc16f..069837245 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb @@ -4,7 +4,9 @@ PR = "r1" RDEPENDS_${PN} += "python-subprocess python-dbus python-pygobject" -inherit obmc-phosphor-host-ipmi-hw inherit skeleton-python +PROVIDES += "virtual/obmc-host-ipmi-hw" +RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" + SKELETON_DIR = "pyipmitest" diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb index 0d69af164..533d7ed83 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Phosphor OpenBMC WriteFRU for OpenPOWER based systems" HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser" PR = "r1" -RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw" +RRECOMMENDS_${PN} = "virtual-obmc-host-ipmi-hw" inherit obmc-phosphor-license inherit obmc-phosphor-systemd diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb index 6ddd61fae..e2a23c2ea 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Phosphor OpenBMC IPMI OEM commands for OpenPOWER based systems" HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem" PR = "r1" -RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw" +RRECOMMENDS_${PN} = "virtual-obmc-host-ipmi-hw" inherit obmc-phosphor-license diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb index 2a4d670da..aec28c2af 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/openbmc/ipmitool" PR = "r1" -RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw" +RRECOMMENDS_${PN} = "virtual-obmc-host-ipmi-hw" inherit obmc-phosphor-license diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb index 18e9341ed..ff7f562c6 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Phosphor OpenBMC IPMI router and plugin libraries" HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" PR = "r1" -RRECOMMENDS_${PN} += "virtual/obmc-phosphor-host-ipmi-hw" +RRECOMMENDS_${PN} += "virtual-obmc-host-ipmi-hw" RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers}" 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 8cb078484..d1777e2e7 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 @@ -37,45 +37,45 @@ RDEPENDS_packagegroup-obmc-phosphor-apps-extrasdev = " \ 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-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-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-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-phosphor-flash-mgmt \ + virtual-obmc-flash-mgmt \ ${VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl} \ ", d)}" SUMMARY_packagegroup-obmc-phosphor-apps-event-mgmt = "Event management support" RDEPENDS_packagegroup-obmc-phosphor-apps-event-mgmt = " \ ${@df_enabled("obmc-phosphor-event-mgmt", " \ - virtual/obmc-phosphor-event-mgmt \ + virtual-obmc-event-mgmt \ ", d)}" SUMMARY_packagegroup-obmc-phosphor-apps-user-mgmt = "User management support" RDEPENDS_packagegroup-obmc-phosphor-apps-user-mgmt = " \ ${@df_enabled("obmc-phosphor-user-mgmt", " \ - virtual/obmc-phosphor-user-mgmt \ + virtual-obmc-user-mgmt \ ", d)}" SUMMARY_packagegroup-obmc-phosphor-apps-system-mgmt = "System management support" RDEPENDS_packagegroup-obmc-phosphor-apps-system-mgmt = " \ ${@df_enabled("obmc-phosphor-system-mgmt", " \ - virtual/obmc-phosphor-system-mgmt \ + virtual-obmc-system-mgmt \ ", d)}" diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb b/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb index 7a82fb5bc..513e1647b 100644 --- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb +++ b/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb @@ -2,8 +2,10 @@ SUMMARY = "Phosphor OpenBMC Sensor Management" DESCRIPTION = "Phosphor OpenBMC sensor management reference implementation." PR = "r1" -inherit obmc-phosphor-sensor-mgmt inherit obmc-phosphor-pydbus-service +PROVIDES += "virtual/obmc-sensor-mgmt" +RPROVIDES_${PN} += "virtual-obmc-sensor-mgmt" + S = "${WORKDIR}" SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index 8131417ae..05ac00aef 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -6,11 +6,16 @@ PR = "r1" inherit packagegroup inherit obmc-phosphor-license -inherit obmc-phosphor-chassis-mgmt -inherit obmc-phosphor-fan-mgmt -inherit obmc-phosphor-flash-mgmt -inherit obmc-phosphor-sensor-mgmt -inherit obmc-phosphor-system-mgmt +PROVIDES += "virtual/obmc-chassis-mgmt" +RPROVIDES_${PN} += "virtual-obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-fan-mgmt" +RPROVIDES_${PN} += "virtual-obmc-fan-mgmt" +PROVIDES += "virtual/obmc-flash-mgmt" +RPROVIDES_${PN} += "virtual-obmc-flash-mgmt" +PROVIDES += "virtual/obmc-sensor-mgmt" +RPROVIDES_${PN} += "virtual-obmc-sensor-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" +RPROVIDES_${PN} += "virtual-obmc-system-mgmt" RDEPENDS_${PN} += " \ obmc-button-power \ diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb index bcb5d32ad..7a21c2fe6 100644 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb +++ b/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb @@ -2,8 +2,10 @@ SUMMARY = "Phosphor OpenBMC System Management" DESCRIPTION = "Phosphor OpenBMC system management reference implementation." PR = "r1" -inherit obmc-phosphor-system-mgmt inherit obmc-phosphor-pydbus-service +PROVIDES += "virtual/obmc-system-mgmt" +RPROVIDES_${PN} += "virtual-obmc-system-mgmt" + S = "${WORKDIR}" SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb index 5f63b6209..a30740359 100644 --- a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb +++ b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb @@ -5,9 +5,11 @@ PR = "r1" inherit allarch inherit obmc-phosphor-license -inherit obmc-phosphor-user-mgmt inherit obmc-phosphor-dbus-service +PROVIDES += "virtual/obmc-user-mgmt" +RPROVIDES_${PN} += "virtual-obmc-user-mgmt" + RDEPENDS_${PN} += "python-dbus python-pygobject python-pexpect" SRC_URI += "git://github.com/openbmc/phosphor-networkd" diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc index c10e81bb5..272f8387e 100644 --- a/meta-phosphor/conf/machine/include/sample.inc +++ b/meta-phosphor/conf/machine/include/sample.inc @@ -22,11 +22,11 @@ VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ host-ipmid-fru \ host-ipmid-tool \ " -PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-hw-example" -PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "obmc-phosphor-chassisd" -PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-event" -PREFERRED_PROVIDER_virtual/obmc-phosphor-fan-mgmt = "obmc-phosphor-fand" -PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "obmc-phosphor-flashd" -PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "obmc-phosphor-sensord" -PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "obmc-phosphor-sysd" -PREFERRED_PROVIDER_virtual/obmc-phosphor-user-mgmt = "obmc-phosphor-user" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "host-ipmi-hw-example" +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "obmc-phosphor-chassisd" +PREFERRED_PROVIDER_virtual/obmc-event-mgmt = "obmc-phosphor-event" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "obmc-phosphor-fand" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "obmc-phosphor-flashd" +PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "obmc-phosphor-sensord" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "obmc-phosphor-sysd" +PREFERRED_PROVIDER_virtual/obmc-user-mgmt = "obmc-phosphor-user" -- cgit v1.2.1