From f69738023046f151dc4370dec8a1b064624e104e Mon Sep 17 00:00:00 2001
From: Patrick Venture <venture@google.com>
Date: Mon, 1 Oct 2018 20:56:22 -0700
Subject: meta-phosphor: ipmi-fru: rename recipe as git

Rename phosphor-ipmi-fru.bb to phosphor-ipmi-fru_git.bb per OE norms.

(From meta-phosphor rev: 6f1857e74d1b4426c3f5ea92b747a3cef1345aae)

Change-Id: I1e42e0cfbee64af3e4a3f6b480795c34e4229bb8
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../recipes-phosphor/ipmi/phosphor-ipmi-fru.bb     | 50 ---------------------
 .../recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb | 51 ++++++++++++++++++++++
 2 files changed, 51 insertions(+), 50 deletions(-)
 delete mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
 create mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb

diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
deleted file mode 100644
index 251df427c..000000000
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-SUMMARY = "Phosphor IPMI Inventory Plugin"
-DESCRIPTION = "A Phosphor IPMI plugin that updates inventory."
-PR = "r1"
-
-inherit autotools pkgconfig
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-ipmiprovider-symlink
-inherit phosphor-ipmi-fru
-inherit pythonnative
-
-require ${PN}.inc
-
-DEPENDS += " \
-        virtual/phosphor-ipmi-fru-hostfw-config\
-        virtual/phosphor-ipmi-fru-inventory \
-        virtual/phosphor-ipmi-fru-properties \
-        systemd \
-        sdbusplus \
-        python-mako-native \
-        python-pyyaml-native \
-        phosphor-ipmi-host \
-        phosphor-mapper \
-        autoconf-archive-native \
-        "
-
-RDEPENDS_${PN} += " \
-        sdbusplus \
-        "
-
-SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service"
-
-S = "${WORKDIR}/git"
-
-HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so"
-
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
-
-# TODO: Fix the the ipmi-fru-parser code generator to handle split
-# host firmware / inventory YAML and replace the OECONF below with:
-#
-# EXTRA_OECONF += "INVENTORY_YAML=${inventory_datadir}/config.yaml"
-# EXTRA_OECONF += "HOSTFW_YAML=${hostfw_datadir}/config.yaml"
-#
-# For now the generator requires them to already be combined so we have:
-EXTRA_OECONF = " \
-             YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \
-             PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \
-             "
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
new file mode 100644
index 000000000..c97e6bba3
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
@@ -0,0 +1,51 @@
+SUMMARY = "Phosphor IPMI Inventory Plugin"
+DESCRIPTION = "A Phosphor IPMI plugin that updates inventory."
+PR = "r1"
+PV = "1.0+git${SRCPV}"
+
+inherit autotools pkgconfig
+inherit obmc-phosphor-systemd
+inherit obmc-phosphor-ipmiprovider-symlink
+inherit phosphor-ipmi-fru
+inherit pythonnative
+
+require ${PN}.inc
+
+DEPENDS += " \
+        virtual/phosphor-ipmi-fru-hostfw-config\
+        virtual/phosphor-ipmi-fru-inventory \
+        virtual/phosphor-ipmi-fru-properties \
+        systemd \
+        sdbusplus \
+        python-mako-native \
+        python-pyyaml-native \
+        phosphor-ipmi-host \
+        phosphor-mapper \
+        autoconf-archive-native \
+        "
+
+RDEPENDS_${PN} += " \
+        sdbusplus \
+        "
+
+SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service"
+
+S = "${WORKDIR}/git"
+
+HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so"
+
+FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+
+# TODO: Fix the the ipmi-fru-parser code generator to handle split
+# host firmware / inventory YAML and replace the OECONF below with:
+#
+# EXTRA_OECONF += "INVENTORY_YAML=${inventory_datadir}/config.yaml"
+# EXTRA_OECONF += "HOSTFW_YAML=${hostfw_datadir}/config.yaml"
+#
+# For now the generator requires them to already be combined so we have:
+EXTRA_OECONF = " \
+             YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \
+             PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \
+             "
-- 
cgit v1.2.1