diff options
Diffstat (limited to 'meta-fii/meta-kudo/recipes-phosphor')
14 files changed, 56 insertions, 57 deletions
diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend index 02b9d7c60..ae0d3f5ca 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://blacklist.json \ " -do_install_append_kudo () { +do_install:append:kudo () { install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json } diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend index 9daae7c86..b08aab399 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,24 +1,24 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -RDEPENDS_${PN}_append_kudo = " bash" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +RDEPENDS:${PN}:append:kudo = " bash" # Remove what installed by common recipe OBMC_CONSOLE_HOST_TTY = "" -SYSTEMD_SUBSTITUTIONS_remove_kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" -SYSTEMD_SUBSTITUTIONS_remove_kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" +SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" +SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" # Declare port spcific conf and service files HOST_CONSOLE_TTY = "ttyS1 ttyS3" CONSOLE_CONF_FMT = "file://server.{0}.conf" -SRC_URI_append_kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}" -SRC_URI_append_kudo = " file://${BPN}@.service" -SRC_URI_append_kudo = " file://kudo_uart_mux_ctrl.sh" +SRC_URI:append:kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}" +SRC_URI:append:kudo = " file://${BPN}@.service" +SRC_URI:append:kudo = " file://kudo_uart_mux_ctrl.sh" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ ${PN}@.service \ " -do_install_append() { +do_install:append() { for i in ${HOST_CONSOLE_TTY} do install -m 0644 ${WORKDIR}/server.${i}.conf ${D}${sysconfdir}/${BPN}/server.${i}.conf @@ -35,7 +35,7 @@ do_install_append() { } -pkg_postinst_${PN}_append () { +pkg_postinst:${PN}:append () { systemctl --root=$D enable obmc-console@ttyS1.service systemctl --root=$D enable obmc-console@ttyS3.service } diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 03f391cc1..59b0db26e 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://phosphor-pid-control.service" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +SRC_URI:append:kudo = " file://phosphor-pid-control.service" inherit systemd -SYSTEMD_SERVICE_${PN}_append_kudo = " phosphor-pid-control.service" +SYSTEMD_SERVICE:${PN}:append:kudo = " phosphor-pid-control.service" diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb index c380feba3..f4b04e60b 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb +++ b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb @@ -6,10 +6,10 @@ PR = "r1" inherit systemd DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" S = "${WORKDIR}" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://pwm_init.service \ file://bin/pwm_init.sh \ @@ -17,11 +17,11 @@ SRC_URI += " \ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE_${PN} += "pwm_init.service" +SYSTEMD_SERVICE:${PN} += "pwm_init.service" -FILES_${PN} += "${bindir}/* ${systemd_system_unitdir}/*" +FILES:${PN} += "${bindir}/* ${systemd_system_unitdir}/*" -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 0755 ${S}/bin/* ${D}${bindir}/ install -d ${D}${systemd_system_unitdir} diff --git a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend index 87dc22827..682932a1c 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -1,12 +1,12 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs-binarystore" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-ethstats" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-flash" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-net" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-host" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-host-postd" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-logging" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-sel-logger" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " entity-manager" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " dbus-sensors" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-virtual-sensor" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-blobs" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-blobs-binarystore" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-ethstats" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-flash" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-net" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-host" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-host-postd" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-logging" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-sel-logger" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " entity-manager" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " dbus-sensors" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-virtual-sensor" diff --git a/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend index af0bc3bd6..4dd9dc131 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,4 @@ -EXTRA_OEMESON_append_kudo = " \ +EXTRA_OEMESON:append:kudo = " \ -Dredfish-dump-log=enabled \ -Dredfish-bmc-journal=enabled \ - -Dredfish-allow-deprecated-hostname-patch=enabled \ " diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend index f87ac040f..a1ed74666 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://config.json" -FILES_${PN}_append_kudo = " ${datadir}/binaryblob/config.json" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +SRC_URI:append:kudo = " file://config.json" +FILES:${PN}:append:kudo = " ${datadir}/binaryblob/config.json" -do_install_append_kudo() { +do_install:append:kudo() { install -d ${D}${datadir}/binaryblob/ install ${WORKDIR}/config.json ${D}${datadir}/binaryblob/config.json } diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend index fa9468ac4..e00d74db7 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend @@ -1,3 +1,3 @@ -PACKAGECONFIG_append_kudo = " nuvoton-p2a-mbox net-bridge" +PACKAGECONFIG:append:kudo = " nuvoton-p2a-mbox net-bridge" -IPMI_FLASH_BMC_ADDRESS_kudo = "0xF0848000" +IPMI_FLASH_BMC_ADDRESS:kudo = "0xF0848000" diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 5e0eddc71..da7f376e3 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" #Add sensorhandler.hpp and selutilty.hpp since intel-ipmi-oem requires these libs -do_install_append_kudo(){ +do_install:append:kudo(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host diff --git a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 133159cb4..844a25b8f 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1,2 @@ # Enable threshold, pulse, and watchdog monitoring -PACKAGECONFIG_append_kudo = " log-threshold log-pulse log-watchdog" +PACKAGECONFIG:append:kudo = " log-threshold log-pulse log-watchdog" diff --git a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 43f5f5660..f89f5d9a7 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,17 +1,17 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" inherit systemd -RDEPENDS_${PN} += "bash" -SYSTEMD_SERVICE_${PN}_append_kudo = " tla2024-enable.service" +RDEPENDS:${PN} += "bash" +SYSTEMD_SERVICE:${PN}:append:kudo = " tla2024-enable.service" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://virtual_sensor_config.json \ file://tla2024-enable.service \ file://tla2024-enable.sh \ " -FILES_${PN}_append_kudo = " ${bindir}/tla2024-enable.sh" +FILES:${PN}:append:kudo = " ${bindir}/tla2024-enable.sh" -do_install_append_kudo() { +do_install:append:kudo() { install -d ${D}${datadir}/${PN} install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/${PN}/virtual_sensor_config.json install -m 0755 ${WORKDIR}/tla2024-enable.sh ${D}${bindir}/tla2024-enable.sh diff --git a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 79d7ac0b0..1f559ef91 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}" -SRC_URI_append_kudo = " file://chassis_capabilities.override.yml" +FILESEXTRAPATHS:append:kudo := ":${THISDIR}/${PN}" +SRC_URI:append:kudo = " file://chassis_capabilities.override.yml" diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 533a69a91..889b91091 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}" -SRC_URI_append_kudo = " file://gpio_defs.json" +FILESEXTRAPATHS:append:kudo := ":${THISDIR}/${PN}" +SRC_URI:append:kudo = " file://gpio_defs.json" diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index e795905ab..787ddabc6 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}_remove_kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_SERVICE_${PN}_kudo = " phosphor-watchdog.service \ +SYSTEMD_OVERRIDE_${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE:${PN}:kudo = " phosphor-watchdog.service \ phosphor-watchdog-host-poweroff.service \ phosphor-watchdog-host-cycle.service\ phosphor-watchdog-host-reset.service\ |