summaryrefslogtreecommitdiff
path: root/meta-amd/meta-ethanolx/recipes-phosphor
diff options
context:
space:
mode:
authorKonstantin Aladyshev <aladyshev22@gmail.com>2021-09-01 11:34:44 +0300
committerKonstantin Aladyshev <aladyshev22@gmail.com>2021-09-10 16:22:18 +0300
commit2de8c6037ff56bf950c6af048fccc9d07f952387 (patch)
treeb53ae09cfbe48ea3979fe9503029037636c58fad /meta-amd/meta-ethanolx/recipes-phosphor
parentac568e75cc8e194f52a7d7ed2e596f3b9d7e7418 (diff)
downloadopenbmc-2de8c6037ff56bf950c6af048fccc9d07f952387.tar.xz
meta-amd: fix compilation errors with latest Yocto
Make the following changes to fix compilation errors: - add honister to the LAYERSERIES_COMPAT variable, - increase CONF_VERSION to 2, - use new bitbake override syntax Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com> Change-Id: I971f0f0f7110e0350994ced151ca429444885056
Diffstat (limited to 'meta-amd/meta-ethanolx/recipes-phosphor')
-rw-r--r--meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend6
-rw-r--r--meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb4
-rw-r--r--meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend2
-rw-r--r--meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend4
-rw-r--r--meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend4
-rw-r--r--meta-amd/meta-ethanolx/recipes-phosphor/sensors/dbus-sensors_%.bbappend2
-rw-r--r--meta-amd/meta-ethanolx/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend2
7 files changed, 12 insertions, 12 deletions
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend
index 5a287694d..f55bf2390 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-SRC_URI_append = " file://ethanolx-baseboard.json \
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
+SRC_URI:append = " file://ethanolx-baseboard.json \
file://ethanolx-chassis.json"
-do_install_append() {
+do_install:append() {
rm -f ${D}/usr/share/entity-manager/configurations/*.json
install -d ${D}/usr/share/entity-manager/configurations
install -m 0444 ${WORKDIR}/ethanolx-baseboard.json ${D}/usr/share/entity-manager/configurations
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb
index efa208374..c7226ae1f 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb
@@ -24,10 +24,10 @@ do_install() {
${D}${datadir}/${BPN}/ipmi-sensors.yaml
}
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
${datadir}/${BPN}/ipmi-extra-properties.yaml \
${datadir}/${BPN}/ipmi-fru-read.yaml \
${datadir}/${BPN}/ipmi-sensors.yaml \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 66444b9ce..557d268f5 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_ethanolx := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:ethanolx := "${THISDIR}/${PN}:"
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 706e192d2..d92ca4c05 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_ethanolx = " ethanolx-yaml-config"
+DEPENDS:append:ethanolx = " ethanolx-yaml-config"
-EXTRA_OECONF_ethanolx = " \
+EXTRA_OECONF:ethanolx = " \
YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \
PROP_YAML=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-extra-properties.yaml \
"
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 8e60f458e..7d52980c4 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_ethanolx = " ethanolx-yaml-config"
+DEPENDS:append:ethanolx = " ethanolx-yaml-config"
-EXTRA_OECONF_ethanolx = " \
+EXTRA_OECONF:ethanolx = " \
SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-sensors.yaml \
FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \
"
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index 856cf1004..5d88d073e 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG_ethanolx = "\
+PACKAGECONFIG:ethanolx = "\
hwmontempsensor \
fansensor \
psusensor \
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index ae55f69d9..f1c5acabc 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_ethanolx = " boot_type"
+PACKAGECONFIG:append:ethanolx = " boot_type"