From 194ff4f1f5d44b12e9cb06ddafa6adb20174a13c Mon Sep 17 00:00:00 2001
From: Dave Cobbley <david.j.cobbley@linux.intel.com>
Date: Wed, 22 Aug 2018 21:40:54 -0400
Subject: [Subtree] Bring openbmc machines to top level

The new subtree model brings the subtrees up from the openbmc-machines
layer.

Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../recipes-intel/boost-dbus/boost-dbus.bb         | 15 +++++++
 .../libtinyxml2/libtinyxml2_%.bbappend             |  3 ++
 .../packagegroups/packagegroup-intel-apps.bb       | 51 ++++++++++++++++++++++
 .../packagegroups/packagegroup-obmc-apps.bbappend  |  4 ++
 4 files changed, 73 insertions(+)
 create mode 100644 meta-intel/meta-common/recipes-intel/boost-dbus/boost-dbus.bb
 create mode 100644 meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend
 create mode 100644 meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
 create mode 100644 meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend

(limited to 'meta-intel/meta-common/recipes-intel')

diff --git a/meta-intel/meta-common/recipes-intel/boost-dbus/boost-dbus.bb b/meta-intel/meta-common/recipes-intel/boost-dbus/boost-dbus.bb
new file mode 100644
index 000000000..579579b74
--- /dev/null
+++ b/meta-intel/meta-common/recipes-intel/boost-dbus/boost-dbus.bb
@@ -0,0 +1,15 @@
+LICENSE = "BSL-1.0"
+LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
+
+SRC_URI = "gitsm://github.com/openbmc/boost-dbus.git"
+
+PV = "1.0+git${SRCPV}"
+SRCREV = "2ec80375259500c43f5a7c620cb34cd894f7836c"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "dbus boost gtest "
+
+inherit cmake
+
+FILES_${PN}-dev += "${libdir}/cmake/boost-dbus/*"
diff --git a/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend b/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend
new file mode 100644
index 000000000..60cfe5e9d
--- /dev/null
+++ b/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend
@@ -0,0 +1,3 @@
+# update libtinyxml2 to version 6.0.0
+SRCREV = "8c8293ba8969a46947606a93ff0cb5a083aab47a"
+FILES_${PN}-dev += "${libdir}/cmake/tinyxml2/*"
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
new file mode 100644
index 000000000..507f14969
--- /dev/null
+++ b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
@@ -0,0 +1,51 @@
+SUMMARY = "OpenBMC for Intel - Applications"
+PR = "r1"
+
+inherit packagegroup
+inherit obmc-phosphor-license
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = " \
+        ${PN}-chassis \
+        ${PN}-fans \
+        ${PN}-flash \
+        ${PN}-system \
+        "
+
+PROVIDES += "virtual/obmc-chassis-mgmt"
+PROVIDES += "virtual/obmc-fan-mgmt"
+PROVIDES += "virtual/obmc-flash-mgmt"
+PROVIDES += "virtual/obmc-system-mgmt"
+
+RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
+RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
+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 \
+        obmc-host-failure-reboots \
+        "
+
+SUMMARY_${PN}-fans = "Intel Fans"
+RDEPENDS_${PN}-fans = " \
+        obmc-control-fan \
+        "
+
+SUMMARY_${PN}-flash = "Intel Flash"
+RDEPENDS_${PN}-flash = " \
+        obmc-flash-bmc \
+        obmc-mgr-download \
+        obmc-control-bmc \
+        "
+
+SUMMARY_${PN}-system = "Intel System"
+RDEPENDS_${PN}-system = " \
+        obmc-mgr-system \
+        bmcweb \
+        phosphor-webui \
+        "
diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
new file mode 100644
index 000000000..54dc73d75
--- /dev/null
+++ b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
@@ -0,0 +1,4 @@
+RDEPENDS_${PN}-extras_remove = " \
+       phosphor-rest \
+       phosphor-gevent \
+       "
-- 
cgit v1.2.1