From 19babbc1aacbaa232298a1f86bd1172325a5a89e Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Tue, 17 Jan 2017 09:04:01 -0500
Subject: Rename host-ipmid-fru

This ipmid plugin is a reference implementation, so add phosphor
to the name.

Additionally remove 'host' as this plugin could be used in an
out of band context.

Change-Id: I604f0e57cf9d93ce1baaa6cdd223254d01330a23
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../common/recipes-phosphor/ipmi/host-ipmid-fru.bb | 27 ----------------------
 .../ipmi/host-ipmid-fru/obmc-read-eeprom@.service  | 15 ------------
 .../recipes-phosphor/ipmi/phosphor-ipmi-fru.bb     | 27 ++++++++++++++++++++++
 .../phosphor-ipmi-fru/obmc-read-eeprom@.service    | 15 ++++++++++++
 4 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru.bb
 delete mode 100644 meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru/obmc-read-eeprom@.service
 create mode 100644 meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
 create mode 100644 meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service

(limited to 'meta-phosphor/common/recipes-phosphor/ipmi')

diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru.bb
deleted file mode 100644
index c8dd3f9dc..000000000
--- a/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Phosphor OpenBMC WriteFRU for OpenPOWER systems"
-DESCRIPTION = "Phosphor OpenBMC WriteFRU for  OpenPOWER based systems"
-HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser"
-PR = "r1"
-
-inherit autotools pkgconfig
-inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
-
-DEPENDS += " \
-        systemd \
-        host-ipmid \
-        phosphor-mapper \
-        autoconf-archive-native \
-        "
-
-RDEPENDS_${PN} += "libsystemd"
-
-SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service"
-
-SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
-SRCREV = "ce3490e71f9f91bd20dbb9ac037079de4a3580a8"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/host-ipmid/lib*${SOLIBSDEV} ${libdir}/host-ipmid/*.la"
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru/obmc-read-eeprom@.service b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru/obmc-read-eeprom@.service
deleted file mode 100644
index 95b579148..000000000
--- a/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru/obmc-read-eeprom@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Read %I EEPROM
-Wants=mapper-wait@-org-openbmc-managers-System.service
-After=mapper-wait@-org-openbmc-managers-System.service
-Wants=mapper-wait@-org-openbmc-inventory-%i.service
-After=mapper-wait@-org-openbmc-inventory-%i.service
-
-[Service]
-Restart=no
-Type=oneshot
-EnvironmentFile={envfiledir}/obmc/eeproms/%I
-ExecStart={sbindir}/phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
new file mode 100644
index 000000000..c8dd3f9dc
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Phosphor OpenBMC WriteFRU for OpenPOWER systems"
+DESCRIPTION = "Phosphor OpenBMC WriteFRU for  OpenPOWER based systems"
+HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser"
+PR = "r1"
+
+inherit autotools pkgconfig
+inherit obmc-phosphor-license
+inherit obmc-phosphor-systemd
+
+DEPENDS += " \
+        systemd \
+        host-ipmid \
+        phosphor-mapper \
+        autoconf-archive-native \
+        "
+
+RDEPENDS_${PN} += "libsystemd"
+
+SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service"
+
+SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
+SRCREV = "ce3490e71f9f91bd20dbb9ac037079de4a3580a8"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES_${PN}-dev_append = " ${libdir}/host-ipmid/lib*${SOLIBSDEV} ${libdir}/host-ipmid/*.la"
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
new file mode 100644
index 000000000..95b579148
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Read %I EEPROM
+Wants=mapper-wait@-org-openbmc-managers-System.service
+After=mapper-wait@-org-openbmc-managers-System.service
+Wants=mapper-wait@-org-openbmc-inventory-%i.service
+After=mapper-wait@-org-openbmc-inventory-%i.service
+
+[Service]
+Restart=no
+Type=oneshot
+EnvironmentFile={envfiledir}/obmc/eeproms/%I
+ExecStart={sbindir}/phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
-- 
cgit v1.2.1