diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-06-17 17:06:07 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-06-24 15:05:40 +0300 |
commit | 02a18d036f763eebf4030c2e207654aca59e7805 (patch) | |
tree | d89ac567793fba42f141888e7ae9ea0b2fbe592d /meta-ingrasys | |
parent | 064059ad2a8991079d64bd1fa907084884873220 (diff) | |
download | openbmc-02a18d036f763eebf4030c2e207654aca59e7805.tar.xz |
meta-ingrasys: zaius: new YAML dependency scheme
All the IPMI virtuals and PREFERRED_PROVIDERS in meta-phosphor are in
the process of being deprecated. Prepare for that and move to a simpler
scheme for providing the YAML configuration for Zaius systems.
(From meta-ingrasys rev: a01ad654ff32e8f16ab36033ca1656d6b15bd1a0)
Change-Id: I3d9cd4194d71d994e3f3dcff9a7174d61b2e7c53
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ingrasys')
10 files changed, 43 insertions, 65 deletions
diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 8dfb1d8d4..38713cdf8 100644 --- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -6,9 +6,6 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" FLASH_SIZE = "65536" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control' -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "zaius-ipmi-inventory-map-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "zaius-ipmi-fru-properties-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "zaius-ipmi-sensor-inventory-native" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb new file mode 100644 index 000000000..98dbc15b2 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb @@ -0,0 +1,31 @@ +SUMMARY = "YAML configuration for Zaius" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit allarch + +SRC_URI = " \ + file://zaius-ipmi-fru.yaml \ + file://zaius-ipmi-fru-properties.yaml \ + file://zaius-ipmi-sensors.yaml \ + " + +S = "${WORKDIR}" + +do_install() { + install -m 0644 -D zaius-ipmi-fru-properties.yaml \ + ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml + install -m 0644 -D zaius-ipmi-fru.yaml \ + ${D}${datadir}/${BPN}/ipmi-fru-read.yaml + install -m 0644 -D zaius-ipmi-sensors.yaml \ + ${D}${datadir}/${BPN}/ipmi-sensors.yaml +} + +FILES_${PN}-dev = " \ + ${datadir}/${BPN}/ipmi-extra-properties.yaml \ + ${datadir}/${BPN}/ipmi-fru-read.yaml \ + ${datadir}/${BPN}/ipmi-sensors.yaml \ + " + +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties/extra-properties.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-fru-properties.yaml index bfe8e7e30..bfe8e7e30 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties/extra-properties.yaml +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-fru-properties.yaml diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-fru.yaml index 8b32bd02e..8b32bd02e 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-fru.yaml diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-sensors.yaml index a7f1a7324..a7f1a7324 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config/zaius-ipmi-sensors.yaml diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..fce21406e --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS_append_zaius = " zaius-yaml-config" + +EXTRA_OECONF_zaius = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \ + PROP_YAML=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-extra-properties.yaml \ + " diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..468e2e175 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS_append_zaius = " zaius-yaml-config" + +EXTRA_OECONF_zaius = " \ + SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-sensors.yaml \ + FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \ + " diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties-native.bb deleted file mode 100644 index 28dc6218e..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "FRU properties config for ipmi-fru-parser" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-fru - -SRC_URI += "file://extra-properties.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-properties" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${properties_datadir} - install -d ${DEST} - install extra-properties.yaml ${DEST} -} diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb deleted file mode 100644 index e0ccc28b2..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Zaius IPMI to DBus Inventory mapping." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/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-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory-native.bb deleted file mode 100644 index 438249f82..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Sensor config for phosphor-host-ipmi" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -PROVIDES += "virtual/phosphor-ipmi-sensor-inventory" - -SRC_URI += "file://config.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${sensor_datadir} - install -d ${DEST} - install config.yaml ${DEST}/sensor.yaml -} |