summaryrefslogtreecommitdiff
path: root/meta-quanta/meta-olympus-nuvoton/recipes-phosphor
diff options
context:
space:
mode:
Diffstat (limited to 'meta-quanta/meta-olympus-nuvoton/recipes-phosphor')
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb8
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend6
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend22
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb6
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend10
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend10
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend4
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend8
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend8
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend8
-rw-r--r--meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend4
11 files changed, 47 insertions, 47 deletions
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb
index c8b24cb61..34fa0194b 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
inherit allarch
-SRC_URI_olympus-nuvoton = " \
+SRC_URI:olympus-nuvoton = " \
file://olympus-nuvoton-ipmi-fru.yaml \
file://olympus-nuvoton-ipmi-fru-properties.yaml \
file://olympus-nuvoton-ipmi-sensors.yaml \
@@ -13,7 +13,7 @@ SRC_URI_olympus-nuvoton = " \
S = "${WORKDIR}"
-do_install_olympus-nuvoton() {
+do_install:olympus-nuvoton() {
install -m 0644 -D olympus-nuvoton-ipmi-fru-properties.yaml \
${D}${datadir}/${BPN}/ipmi-extra-properties.yaml
install -m 0644 -D olympus-nuvoton-ipmi-fru.yaml \
@@ -22,10 +22,10 @@ do_install_olympus-nuvoton() {
${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-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend
index fe0e34672..5231622da 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:"
-SRC_URI_append_olympus-nuvoton = " file://80-olympus-nuvoton-sol.rules"
+SRC_URI:append:olympus-nuvoton = " file://80-olympus-nuvoton-sol.rules"
-do_install_append_olympus-nuvoton() {
+do_install:append:olympus-nuvoton() {
install -m 0755 -d ${D}${sysconfdir}/${BPN}
rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf
install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index a61181dcb..749a1f23d 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,19 +1,19 @@
-FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:"
-SRC_URI_append_olympus-nuvoton = " file://config-olympus-nuvoton.json"
-SRC_URI_append_olympus-nuvoton = " file://fan-full-speed.sh"
-SRC_URI_append_olympus-nuvoton = " file://phosphor-pid-control.service"
-SRC_URI_append_olympus-nuvoton = " file://fan-reboot-control.service"
+SRC_URI:append:olympus-nuvoton = " file://config-olympus-nuvoton.json"
+SRC_URI:append:olympus-nuvoton = " file://fan-full-speed.sh"
+SRC_URI:append:olympus-nuvoton = " file://phosphor-pid-control.service"
+SRC_URI:append:olympus-nuvoton = " file://fan-reboot-control.service"
-FILES_${PN}_append_olympus-nuvoton = " ${bindir}/fan-full-speed.sh"
-FILES_${PN}_append_olympus-nuvoton = " ${datadir}/swampd/config.json"
+FILES:${PN}:append:olympus-nuvoton = " ${bindir}/fan-full-speed.sh"
+FILES:${PN}:append:olympus-nuvoton = " ${datadir}/swampd/config.json"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
-SYSTEMD_SERVICE_${PN}_append_olympus-nuvoton = " phosphor-pid-control.service"
-SYSTEMD_SERVICE_${PN}_append_olympus-nuvoton = " fan-reboot-control.service"
+SYSTEMD_SERVICE:${PN}:append:olympus-nuvoton = " phosphor-pid-control.service"
+SYSTEMD_SERVICE:${PN}:append:olympus-nuvoton = " fan-reboot-control.service"
-do_install_append_olympus-nuvoton() {
+do_install:append:olympus-nuvoton() {
install -d ${D}/${bindir}
install -m 0755 ${WORKDIR}/fan-full-speed.sh ${D}/${bindir}
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb
index 5d52b9840..b841dc12f 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb
@@ -8,10 +8,10 @@ inherit phosphor-inventory-manager
S = "${WORKDIR}"
-SRC_URI_olympus-nuvoton = "file://inventory-cleanup.yaml"
+SRC_URI:olympus-nuvoton = "file://inventory-cleanup.yaml"
-do_install_olympus-nuvoton() {
+do_install:olympus-nuvoton() {
install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml
}
-FILES_${PN}_olympus-nuvoton += "${base_datadir}/events.d/inventory-cleanup.yaml"
+FILES:${PN}:olympus-nuvoton += "${base_datadir}/events.d/inventory-cleanup.yaml"
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 8ff6178a3..8c19d597a 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
-PACKAGECONFIG_append_olympus-nuvoton = " associations"
-SRC_URI_append_olympus-nuvoton = " file://associations.json"
+FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:"
+PACKAGECONFIG:append:olympus-nuvoton = " associations"
+SRC_URI:append:olympus-nuvoton = " file://associations.json"
-DEPENDS_append_olympus-nuvoton = " olympus-nuvoton-inventory-cleanup"
+DEPENDS:append:olympus-nuvoton = " olympus-nuvoton-inventory-cleanup"
-do_install_append_olympus-nuvoton() {
+do_install:append:olympus-nuvoton() {
install -d ${D}${base_datadir}
install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json
}
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index deec87d31..04f25c1b0 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,10 +1,10 @@
inherit obmc-phosphor-systemd
-FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:"
-DEPENDS_append_olympus-nuvoton = " olympus-nuvoton-yaml-config"
+DEPENDS:append:olympus-nuvoton = " olympus-nuvoton-yaml-config"
-EXTRA_OECONF_olympus-nuvoton = " \
+EXTRA_OECONF:olympus-nuvoton = " \
YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-fru-read.yaml \
PROP_YAML=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-extra-properties.yaml \
"
@@ -17,11 +17,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}"
EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
TMPL = "obmc-read-eeprom@.service"
TGT = "${SYSTEMD_DEFAULT_TARGET}"
INSTFMT = "obmc-read-eeprom@{0}.service"
FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
-SYSTEMD_LINK_${PN}_append_olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
+SYSTEMD_LINK:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 7746e902f..929a61cc0 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_olympus-nuvoton = " olympus-nuvoton-yaml-config"
+DEPENDS:append:olympus-nuvoton = " olympus-nuvoton-yaml-config"
-EXTRA_OECONF_olympus-nuvoton = " \
+EXTRA_OECONF:olympus-nuvoton = " \
SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-sensors.yaml \
FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-fru-read.yaml \
"
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 6feb2be84..24cc76d03 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:"
-SRC_URI_append_olympus-nuvoton = " file://ipmb-olympus-channels.json"
-FILES_${PN}_append_olympus-nuvoton = " ${datadir}/ipmbbridge/ipmb-channels.json"
+SRC_URI:append:olympus-nuvoton = " file://ipmb-olympus-channels.json"
+FILES:${PN}:append:olympus-nuvoton = " ${datadir}/ipmbbridge/ipmb-channels.json"
-do_install_append_olympus-nuvoton() {
+do_install:append:olympus-nuvoton() {
install -d ${D}${datadir}/ipmbbridge
install -m 0644 -D ${WORKDIR}/ipmb-olympus-channels.json \
${D}${datadir}/ipmbbridge/ipmb-channels.json
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
index 2db810195..efca54174 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:"
-SRC_URI_append_olympus-nuvoton = " file://99-ipmi-kcs.rules.rules"
+SRC_URI:append:olympus-nuvoton = " file://99-ipmi-kcs.rules.rules"
-KCS_DEVICE_olympus-nuvoton = "ipmi_kcs1"
+KCS_DEVICE:olympus-nuvoton = "ipmi_kcs1"
-do_install_append_olympus-nuvoton() {
+do_install:append:olympus-nuvoton() {
install -d ${D}/lib/udev/rules.d
install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules.rules ${D}/lib/udev/rules.d
}
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 9b2fe3aa5..54b7ac14f 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:"
ITEMS = " \
@@ -24,7 +24,7 @@ ITEMS = " \
"
ENVS = "obmc/hwmon/ahb/apb/{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
# PECI
PECINAMES = " \
@@ -35,6 +35,6 @@ PECINAMES = " \
PECIITEMSFMT = "devices/platform/ahb/ahb--apb/f0100000.peci-bus/{0}.conf"
PECIITEMS = "${@compose_list(d, 'PECIITEMSFMT', 'PECINAMES')}"
PECIENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}"
-EXTRA_OEMESON_append_olympus-nuvoton = " -Dupdate-functional-on-fail=true"
+EXTRA_OEMESON:append:olympus-nuvoton = " -Dupdate-functional-on-fail=true"
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index f89ecad46..cf2c82107 100644
--- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:"
-SRC_URI_append_olympus-nuvoton = " file://sol-default.override.yml"
+SRC_URI:append:olympus-nuvoton = " file://sol-default.override.yml"