From 8054b1eb9ea51f1946b1f198030637ec37b8a253 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Wed, 10 Oct 2018 09:33:21 -0700 Subject: meta-quanta: q71l: phosphor-ipmi-fru version wildcard Rename phosphor-ipmi-fru%.bbappend to phosphor-ipmi-fru_%.bbappend (From meta-quanta rev: 974b090a71bd1ec530e932be6aca71d0df3dcc87) Change-Id: Ie82abee63b673c14fdbde0461e73b54a10869059 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../ipmi/phosphor-ipmi-fru%.bbappend | 20 -------------------- .../obmc/eeproms/system/chassis/bmc | 2 -- .../obmc/eeproms/system/chassis/fp | 2 -- .../obmc/eeproms/system/chassis/motherboard | 2 -- .../obmc/eeproms/system/chassis/pdb | 2 -- .../obmc/eeproms/system/chassis/bmc | 2 ++ .../phosphor-ipmi-fru/obmc/eeproms/system/chassis/fp | 2 ++ .../obmc/eeproms/system/chassis/motherboard | 2 ++ .../obmc/eeproms/system/chassis/pdb | 2 ++ .../ipmi/phosphor-ipmi-fru_%.bbappend | 20 ++++++++++++++++++++ 10 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/bmc delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/fp delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/pdb create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/fp create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/pdb create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend deleted file mode 100644 index f50949720..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -inherit obmc-phosphor-systemd - -FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:" - -EEPROM_NAMES = "motherboard pdb fp bmc" - -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_quanta-q71l := " ${@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_quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/bmc b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/bmc deleted file mode 100644 index 04040806b..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/bmc +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/8-0050/eeprom -FRUID=50 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/fp b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/fp deleted file mode 100644 index 32e3ef7b8..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/fp +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/1-0057/eeprom -FRUID=57 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard deleted file mode 100644 index b01390ae9..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/1-0054/eeprom -FRUID=56 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/pdb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/pdb deleted file mode 100644 index a08392130..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/pdb +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/7-0052/eeprom -FRUID=52 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc new file mode 100644 index 000000000..04040806b --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/8-0050/eeprom +FRUID=50 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/fp b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/fp new file mode 100644 index 000000000..32e3ef7b8 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/fp @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/1-0057/eeprom +FRUID=57 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard new file mode 100644 index 000000000..b01390ae9 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/1-0054/eeprom +FRUID=56 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/pdb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/pdb new file mode 100644 index 000000000..a08392130 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/pdb @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/7-0052/eeprom +FRUID=52 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..f50949720 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,20 @@ +inherit obmc-phosphor-systemd + +FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:" + +EEPROM_NAMES = "motherboard pdb fp bmc" + +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_quanta-q71l := " ${@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_quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" -- cgit v1.2.3