diff options
Diffstat (limited to 'meta-yadro')
-rw-r--r-- | meta-yadro/meta-vesnin/conf/machine/vesnin.conf | 2 | ||||
-rw-r--r-- | meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb | 23 | ||||
-rw-r--r-- | meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml (renamed from meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map/config.yaml) | 0 | ||||
-rw-r--r-- | meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend | 5 | ||||
-rw-r--r-- | meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 5 | ||||
-rw-r--r-- | meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-native.bb | 23 | ||||
-rw-r--r-- | meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-read-native.bb | 25 |
7 files changed, 33 insertions, 50 deletions
diff --git a/meta-yadro/meta-vesnin/conf/machine/vesnin.conf b/meta-yadro/meta-vesnin/conf/machine/vesnin.conf index fc448de86..6ba66faa4 100644 --- a/meta-yadro/meta-vesnin/conf/machine/vesnin.conf +++ b/meta-yadro/meta-vesnin/conf/machine/vesnin.conf @@ -14,8 +14,6 @@ FLASH_SIZE = "32768" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS4" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "vesnin-ipmi-inventory-map-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "vesnin-ipmi-inventory-map-read-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "vesnin-led-manager-config-native" PREFERRED_PROVIDER_virtual/openpower-fru-properties = "vesnin-openpower-fru-properties-native" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "vesnin-openpower-fru-vpd-layout-native" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb new file mode 100644 index 000000000..dc786e562 --- /dev/null +++ b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb @@ -0,0 +1,23 @@ +SUMMARY = "YAML configuration for Vesnin" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit allarch + +SRC_URI = " \ + file://vesnin-ipmi-fru.yaml \ + " + +S = "${WORKDIR}" + +do_install() { + install -m 0644 -D vesnin-ipmi-fru.yaml \ + ${D}${datadir}/${BPN}/ipmi-fru-read.yaml +} + +FILES_${PN}-dev = " \ + ${datadir}/${BPN}/ipmi-fru-read.yaml \ + " + +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map/config.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml index 26c7831b9..26c7831b9 100644 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map/config.yaml +++ b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..3ee4501d7 --- /dev/null +++ b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,5 @@ +DEPENDS_append_vesnin = " vesnin-yaml-config" + +EXTRA_OECONF_vesnin = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/vesnin-yaml-config/ipmi-fru-read.yaml \ + " diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..cf846c7fa --- /dev/null +++ b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,5 @@ +DEPENDS_append_vesnin = " vesnin-yaml-config" + +EXTRA_OECONF_vesnin = " \ + FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/vesnin-yaml-config/ipmi-fru-read.yaml \ + " diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-native.bb deleted file mode 100644 index efea9368a..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-native.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Vesnin IPMI to DBus Inventory mapping." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-fru - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-inventory" - -S = "${WORKDIR}" - -do_install() { - # TODO: install this to inventory_datadir - # after ipmi-fru-parser untangles the host - # firmware config from the machine inventory. - DEST=${D}${config_datadir} - - install -d ${DEST} - install config.yaml ${DEST} -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-read-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-read-native.bb deleted file mode 100644 index e4d3bd509..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-read-native.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Vesnin IPMI to DBus Inventory mapping." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -FILESEXTRAPATHS_prepend := "${THISDIR}/vesnin-ipmi-inventory-map:" - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory" - -S = "${WORKDIR}" - -do_install() { - # TODO: install this to inventory_datadir - # after ipmi-fru-parser untangles the host - # firmware config from the machine inventory. - DEST=${D}${config_datadir} - - install -d ${DEST} - install config.yaml ${DEST} -} |