diff options
author | Patrick Venture <venture@google.com> | 2019-01-09 05:23:00 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-10 23:55:36 +0300 |
commit | 61fc73679783ecf1f7470e9367d89ff8637010f4 (patch) | |
tree | 908b99b7723ebc64907afba4ef6165baba11fe49 /meta-ingrasys | |
parent | 794f400a24c4dc271d8be183c4b50849259a6550 (diff) | |
download | openbmc-61fc73679783ecf1f7470e9367d89ff8637010f4.tar.xz |
meta-ingrasys: zaius: add zaius-ipmi-fru-properties
Add zaius-ipmi-fru-properties package instead of appending to
phosphor-ipmi-fru-properties to not drop the zaius file with another
machine that hasn't set an override. The other machine will use the
default file supplied by the default provider.
(From meta-ingrasys rev: 4dd8f1dfde10a79c67d2be020ea2dce27bdde7c8)
Change-Id: Iac04818b3f879d26b0084f49e5c131a9e115a3e8
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ingrasys')
-rw-r--r-- | meta-ingrasys/meta-zaius/conf/machine/zaius.conf | 1 | ||||
-rw-r--r-- | meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend | 1 | ||||
-rw-r--r-- | meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties-native.bb | 19 | ||||
-rw-r--r-- | meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties/extra-properties.yaml (renamed from meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml) | 0 |
4 files changed, 20 insertions, 1 deletions
diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 9b1050a08..b97b5d6f3 100644 --- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -7,6 +7,7 @@ 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" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 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 new file mode 100644 index 000000000..28dc6218e --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties-native.bb @@ -0,0 +1,19 @@ +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/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties/extra-properties.yaml index bfe8e7e30..bfe8e7e30 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-fru-properties/extra-properties.yaml |