Merge pull request #245 from bradbishop/garrison-firestone
Basic support for Firestone and Garrison systems
diff --git a/common/recipes-phosphor/images/obmc-phosphor-image.bbappend b/common/recipes-phosphor/images/obmc-phosphor-image.bbappend
new file mode 100644
index 0000000..7b8aa6f
--- /dev/null
+++ b/common/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -0,0 +1,3 @@
+IMAGE_INSTALL += " \
+ inventory-upload \
+"
diff --git a/common/recipes-phosphor/inventory-upload/inventory-upload.bb b/common/recipes-phosphor/inventory-upload/inventory-upload.bb
new file mode 100644
index 0000000..8c0bd34
--- /dev/null
+++ b/common/recipes-phosphor/inventory-upload/inventory-upload.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Inventory upload"
+DESCRIPTION = "Inventory upload."
+HOMEPAGE = "http://github.com/openbmc/openpower-inventory-upload"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+
+inherit allarch
+inherit setuptools
+
+RDEPENDS_${PN} += " \
+ pyphosphor \
+ dtc \
+ "
+
+SRC_URI += "git://github.com/openbmc/openpower-inventory-upload"
+
+SRCREV = "5909e7859a1a56bdc902cf774093d9fae29612ea"
+
+S = "${WORKDIR}/git"
diff --git a/conf/layer.conf b/conf/layer.conf
index 46c5a5d..6824543 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -1,8 +1,10 @@
# We have a conf and classes directory, add to BBPATH
BBPATH .= ":${LAYERDIR}"
+# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
${LAYERDIR}/common/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "openpower"
-BBFILE_PATTERN_openpower = ""
+BBFILE_PATTERN_openpower = "^${LAYERDIR}/"
+LAYERVERSION_openpower = "1"