summaryrefslogtreecommitdiffstats
path: root/meta-phosphor
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@us.ibm.com>2015-10-21 20:24:23 -0400
committerBrad Bishop <bradleyb@us.ibm.com>2015-10-21 20:25:36 -0400
commitc88c37c926c4070c158e2de978b9a558fb0b10d7 (patch)
tree0ee6c4092006a37cab50281889ce663975f4e90e /meta-phosphor
parent5bd1f3da4906c257ce97618c70783ddddac4d7d1 (diff)
downloadtalos-openbmc-c88c37c926c4070c158e2de978b9a558fb0b10d7.tar.gz
talos-openbmc-c88c37c926c4070c158e2de978b9a558fb0b10d7.zip
Remove example applications from build.
They can still be built. Not included in any images. Part 2 of 2 (meta-palmetto, meta-phosphor).
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb1
-rw-r--r--meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb7
-rw-r--r--meta-phosphor/conf/machine/include/sample.inc7
3 files changed, 14 insertions, 1 deletions
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 02fb8d466..4dbcdd37e 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
@@ -26,7 +26,6 @@ SUMMARY_packagegroup-obmc-phosphor-apps-extras = "Extra features"
RDEPENDS_packagegroup-obmc-phosphor-apps-extras = " \
rest-dbus \
host-ipmid \
- skeleton \
"
SUMMARY_packagegroup-obmc-phosphor-apps-fan-mgmt = "Fan management support"
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
index c6369b0d2..57f36f10f 100644
--- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
+++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
@@ -5,6 +5,13 @@ PR = "r1"
inherit obmc-phosphor-license
inherit obmc-phosphor-systemd
+inherit obmc-phosphor-chassis-mgmt
+inherit obmc-phosphor-event-mgmt
+inherit obmc-phosphor-fan-mgmt
+inherit obmc-phosphor-flash-mgmt
+inherit obmc-phosphor-policy-mgmt
+inherit obmc-phosphor-sensor-mgmt
+inherit obmc-phosphor-system-mgmt
DEPENDS += "glib-2.0"
RDEPENDS_${PN} += "python-subprocess python-tftpy"
diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc
index 801706fc6..16e29801f 100644
--- a/meta-phosphor/conf/machine/include/sample.inc
+++ b/meta-phosphor/conf/machine/include/sample.inc
@@ -19,3 +19,10 @@ VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \
"
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-eventd"
+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-policy-mgmt = "obmc-phosphor-policyd"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "obmc-phosphor-sensord"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "obmc-phosphor-sysd"
OpenPOWER on IntegriCloud