phosphor-ipmi-fru: rename the bb file
Rename the phosphor-ipmi-fru-properties-example-native to
phosphor-ipmi-fru-properties-native.
Rename the generated out.yaml to extra-properties.yaml.
Change-Id: Id6fc1c6c5d30f58f7dd83305181d2b0372b2fb33
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
index 2188f04..0d250e7 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
@@ -24,5 +24,5 @@
${bindir}/gen_fru_properties.pl \
-m ${datadir}/obmc-mrw/${MACHINE}.xml \
-c config.yaml \
- -o ${DEST}/out.yaml
+ -o ${DEST}/extra-properties.yaml
}
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-example-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
similarity index 84%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-example-native.bb
rename to meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
index 200dcd7..8040f88 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-example-native.bb
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
@@ -5,7 +5,7 @@
inherit obmc-phosphor-license
inherit phosphor-ipmi-fru
-SRC_URI += "file://out.yaml"
+SRC_URI += "file://extra-properties.yaml"
PROVIDES += "virtual/phosphor-ipmi-fru-properties"
@@ -18,5 +18,5 @@
DEST=${D}${properties_datadir}
install -d ${DEST}
- install out.yaml ${DEST}
+ install extra-properties.yaml ${DEST}
}
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-example/out.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-example/out.yaml
rename to meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
index e99d16b..251df42 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
@@ -46,5 +46,5 @@
# For now the generator requires them to already be combined so we have:
EXTRA_OECONF = " \
YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \
- PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/out.yaml \
+ PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \
"
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 06995ba..7e66416 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -98,7 +98,7 @@
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory ?= \
"${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-inventory-mrw-native', 'phosphor-ipmi-fru-inventory-example-native')}"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties ?= \
- "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-properties-mrw-native', 'phosphor-ipmi-fru-properties-example-native')}"
+ "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-properties-mrw-native', 'phosphor-ipmi-fru-properties-native')}"
# The phosphor-led-manager application is data-driven and requires an input
# yaml of LED group and members.