From c65b7b4ec3209dd8db5ef42be187149dbd72817b Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Wed, 10 Oct 2018 09:30:59 -0700 Subject: meta-inventec: lanyang: phosphor-ipmi-fru version wildcard Rename phosphor-ipmi-fru%.bbappend to phosphor-ipmi-fru_%.bbappend (From meta-inventec rev: b4f00bcad4a0f8455081348c215d928187d1d0fc) Change-Id: Ib6e6bcfd1c90254a922e853c9cfcbb51ae9f6153 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../ipmi/phosphor-ipmi-fru%.bbappend | 20 -------------------- .../obmc/eeproms/system/chassis/motherboard | 2 -- .../obmc/eeproms/system/chassis/motherboard | 2 ++ .../ipmi/phosphor-ipmi-fru_%.bbappend | 20 ++++++++++++++++++++ 4 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend delete mode 100644 meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard create mode 100644 meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard create mode 100644 meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend (limited to 'meta-inventec') diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend deleted file mode 100644 index efb4828c25..0000000000 --- a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -inherit obmc-phosphor-systemd - -FILESEXTRAPATHS_prepend_lanyang := "${THISDIR}/${PN}:" - -EEPROM_NAMES = "motherboard" - -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}_append_lanyang := " ${@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}_append_lanyang := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard deleted file mode 100644 index 4caa0b3ff6..0000000000 --- a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/0-0055/eeprom -FRUID=55 diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard new file mode 100644 index 0000000000..4caa0b3ff6 --- /dev/null +++ b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/0-0055/eeprom +FRUID=55 diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 0000000000..efb4828c25 --- /dev/null +++ b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,20 @@ +inherit obmc-phosphor-systemd + +FILESEXTRAPATHS_prepend_lanyang := "${THISDIR}/${PN}:" + +EEPROM_NAMES = "motherboard" + +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}_append_lanyang := " ${@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}_append_lanyang := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" -- cgit v1.2.3