From 19babbc1aacbaa232298a1f86bd1172325a5a89e Mon Sep 17 00:00:00 2001 From: Brad Bishop 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 --- .../recipes-phosphor/ipmi/host-ipmid-fru%.bbappend | 18 ------------------ .../obmc/eeproms/system/chassis/hdd_backplane | 2 -- .../obmc/eeproms/system/chassis/io_board | 2 -- .../obmc/eeproms/system/chassis/motherboard | 2 -- .../obmc/eeproms/system/chassis/sas_expander | 2 -- .../recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend | 18 ++++++++++++++++++ .../obmc/eeproms/system/chassis/hdd_backplane | 2 ++ .../obmc/eeproms/system/chassis/io_board | 2 ++ .../obmc/eeproms/system/chassis/motherboard | 2 ++ .../obmc/eeproms/system/chassis/sas_expander | 2 ++ 10 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%.bbappend delete mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/hdd_backplane delete mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/io_board delete mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/motherboard delete mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/sas_expander create mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend create mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/hdd_backplane create mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/io_board create mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard create mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/sas_expander (limited to 'meta-openbmc-machines/meta-openpower/meta-rackspace') diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%.bbappend deleted file mode 100644 index 05e1c09bc..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -EEPROM_NAMES = "io_board motherboard sas_expander hdd_backplane" - -EEPROMFMT = "system/chassis/{0}" -EEPROM_ESCAPEDFMT = "system-chassis-{0}" -EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" -EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" - -ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" - -TMPL = "obmc-read-eeprom@.service" -TGT = "${SYSTEMD_DEFAULT_TARGET}" -INSTFMT = "obmc-read-eeprom@{0}.service" -FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" - -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/hdd_backplane b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/hdd_backplane deleted file mode 100644 index b1ed87587..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/hdd_backplane +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/6-0055/eeprom -FRUID=66 diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/io_board b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/io_board deleted file mode 100644 index 6a11a3d5c..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/io_board +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/0-0050/eeprom -FRUID=64 diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/motherboard b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/motherboard deleted file mode 100644 index ff73090ee..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/motherboard +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/4-0054/eeprom -FRUID=3 diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/sas_expander b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/sas_expander deleted file mode 100644 index 5bc455d66..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/sas_expander +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/6-0051/eeprom -FRUID=65 diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend new file mode 100644 index 000000000..05e1c09bc --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend @@ -0,0 +1,18 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +EEPROM_NAMES = "io_board motherboard sas_expander hdd_backplane" + +EEPROMFMT = "system/chassis/{0}" +EEPROM_ESCAPEDFMT = "system-chassis-{0}" +EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" +EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" + +ENVFMT = "obmc/eeproms/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" + +TMPL = "obmc-read-eeprom@.service" +TGT = "${SYSTEMD_DEFAULT_TARGET}" +INSTFMT = "obmc-read-eeprom@{0}.service" +FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" + +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/hdd_backplane b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/hdd_backplane new file mode 100644 index 000000000..b1ed87587 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/hdd_backplane @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/6-0055/eeprom +FRUID=66 diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/io_board b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/io_board new file mode 100644 index 000000000..6a11a3d5c --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/io_board @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/0-0050/eeprom +FRUID=64 diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard new file mode 100644 index 000000000..ff73090ee --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/4-0054/eeprom +FRUID=3 diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/sas_expander b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/sas_expander new file mode 100644 index 000000000..5bc455d66 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/sas_expander @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/6-0051/eeprom +FRUID=65 -- cgit v1.2.1