diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2017-12-14 13:31:55 -0600 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-01-30 20:37:44 +0000 |
| commit | 0a8ea6354dd6b906f310316315fc49ace110a1ea (patch) | |
| tree | 208ebd0de7c036c3b1d8b5cfe5037e27f4b60eaa /meta-openbmc-machines | |
| parent | 95eaf4978f6f92a848ba53accf02dcb52cee29b6 (diff) | |
| download | talos-openbmc-0a8ea6354dd6b906f310316315fc49ace110a1ea.tar.gz talos-openbmc-0a8ea6354dd6b906f310316315fc49ace110a1ea.zip | |
Use variables for MRW XML filename and path
Create an mrw-xml bbclass that has variables for the
MRW XML filename and path to it. Then, changes all users
of the MRW XML to inherit that class and use those variables.
The filename will default to ${MACHINE}.xml if it hasn't already
been set to something else, such as in a .conf file.
This is done so that the file can be something other than
${MACHINE}.xml.
Change-Id: Ia7021e5a5d5e7946829e58688250aa64250cb00e
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
3 files changed, 6 insertions, 3 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb index aa831a58a..887b74163 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb @@ -5,6 +5,7 @@ inherit native inherit obmc-phosphor-utils inherit obmc-phosphor-license inherit openpower-occ-control +inherit mrw-xml PROVIDES += "virtual/openpower-occ-control-config-native" DEPENDS += "mrw-native mrw-perl-tools-native" @@ -14,6 +15,6 @@ do_install_append() { install -d ${YAML_DEST}/ ${STAGING_BINDIR_NATIVE}/perl-native/perl \ ${STAGING_BINDIR_NATIVE}/gen_occ_map.pl \ - -i ${STAGING_DATADIR_NATIVE}/obmc-mrw/${MACHINE}.xml \ + -i ${mrw_datadir}/${MRW_XML} \ -o ${YAML_DEST}/occ_sensor.yaml } diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb index 01ed362d6..6eb76ac4e 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb @@ -4,6 +4,7 @@ PR = "r1" inherit native inherit obmc-phosphor-license inherit openpower-fru-vpd +inherit mrw-xml DEPENDS += " \ mrw-native \ @@ -21,7 +22,7 @@ do_install() { ${bindir}/perl-native/perl \ ${bindir}/gen_openpower_fru.pl \ - -m ${datadir}/obmc-mrw/${MACHINE}.xml \ + -m ${mrw_datadir}/${MRW_XML} \ -c ${vpdlayout_datadir}/layout.yaml \ -o ${DEST}/inventory } diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb index 71194848d..2dc5820e3 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb @@ -4,6 +4,7 @@ PR = "r1" inherit native inherit obmc-phosphor-license inherit openpower-fru-vpd +inherit mrw-xml SRC_URI += "file://config.yaml" @@ -22,7 +23,7 @@ do_install() { ${bindir}/perl-native/perl \ ${bindir}/gen_fru_properties.pl \ - -m ${datadir}/obmc-mrw/${MACHINE}.xml \ + -m ${mrw_datadir}/${MRW_XML} \ -c config.yaml \ -o ${DEST}/out.yaml } |
