From 0a8ea6354dd6b906f310316315fc49ace110a1ea Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Thu, 14 Dec 2017 13:31:55 -0600 Subject: 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 --- .../recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ') 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 } -- cgit v1.2.3