diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
131 files changed, 661 insertions, 614 deletions
diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index 2fa80e41f..ff874969c 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -13,12 +13,12 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" SRC_URI = "git://github.com/openbmc/bios-settings-mgr" -SRCREV = "5e2cb7206e695662f09c7cb4e0c73ba11686acaa" +SRCREV = "b5984b87eb93f57f8bc2c123717527076a560753" inherit meson pkgconfig systemd S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.biosconfig_manager.service \ +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.biosconfig_manager.service \ xyz.openbmc_project.biosconfig_password.service" DEPENDS = " boost \ diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config.bb index 9fa5f3a0f..1d9f5a3b1 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config.bb @@ -5,26 +5,26 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS_${PN} = "phosphor-certificate-manager" +RDEPENDS:${PN} = "phosphor-certificate-manager" inherit allarch SRC_URI = "file://env" -FILES_${PN} = "${datadir}" +FILES:${PN} = "${datadir}" do_install() { install -D ${WORKDIR}/env ${D}/${datadir}/phosphor-certificate-manager/bmcweb } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@bmcweb.service" TARGET="../phosphor-certificate-manager@.service" mkdir -p $D$systemd_system_unitdir/multi-user.target.wants ln -s $TARGET $LINK } -pkg_prerm_${PN}() { +pkg_prerm:${PN}() { LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@bmcweb.service" rm $LINK } diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index 5a5f1d45e..30730a4e3 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -29,8 +29,8 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--disable-tests" CERT_TMPL = "phosphor-certificate-manager@.service" -SYSTEMD_SERVICE_${PN} = "${CERT_TMPL}" +SYSTEMD_SERVICE:${PN} = "${CERT_TMPL}" PACKAGECONFIG ??= "" PACKAGECONFIG[ibm-hypervisor-cert] = "--enable-ca-cert-extension,," -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'ibm-hypervisor-cert', 'bmc-vmi-ca-manager.service', '', d)}" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'ibm-hypervisor-cert', 'bmc-vmi-ca-manager.service', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config.bb index 07302d657..c847b6d7b 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config.bb @@ -5,26 +5,26 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS_${PN} = "phosphor-certificate-manager" +RDEPENDS:${PN} = "phosphor-certificate-manager" inherit allarch SRC_URI = "file://env" -FILES_${PN} = "${datadir}" +FILES:${PN} = "${datadir}" do_install() { install -D ${WORKDIR}/env ${D}/${datadir}/phosphor-certificate-manager/authority } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@authority.service" TARGET="../phosphor-certificate-manager@.service" mkdir -p $D$systemd_system_unitdir/multi-user.target.wants ln -s $TARGET $LINK } -pkg_prerm_${PN}() { +pkg_prerm:${PN}() { LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@authority.service" rm $LINK } diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb index 5b0c03a65..7b1e26412 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb @@ -5,26 +5,26 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS_${PN} = "phosphor-certificate-manager" +RDEPENDS:${PN} = "phosphor-certificate-manager" inherit allarch SRC_URI = "file://env" -FILES_${PN} = "${datadir}" +FILES:${PN} = "${datadir}" do_install() { install -D ${WORKDIR}/env ${D}/${datadir}/phosphor-certificate-manager/nslcd } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@nslcd.service" TARGET="../phosphor-certificate-manager@.service" mkdir -p $D$systemd_system_unitdir/multi-user.target.wants ln -s $TARGET $LINK } -pkg_prerm_${PN}() { +pkg_prerm:${PN}() { LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@nslcd.service" rm $LINK } diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb index affbccfe9..3c62552c6 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb @@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}" inherit skeleton-python inherit obmc-phosphor-dbus-service -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ python-dbus \ python-pygobject \ python-netclient \ @@ -16,4 +16,4 @@ RDEPENDS_${PN} += "\ SKELETON_DIR = "pychassisctl" FMT = "org.openbmc.control.Chassis@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb index 490a61534..b21440d89 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb @@ -11,5 +11,5 @@ TMPL = "host-failure-reboots@.service" INSTFMT = "host-failure-reboots@{0}.service" LINK_FMT = "${TMPL}:${INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE:${PN} += "${TMPL}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service index c1de92f3b..82b793866 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service @@ -2,6 +2,7 @@ Description=Start Power%i Wants=obmc-power-start@%i.target Before=obmc-power-start@%i.target +Wants=obmc-power-start-pre@%i.target After=obmc-power-start-pre@%i.target After=obmc-fan-control.target Wants=mapper-wait@-org-openbmc-control-power%i.service diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb index 8bae112ae..8e0e38a0c 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb @@ -12,9 +12,9 @@ DEPENDS += "phosphor-mapper systemd" SKELETON_DIR = "op-pwrctl" FMT = "org.openbmc.control.Power@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_INSTANCES')}" +DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += " \ +SYSTEMD_SERVICE:${PN} += " \ op-power-start@.service \ op-wait-power-on@.service \ op-power-stop@.service \ @@ -24,7 +24,7 @@ SYSTEMD_SERVICE_${PN} += " \ op-powered-off@.service \ " -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/power_control" START_TMPL = "op-power-start@.service" START_TGTFMT = "obmc-chassis-poweron@{1}.target" @@ -59,38 +59,38 @@ RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service" RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}" # Build up requires relationship for START_TGTFMT and STOP_TGTFMT -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Now show that the main control target requires these power targets START_TMPL_CTRL = "obmc-chassis-poweron@.target" START_TGTFMT_CTRL = "obmc-host-startmin@{1}.target" START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Chassis off requires host off STOP_TMPL_CTRL = "obmc-host-stop@.target" STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" STOP_INSTFMT_CTRL = "obmc-host-stop@{1}.target" STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" # Hard power off requires chassis off HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" SYSD_TGT = "multi-user.target" RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb index 933d43119..d81780c38 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-buttons.git" -SRCREV = "5ed4cc0f0947e589c430618c29bd474f0fce32b3" +SRCREV = "703c7609353f707f5abb33f4ca726b1803463a92" inherit cmake pkgconfig systemd BUTTON_PACKAGES="${PN}-signals ${PN}-handler" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGE_BEFORE_PN += "${BUTTON_PACKAGES}" PACKAGECONFIG ??= "signals handler" SYSTEMD_PACKAGES = "${BUTTON_PACKAGES}" @@ -21,11 +21,11 @@ SYSTEMD_PACKAGES = "${BUTTON_PACKAGES}" PACKAGECONFIG[signals] = ",,gpioplus nlohmann-json," PACKAGECONFIG[handler] = ",,,phosphor-state-manager-chassis phosphor-state-manager-host" -FILES_${PN}-signals = "${bindir}/buttons" -SYSTEMD_SERVICE_${PN}-signals = "xyz.openbmc_project.Chassis.Buttons.service" +FILES:${PN}-signals = "${bindir}/buttons" +SYSTEMD_SERVICE:${PN}-signals = "xyz.openbmc_project.Chassis.Buttons.service" -FILES_${PN}-handler = "${bindir}/button-handler" -SYSTEMD_SERVICE_${PN}-handler = "phosphor-button-handler.service" +FILES:${PN}-handler = "${bindir}/button-handler" +SYSTEMD_SERVICE:${PN}-handler = "phosphor-button-handler.service" DEPENDS += " \ systemd \ diff --git a/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb b/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb index 4f32a0694..acd0dbb15 100644 --- a/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb +++ b/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb @@ -1,7 +1,7 @@ SUMMARY = "Clear boot-once variables" DESCRIPTION = "Clear u-boot variables used for one-time boot flow" -RDEPENDS_${PN} = "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" +RDEPENDS:${PN} = "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" inherit obmc-phosphor-systemd diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index f9887da38..e07140d11 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "ee70147add704c40e1999900ec8e67d1213729cc" +SRCREV = "e7ac9c9eb1d2e4b052d7f9b082ab4642eab304e9" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" @@ -29,16 +29,16 @@ EXTRA_ENTITY_MANAGER_PACKAGES = " \ PACKAGE_BEFORE_PN = "${EXTRA_ENTITY_MANAGER_PACKAGES}" -do_install_append() { +do_install:append() { install -D ${WORKDIR}/blocklist.json ${D}${datadir}/${BPN}/blacklist.json } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1/system-services/xyz.openbmc_project.EntityManager.service \ " -FILES_fru-device = "${bindir}/fru-device ${datadir}/${BPN}/blacklist.json" +FILES:fru-device = "${bindir}/fru-device ${datadir}/${BPN}/blacklist.json" SYSTEMD_PACKAGES = "${PN} ${EXTRA_ENTITY_MANAGER_PACKAGES}" -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.EntityManager.service" -SYSTEMD_SERVICE_fru-device = "xyz.openbmc_project.FruDevice.service" -SYSTEMD_AUTO_ENABLE_fru-device_ibm-power-cpu = "disable" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.EntityManager.service" +SYSTEMD_SERVICE:fru-device = "xyz.openbmc_project.FruDevice.service" +SYSTEMD_AUTO_ENABLE:fru-device_ibm-power-cpu = "disable" diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 5d6e33351..62efcdb89 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -29,16 +29,16 @@ SRC_URI += "file://${BPN}.conf" SRCREV = "cabd9db06da91ecf2198c1baaf20360d1424c2f3" PV = "1.0+git${SRCPV}" -REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200:" +REGISTERED_SERVICES:${PN} += "obmc_console:tcp:2200:" -SYSTEMD_SERVICE_${PN} += "obmc-console-ssh@.service \ +SYSTEMD_SERVICE:${PN} += "obmc-console-ssh@.service \ obmc-console-ssh.socket \ obmc-console@.service \ " -FILES_${PN} += "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" +FILES:${PN} += "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" -do_install_append() { +do_install:append() { # Install the server configuration install -m 0755 -d ${D}${sysconfdir}/${BPN} if test -f "${WORKDIR}/${BPN}.conf"; then diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb index 503439a77..65f9e3a7b 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -15,13 +15,13 @@ DEPENDS += "sdbusplus" DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces" -RDEPENDS_${PN} += "phosphor-settings-manager" -RDEPENDS_${PN} += "phosphor-network" -RDEPENDS_${PN} += "phosphor-mapper" +RDEPENDS:${PN} += "phosphor-settings-manager" +RDEPENDS:${PN} += "phosphor-network" +RDEPENDS:${PN} += "phosphor-mapper" SRC_URI += "git://github.com/openbmc/phosphor-time-manager" -SRCREV = "9c02e7ec0afff8e9a1cd7ecff6060c85f0ad70b7" +SRCREV = "295b96b743cded8cdba7b0cda59dc1cfe84f64f0" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Time.Manager.service" +DBUS_SERVICE:${PN} += "xyz.openbmc_project.Time.Manager.service" diff --git a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb index b194740d3..ca60b6931 100644 --- a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb +++ b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb @@ -10,7 +10,7 @@ inherit dbus-dir SRC_URI += "file://org.openbmc.conf" -do_install_append() { +do_install:append() { install -d ${D}${dbus_system_confdir} install -m 0644 ${WORKDIR}/org.openbmc.conf \ ${D}${dbus_system_confdir} diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb index 3dfc3b1a6..dda33fa99 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit phosphor-mapper inherit native -PHOSPHOR_MAPPER_SERVICE_append = " xyz.openbmc_project" -PHOSPHOR_MAPPER_INTERFACE_append = " xyz.openbmc_project org.freedesktop.DBus.ObjectManager" +PHOSPHOR_MAPPER_SERVICE:append = " xyz.openbmc_project" +PHOSPHOR_MAPPER_INTERFACE:append = " xyz.openbmc_project org.freedesktop.DBus.ObjectManager" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 98a5c7881..4132585f5 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "5795dacbc5763a0f1d1e1ac59d73baf4ca2ae616" +SRCREV = "6b50623459b54af222cb9a79c5a0c7912c92da41" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true @@ -31,8 +31,8 @@ pdi_meson_config[vardeps] = "OBMC_ORG_YAML_SUBDIRS" # Markdown files are installed into /usr/share/phosphor-dbus-interfaces so # add them to the 'doc' subpackage. -FILES_${PN}-doc += "${datadir}/${BPN}" +FILES:${PN}-doc += "${datadir}/${BPN}" -EXTRA_OEMESON_append = " \ +EXTRA_OEMESON:append = " \ -Db_lto=true \ ${@pdi_meson_config(d)}" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb index d1de054be..dddf9c04c 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb @@ -19,4 +19,4 @@ do_install() { mkdir -p ${D}${config_dir} } -FILES_${PN} += "${config_dir}" +FILES:${PN} += "${config_dir}" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index cc0b5c631..8cc9c089f 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor" -SRCREV = "995060c14f7c017db6ebf3a33d622ff0858b6ba2" +SRCREV = "b839c3ea01044e38b7beb37e8920ccc31f3c6519" inherit autotools \ pkgconfig \ @@ -17,7 +17,7 @@ inherit autotools \ PACKAGE_BEFORE_PN = "phosphor-msl-verify" SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify" -SYSTEMD_SERVICE_phosphor-msl-verify = "phosphor-msl-verify.service" +SYSTEMD_SERVICE:phosphor-msl-verify = "phosphor-msl-verify.service" DEPENDS += " \ ${PN}-config \ @@ -33,7 +33,7 @@ DEPENDS += " \ ${PYTHON_PN}-mako-native \ " -FILES_phosphor-msl-verify = "${bindir}/phosphor-msl-verify" +FILES:phosphor-msl-verify = "${bindir}/phosphor-msl-verify" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb index c92351214..2682ba37c 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit phosphor-mapper inherit native -PHOSPHOR_MAPPER_SERVICE_append = " org.openbmc" -PHOSPHOR_MAPPER_INTERFACE_append = " org.openbmc" +PHOSPHOR_MAPPER_SERVICE:append = " org.openbmc" +PHOSPHOR_MAPPER_INTERFACE:append = " org.openbmc" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index d5e919812..3ea5bffa0 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -6,38 +6,37 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-dbus-service inherit obmc-phosphor-systemd inherit phosphor-mapperdir DEPENDS += "systemd" -DEPENDS += "autoconf-archive-native" DEPENDS += "boost" DEPENDS += "libtinyxml2" DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "${PN}-config-native" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.ObjectMapper.service" -SYSTEMD_SERVICE_${PN} += " \ +DBUS_SERVICE:${PN} += "xyz.openbmc_project.ObjectMapper.service" +SYSTEMD_SERVICE:${PN} += " \ mapper-wait@.service \ mapper-subtree-remove@.service \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr" -SRCREV = "bdaa7f8bb4b34ec4d5f806135364e3ffcc427c0e" +SRCREV = "bedd41655ed9641a9f6c47079e811797869ad8f3" S = "${WORKDIR}/git" -EXTRA_OECONF += "--disable-tests" +EXTRA_OEMESON += "-Dtests=disabled" -python populate_packages_prepend () { +python populate_packages:prepend () { mapperlibdir = d.getVar("libdir", True) do_split_packages(d, mapperlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Phosphor mapper %s library', extra_depends='', allow_links=True) } PACKAGES_DYNAMIC += "^libmapper.*" -FILES_${PN}_remove = "${libdir}/lib*.so.* ${libdir}/*" +FILES:${PN}:remove = "${libdir}/lib*.so.* ${libdir}/*" # Construct a systemd environment file with mapper commandline # from the native sysroot /usr/share/phosphor-mapper filesystem. diff --git a/meta-phosphor/recipes-phosphor/dump/debug-trigger_git.bb b/meta-phosphor/recipes-phosphor/dump/debug-trigger_git.bb index dd28e0f95..fbb41f211 100644 --- a/meta-phosphor/recipes-phosphor/dump/debug-trigger_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/debug-trigger_git.bb @@ -31,4 +31,4 @@ PACKAGECONFIG[triggers] = " \ -Dtriggers=[], \ systemd udev" -SYSTEMD_SERVICE_${PN} += "debug-trigger@.service" +SYSTEMD_SERVICE:${PN} += "debug-trigger@.service" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 5c30040bf..812bc7ac7 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "0eadeb7e78ea549da1c40016c9dc43f52df8b70d" +SRCREV = "52ac69c15277bb3210647017403e7e4eb793e93c" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 41b2370e3..2b7372a22 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -14,7 +14,7 @@ DEBUG_COLLECTOR_PKGS = " \ ${PN}-scripts \ " PACKAGE_BEFORE_PN += "${DEBUG_COLLECTOR_PKGS}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" DBUS_PACKAGES = "${PN}-manager" @@ -41,16 +41,16 @@ DEPENDS += " \ fmt \ " -RDEPENDS_${PN}-manager += " \ +RDEPENDS:${PN}-manager += " \ ${PN}-dreport \ " -RDEPENDS_${PN}-dreport += " \ +RDEPENDS:${PN}-dreport += " \ systemd \ ${VIRTUAL-RUNTIME_base-utils} \ bash \ xz \ " -RDEPENDS_${PN}-scripts += " \ +RDEPENDS:${PN}-scripts += " \ bash \ " @@ -58,19 +58,19 @@ MGR_SVC ?= "xyz.openbmc_project.Dump.Manager.service" SYSTEMD_SUBSTITUTIONS += "BMC_DUMP_PATH:${bmc_dump_path}:${MGR_SVC}" -FILES_${PN}-manager += " \ +FILES:${PN}-manager += " \ ${bindir}/phosphor-dump-manager \ ${exec_prefix}/lib/tmpfiles.d/coretemp.conf \ ${datadir}/dump/ \ " -FILES_${PN}-monitor += "${bindir}/phosphor-dump-monitor" -FILES_${PN}-monitor += "${bindir}/phosphor-ramoops-monitor" -FILES_${PN}-dreport += "${bindir}/dreport" -FILES_${PN}-scripts += "${dreport_dir}" +FILES:${PN}-monitor += "${bindir}/phosphor-dump-monitor" +FILES:${PN}-monitor += "${bindir}/phosphor-ramoops-monitor" +FILES:${PN}-dreport += "${bindir}/dreport" +FILES:${PN}-scripts += "${dreport_dir}" -DBUS_SERVICE_${PN}-manager += "${MGR_SVC}" -SYSTEMD_SERVICE_${PN}-monitor += "obmc-dump-monitor.service" -SYSTEMD_SERVICE_${PN}-monitor += "ramoops-monitor.service" +DBUS_SERVICE:${PN}-manager += "${MGR_SVC}" +SYSTEMD_SERVICE:${PN}-monitor += "obmc-dump-monitor.service" +SYSTEMD_SERVICE:${PN}-monitor += "ramoops-monitor.service" EXTRA_OEMESON = " \ -DBMC_DUMP_PATH=${bmc_dump_path} \ @@ -80,7 +80,7 @@ EXTRA_OEMESON = " \ S = "${WORKDIR}/git" SRC_URI += "file://coretemp.conf" -do_install_append() { +do_install:append() { install -d ${D}${exec_prefix}/lib/tmpfiles.d install -m 644 ${WORKDIR}/coretemp.conf ${D}${exec_prefix}/lib/tmpfiles.d/ } diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb index 0a232c8fa..ea2420363 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb @@ -11,7 +11,7 @@ PROVIDES += "virtual/phosphor-debug-errors" S = "${WORKDIR}" -do_install_append() { +do_install:append() { DEST=${D}${datadir}/dump install -d ${DEST} install errors_watch.yaml ${DEST}/ diff --git a/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb b/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb index 166b58af6..0a73d6e7f 100644 --- a/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb +++ b/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb @@ -12,11 +12,11 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" -RDEPENDS_${PN} += "phosphor-sel-logger" +RDEPENDS:${PN} += "phosphor-sel-logger" SRC_URI = "git://github.com/openbmc/phosphor-ecc.git" SRCREV = "0841f8abf9b38f981d443ecc552cc2b014764bbf" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = " ${PN}.service" +SYSTEMD_SERVICE:${PN} = " ${PN}.service" diff --git a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb index e7d86e4c2..a138f7a37 100644 --- a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb @@ -11,5 +11,5 @@ DEPENDS = "systemd" SKELETON_DIR = "fanctl" -DBUS_SERVICE_${PN} += "org.openbmc.control.Fans.service" -SYSTEMD_SERVICE_${PN} += "obmc-max-fans.service" +DBUS_SERVICE:${PN} += "org.openbmc.control.Fans.service" +SYSTEMD_SERVICE:${PN} += "obmc-max-fans.service" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config.bb index 433ac65c2..7d9fbde75 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config.bb @@ -14,4 +14,4 @@ do_install() { install -D events.yaml ${D}${control_datadir}/events.yaml } -FILES_${PN} += "${control_datadir}/events.yaml" +FILES:${PN} += "${control_datadir}/events.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw.bb index 38a424b69..428c21245 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw.bb @@ -21,4 +21,4 @@ do_install() { install -D fans.yaml ${D}${control_datadir}/fans.yaml } -FILES_${PN} += "${control_datadir}/fans.yaml" +FILES:${PN} += "${control_datadir}/fans.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config.bb index ae3b80ca3..54e6045bf 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config.bb @@ -15,4 +15,4 @@ do_install() { install -D fans.yaml ${D}${control_datadir}/fans.yaml } -FILES_${PN} += "${control_datadir}/fans.yaml" +FILES:${PN} += "${control_datadir}/fans.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bb index 319175343..8d040e1cc 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bb @@ -14,4 +14,4 @@ do_install() { install -D zone_conditions.yaml ${D}${control_datadir}/zone_conditions.yaml } -FILES_${PN} += "${control_datadir}/zone_conditions.yaml" +FILES:${PN} += "${control_datadir}/zone_conditions.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config.bb index 3e47d92d4..e2136f70e 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config.bb @@ -14,4 +14,4 @@ do_install() { install -D zones.yaml ${D}${control_datadir}/zones.yaml } -FILES_${PN} += "${control_datadir}/zones.yaml" +FILES:${PN} += "${control_datadir}/zones.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config.bb index 98604dee6..d49bda495 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config.bb @@ -15,4 +15,4 @@ do_install() { install -D monitor.yaml ${D}${monitor_datadir}/monitor.yaml } -FILES_${PN} += "${monitor_datadir}/monitor.yaml" +FILES:${PN} += "${monitor_datadir}/monitor.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb index 938509cd5..d2df636d4 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb @@ -1,7 +1,7 @@ # Provides the config file for the phosphor-fan-presence application. # The default config file is empty. To provide a real one, # append this recipe in a layer, add: -# FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +# FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # and provide a config file. SUMMARY = "Config file for phosphor-fan-presence" @@ -21,4 +21,4 @@ do_install() { install -D config.yaml ${D}${presence_datadir}/config.yaml } -FILES_${PN} += "${presence_datadir}/config.yaml" +FILES:${PN} += "${presence_datadir}/config.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw.bb index 31b765463..aa0e80798 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw.bb @@ -9,7 +9,7 @@ inherit mrw-xml DEPENDS = "mrw-native mrw-perl-tools-native" PROVIDES += "virtual/phosphor-fan-presence-config" -FILES_${PN} += "${presence_datadir}/config.yaml" +FILES:${PN} += "${presence_datadir}/config.yaml" S = "${WORKDIR}" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index d3ff224ef..d34cef69f 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "de72d5d1342d4b18119d82ffb94b66bd21127757" +SRCREV = "d9ec33a010dfbd7685ded4a4711f13609208fc32" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 708fe4d22..0cf6a5968 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -31,22 +31,24 @@ FAN_PACKAGES = " \ ${PN}-monitor \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGE_BEFORE_PN += "${FAN_PACKAGES}" PACKAGECONFIG ?= "presence control monitor" SYSTEMD_PACKAGES = "${FAN_PACKAGES}" +PKG_DEFAULT_MACHINE ??= "${MACHINE}" +PACKAGE_ARCH = "${MACHINE_ARCH}" # The control, monitor, and presence apps can either be JSON or YAML driven. PACKAGECONFIG[json] = "--enable-json, --disable-json" # -------------------------------------- # ${PN}-presence-tach specific configuration -PACKAGECONFIG[presence] = " \ - --enable-presence \ - PRESENCE_CONFIG=${STAGING_DIR_HOST}${presence_datadir}/config.yaml, \ - --disable-presence, \ - virtual/phosphor-fan-presence-config \ - , \ +PACKAGECONFIG[presence] = "--enable-presence \ + MACHINE=${PKG_DEFAULT_MACHINE} \ + PRESENCE_CONFIG=${STAGING_DIR_HOST}${presence_datadir}/config.yaml, \ + --disable-presence, \ + virtual/phosphor-fan-presence-config \ + , \ " MULTI_USR_TGT = "multi-user.target" @@ -56,21 +58,26 @@ POWERON_TGT = "obmc-chassis-poweron@{0}.target" FMT_TACH = "../${TMPL_TACH}:${POWERON_TGT}.requires/${INSTFMT_TACH}" FMT_TACH_MUSR = "../${TMPL_TACH}:${MULTI_USR_TGT}.wants/${INSTFMT_TACH}" -FILES_${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" -SYSTEMD_SERVICE_${PN}-presence-tach += "${TMPL_TACH}" -SYSTEMD_LINK_${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" +FILES:${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" +SYSTEMD_SERVICE:${PN}-presence-tach += "${TMPL_TACH}" +SYSTEMD_LINK:${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" # JSON mode also gets linked into multi-user -SYSTEMD_LINK_${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_TACH_MUSR', 'OBMC_CHASSIS_INSTANCES'), '', d)}" +# Package the JSON config files installed from the repo +FILES:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + '${datadir}/phosphor-fan-presence/presence/*', '', d)}" + # -------------------------------------- # ${PN}-control specific configuration PACKAGECONFIG[control] = "--enable-control \ - FAN_DEF_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/fans.yaml \ - FAN_ZONE_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zones.yaml \ - ZONE_EVENTS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/events.yaml \ - ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zone_conditions.yaml, \ + MACHINE=${PKG_DEFAULT_MACHINE} \ + FAN_DEF_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/fans.yaml \ + FAN_ZONE_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zones.yaml \ + ZONE_EVENTS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/events.yaml \ + ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zone_conditions.yaml, \ --disable-control, \ virtual/phosphor-fan-control-fan-config \ phosphor-fan-control-zone-config \ @@ -91,23 +98,29 @@ TMPL_CONTROL_INIT = "phosphor-fan-control-init@.service" INSTFMT_CONTROL_INIT = "phosphor-fan-control-init@{0}.service" FMT_CONTROL_INIT = "../${TMPL_CONTROL_INIT}:${POWERON_TGT}.wants/${INSTFMT_CONTROL_INIT}" -FILES_${PN}-control = "${bindir}/phosphor-fan-control" -SYSTEMD_SERVICE_${PN}-control += "${TMPL_CONTROL}" -SYSTEMD_SERVICE_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_CONTROL_INIT}', d)}" +FILES:${PN}-control = "${bindir}/phosphor-fan-control" +FILES:${PN}-control += "${bindir}/fanctl" +SYSTEMD_SERVICE:${PN}-control += "${TMPL_CONTROL}" +SYSTEMD_SERVICE:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_CONTROL_INIT}', d)}" # JSON: Linked to multi-user and poweron # YAML: Linked to fans-ready and fan control-init poweron -SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES'), d)}" -SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" +# Package the JSON config files installed from the repo +FILES:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + '${datadir}/phosphor-fan-presence/control/*', '', d)}" + # -------------------------------------- # ${PN}-monitor specific configuration PACKAGECONFIG[monitor] = "--enable-monitor \ - FAN_MONITOR_YAML_FILE=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml, \ + MACHINE=${PKG_DEFAULT_MACHINE} \ + FAN_MONITOR_YAML_FILE=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml, \ --disable-monitor, \ phosphor-fan-monitor-config \ , \ @@ -123,19 +136,23 @@ TMPL_MONITOR_INIT = "phosphor-fan-monitor-init@.service" INSTFMT_MONITOR_INIT = "phosphor-fan-monitor-init@{0}.service" FMT_MONITOR_INIT = "../${TMPL_MONITOR_INIT}:${POWERON_TGT}.wants/${INSTFMT_MONITOR_INIT}" -FILES_${PN}-monitor = "${bindir}/phosphor-fan-monitor" -SYSTEMD_SERVICE_${PN}-monitor += "${TMPL_MONITOR}" -SYSTEMD_SERVICE_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_MONITOR_INIT}', d)}" +FILES:${PN}-monitor = "${bindir}/phosphor-fan-monitor" +SYSTEMD_SERVICE:${PN}-monitor += "${TMPL_MONITOR}" +SYSTEMD_SERVICE:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_MONITOR_INIT}', d)}" # JSON: power on and multi-user links. YAML: fans-ready and fan monitor init links -SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_FANSREADY', 'OBMC_CHASSIS_INSTANCES'), d)}" -SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" +# Package the JSON config files installed from the repo +FILES:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + '${datadir}/phosphor-fan-presence/monitor/*', '', d)}" + # -------------------------------------- # phosphor-cooling-type specific configuration PACKAGECONFIG[cooling-type] = "--enable-cooling-type,--disable-cooling-type,," @@ -144,6 +161,6 @@ PACKAGECONFIG[cooling-type] = "--enable-cooling-type,--disable-cooling-type,," # ${PN}-sensor-monitor specific configuration PACKAGECONFIG[sensor-monitor] = "--enable-sensor-monitor, --disable-sensor-monitor" -FILES_sensor-monitor += " ${bindir}/sensor-monitor" -SYSTEMD_SERVICE_sensor-monitor += "sensor-monitor.service" -SYSTEMD_LINK_sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" +FILES:sensor-monitor += " ${bindir}/sensor-monitor" +SYSTEMD_SERVICE:sensor-monitor += "sensor-monitor.service" +SYSTEMD_LINK:sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 719538ebd..ec0bcb484 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -34,20 +34,20 @@ DEPENDS += "phosphor-ipmi-host" SERVICE_FILE = "phosphor-pid-control.service" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "${SERVICE_FILE}" +SYSTEMD_SERVICE:${PN} = "${SERVICE_FILE}" EXTRA_OECONF = " \ SYSTEMD_TARGET="multi-user.target" \ --disable-tests \ " -FILES_${PN} = "${bindir}/swampd ${bindir}/setsensor" +FILES:${PN} = "${bindir}/swampd ${bindir}/setsensor" # The following installs the OEM IPMI handler for the fan controls. -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" HOSTIPMI_PROVIDER_LIBRARY += "libmanualcmds.so" diff --git a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb index 503e836a8..4fa3ff73f 100644 --- a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb +++ b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb @@ -8,9 +8,9 @@ SRC_URI += "file://noverify-bmc-update.service" SRC_URI += "file://noverify-bmc-verify.service" SRC_URI += "file://config-bmc.json" -SYSTEMD_SERVICE_${PN} += "noverify-bmc-update.service" -SYSTEMD_SERVICE_${PN} += "noverify-bmc-verify.service" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" +SYSTEMD_SERVICE:${PN} += "noverify-bmc-update.service" +SYSTEMD_SERVICE:${PN} += "noverify-bmc-verify.service" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" do_install() { install -d ${D}${datadir}/phosphor-ipmi-flash diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb index 8ecc04237..d5e24a3d0 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb @@ -10,5 +10,5 @@ inherit obmc-phosphor-dbus-service inherit pkgconfig SKELETON_DIR = "flashbios" -DBUS_SERVICE_${PN} += "org.openbmc.control.Flash.service" -SYSTEMD_SERVICE_${PN} += "obmc-flash-init.service" +DBUS_SERVICE:${PN} += "org.openbmc.control.Flash.service" +SYSTEMD_SERVICE:${PN} += "obmc-flash-init.service" diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb index 0a500f420..cd2b55581 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb @@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}" inherit skeleton-python inherit obmc-phosphor-dbus-service -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ python-dbus \ python-compression \ python-shell \ @@ -17,4 +17,4 @@ RDEPENDS_${PN} += "\ " SKELETON_DIR = "pyflashbmc" -DBUS_SERVICE_${PN} += "org.openbmc.control.BmcFlash.service" +DBUS_SERVICE:${PN} += "org.openbmc.control.BmcFlash.service" diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb index 6a6242037..a6cd66058 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb @@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}" inherit skeleton-python inherit obmc-phosphor-dbus-service -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ python-dbus \ python-pygobject \ python-subprocess \ @@ -14,4 +14,4 @@ RDEPENDS_${PN} += "\ " SKELETON_DIR = "pydownloadmgr" -DBUS_SERVICE_${PN} += "org.openbmc.managers.Download.service" +DBUS_SERVICE:${PN} += "org.openbmc.managers.Download.service" diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb index fe9473f6b..8c5d263a6 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb @@ -7,6 +7,6 @@ inherit skeleton-gdbus inherit pkgconfig DEPENDS += "pflash" -RDEPENDS_${PN} += "pflash" +RDEPENDS:${PN} += "pflash" SKELETON_DIR = "op-flasher" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb index 16e1d999f..d10eceffa 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb @@ -11,7 +11,7 @@ INSECURE_KEY = "${@'${SIGNING_KEY}' == '${STAGING_DIR_NATIVE}${datadir}/OpenBMC. DEPENDS += "openssl-native" DEPENDS += "${@oe.utils.conditional('INSECURE_KEY', 'True', 'phosphor-insecure-signing-key-native', '', d)}" -FILES_${PN} += "${sysconfdir}/activationdata/" +FILES:${PN} += "${sysconfdir}/activationdata/" SIGNING_KEY ?= "${STAGING_DIR_NATIVE}${datadir}/OpenBMC.priv" SIGNING_KEY_TYPE = "${@os.path.splitext(os.path.basename('${SIGNING_KEY}'))[0]}" @@ -27,4 +27,4 @@ do_install() { install -m 644 ${WORKDIR}/hashfunc ${idir} } -SYSROOT_DIRS_append = " ${sysconfdir}" +SYSROOT_DIRS:append = " ${sysconfdir}" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb index 85e289687..ffc343b93 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb @@ -11,7 +11,7 @@ require phosphor-software-manager.inc S = "${WORKDIR}/git" -do_install_append() { +do_install:append() { SRC=${S}/xyz/openbmc_project/Software/ DEST=${D}${yaml_dir}/xyz/openbmc_project/Software/ install -d ${DEST} diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 14530dbbc..2e36e99aa 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "7eebeaac3630bb0ccbb293b916c06509b15524ee" +SRCREV = "4ce901c5fb910213896a3804e57e5f74f795a020" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index 4b0bdc060..f51319adf 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -16,7 +16,7 @@ SOFTWARE_MGR_PACKAGES = " \ ${PN}-sync \ " PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" @@ -46,33 +46,33 @@ DEPENDS += " \ sdbusplus \ " -RDEPENDS_${PN}-updater += " \ +RDEPENDS:${PN}-updater += " \ bash \ virtual-obmc-image-manager \ ${@bb.utils.contains('PACKAGECONFIG', 'verify_signature', 'phosphor-image-signing', '', d)} \ " -RPROVIDES_${PN}-version += " \ +RPROVIDES:${PN}-version += " \ virtual-obmc-image-manager \ " -FILES_${PN}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf" -FILES_${PN}-download-mgr += "${bindir}/phosphor-download-manager" -FILES_${PN}-updater += " \ +FILES:${PN}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf" +FILES:${PN}-download-mgr += "${bindir}/phosphor-download-manager" +FILES:${PN}-updater += " \ ${bindir}/phosphor-image-updater \ ${bindir}/obmc-flash-bmc \ /usr/local \ " -FILES_${PN}-sync += " \ +FILES:${PN}-sync += " \ ${bindir}/phosphor-sync-software-manager \ ${sysconfdir}/synclist \ " -DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.Version.service" -DBUS_SERVICE_${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" -DBUS_SERVICE_${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" -DBUS_SERVICE_${PN}-sync += "xyz.openbmc_project.Software.Sync.service" +DBUS_SERVICE:${PN}-version += "xyz.openbmc_project.Software.Version.service" +DBUS_SERVICE:${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" +DBUS_SERVICE:${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" +DBUS_SERVICE:${PN}-sync += "xyz.openbmc_project.Software.Sync.service" -SYSTEMD_SERVICE_${PN}-updater += " \ +SYSTEMD_SERVICE:${PN}-updater += " \ force-reboot.service \ obmc-flash-bmc-setenv@.service \ reboot-guard-disable.service \ @@ -80,12 +80,12 @@ SYSTEMD_SERVICE_${PN}-updater += " \ usr-local.mount \ " -SYSTEMD_SERVICE_${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" +SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" S = "${WORKDIR}/git" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" -do_install_append() { +do_install:append() { install -d ${D}/usr/local } diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 37908e0de..a1ea91354 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -14,11 +14,11 @@ GPIO_PACKAGES = " \ " PACKAGE_BEFORE_PN += "${GPIO_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" SYSTEMD_PACKAGES = "${GPIO_PACKAGES}" -RPROVIDES_${PN}-monitor += "virtual/obmc-gpio-monitor" -RPROVIDES_${PN}-presence += "virtual/obmc-gpio-presence" +RPROVIDES:${PN}-monitor += "virtual/obmc-gpio-monitor" +RPROVIDES:${PN}-presence += "virtual/obmc-gpio-presence" PROVIDES += "virtual/obmc-gpio-monitor" PROVIDES += "virtual/obmc-gpio-presence" @@ -33,18 +33,18 @@ DEPENDS += "libgpiod" DEPENDS += "cli11" DEPENDS += "nlohmann-json" -SYSTEMD_SERVICE_${PN}-monitor += "phosphor-multi-gpio-monitor.service" -SYSTEMD_SERVICE_${PN}-monitor += "phosphor-gpio-monitor@.service" -SYSTEMD_SERVICE_${PN}-presence += "phosphor-gpio-presence@.service" +SYSTEMD_SERVICE:${PN}-monitor += "phosphor-multi-gpio-monitor.service" +SYSTEMD_SERVICE:${PN}-monitor += "phosphor-gpio-monitor@.service" +SYSTEMD_SERVICE:${PN}-presence += "phosphor-gpio-presence@.service" -FILES_${PN}-monitor += "${bindir}/phosphor-gpio-monitor" -FILES_${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor" -FILES_${PN}-monitor += "${bindir}/phosphor-gpio-util" -FILES_${PN}-monitor += "${base_libdir}/udev/rules.d/99-gpio-keys.rules" -FILES_${PN}-presence += "${bindir}/phosphor-gpio-presence" +FILES:${PN}-monitor += "${bindir}/phosphor-gpio-monitor" +FILES:${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor" +FILES:${PN}-monitor += "${bindir}/phosphor-gpio-util" +FILES:${PN}-monitor += "${nonarch_base_libdir}/udev/rules.d/99-gpio-keys.rules" +FILES:${PN}-presence += "${bindir}/phosphor-gpio-presence" SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor" SRCREV = "b08a0f691740ef21e28547a57981b1043d46d8ce" S = "${WORKDIR}/git" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb index 33ab36019..4363d4c0a 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -18,4 +18,4 @@ SRC_URI = "git://github.com/openbmc/phosphor-health-monitor.git;protocol=git" SRCREV = "2b231e8aa91a76a7c36f1c70c7e4058a38d0a5f1" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "phosphor-health-monitor.service" +SYSTEMD_SERVICE:${PN} = "phosphor-health-monitor.service" diff --git a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb index 81b51394c..ffe2f366e 100644 --- a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb +++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb @@ -8,13 +8,13 @@ inherit obmc-phosphor-dbus-service inherit pkgconfig PROVIDES += "virtual/obmc-host-ctl" -RPROVIDES_${PN} += "virtual-obmc-host-ctl" +RPROVIDES:${PN} += "virtual-obmc-host-ctl" SKELETON_DIR = "op-hostctl" FMT = "org.openbmc.control.Host@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE_${PN} = " \ +DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE:${PN} = " \ op-start-host@.service \ " @@ -23,4 +23,4 @@ START_TGTFMT = "obmc-host-startmin@{1}.target" START_INSTFMT = "op-start-host@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index 77d36bbf1..e68960d1d 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -27,15 +27,17 @@ POST_CODE_BYTES ?= "1" SERVICE_FILE = "lpcsnoop.service" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} += "${SERVICE_FILE}" +SYSTEMD_SERVICE:${PN} += "${SERVICE_FILE}" -EXTRA_OEMESON += "-Dsnoop-device=${SNOOP_DEVICE}" -EXTRA_OEMESON += "-Dpost-code-bytes=${POST_CODE_BYTES}" -EXTRA_OEMESON += "-Dsystemd-target=multi-user.target" +EXTRA_OEMESON:append = " \ + -Dsnoop-device=${SNOOP_DEVICE} \ + -Dpost-code-bytes=${POST_CODE_BYTES} \ + -Dsystemd-target=multi-user.target \ +" POSTCODE_SEVENSEG_DEVICE ?= "seven_seg_disp_val" SERVICE_FILE_7SEG = " \ postcode-7seg@.service \ postcode-7seg@${POSTCODE_SEVENSEG_DEVICE}.service \ " -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', '7seg', '${SERVICE_FILE_7SEG}', '', d)}" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', '7seg', '${SERVICE_FILE_7SEG}', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index e4f955f6e..494b06c7c 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -51,4 +51,4 @@ ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " # The shadow recipe provides the binaries(like useradd, usermod) needed by the # phosphor-user-manager. -ROOTFS_RO_UNNEEDED_remove = "shadow" +ROOTFS_RO_UNNEEDED:remove = "shadow" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb index 4c7237fca..9df4432fe 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb @@ -4,7 +4,7 @@ first 'init' program more efficiently." # Init scripts INIT_PACKAGE = "obmc-phosphor-initfs" -INIT_PACKAGE_df-phosphor-mmc = "phosphor-mmc-init" +INIT_PACKAGE:df-phosphor-mmc = "phosphor-mmc-init" PACKAGE_INSTALL = "${VIRTUAL-RUNTIME_base-utils} base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} ${INIT_PACKAGE}" @@ -25,6 +25,6 @@ IMAGE_ROOTFS_EXTRA_SPACE = "0" # Needed for the set_user_group functions to succeed DEPENDS += "shadow-native" -PACKAGE_INSTALL_remove = "shadow" +PACKAGE_INSTALL:remove = "shadow" PACKAGE_EXCLUDE = "shadow" BAD_RECOMMENDATIONS += "busybox-syslog" diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb index 4c6fad8e4..f816706af 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb +++ b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb @@ -7,7 +7,7 @@ PR = "r1" inherit allarch -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" S = "${WORKDIR}" SRC_URI += "file://obmc-init.sh" @@ -31,5 +31,5 @@ do_install() { mknod -m 622 ${D}/dev/console c 5 1 } -FILES_${PN} += " /init /shutdown /update /whitelist /dev " -FILES_${PN} += " /init-options /init-download-url " +FILES:${PN} += " /init /shutdown /update /whitelist /dev " +FILES:${PN} += " /init-options /init-download-url " diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb index aa55d1be9..88807c0f0 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb +++ b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb @@ -7,7 +7,7 @@ PR = "r1" inherit allarch -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'} \ ${VIRTUAL-RUNTIME_base-utils} \ e2fsprogs-e2fsck \ @@ -26,4 +26,4 @@ do_install() { mknod -m 622 ${D}/dev/console c 5 1 } -FILES_${PN} += " /init /dev " +FILES:${PN} += " /init /dev " diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 3db77d998..f7d2413ef 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -4,8 +4,8 @@ inherit useradd USERADD_PACKAGES = "${PN}" # add a user called httpd for the server to assume -USERADD_PARAM_${PN} = "-r -s /usr/sbin/nologin bmcweb" -GROUPADD_PARAM_${PN} = "web; redfish" +USERADD_PARAM:${PN} = "-r -s /usr/sbin/nologin bmcweb" +GROUPADD_PARAM:${PN} = "web; redfish" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "ff3f835ad47f7a4f61d5fe9345dccdd3e496c47c" +SRCREV = "7bb985eeb0930905c2f4d551e895dd5293094931" S = "${WORKDIR}/git" @@ -37,7 +37,7 @@ DEPENDS = " \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ jsnbd \ phosphor-mapper \ " @@ -47,7 +47,7 @@ do_install_ptest() { cp -rf ${B}/*_test ${D}${PTEST_PATH}/test/ } -FILES_${PN} += "${datadir}/** " +FILES:${PN} += "${datadir}/** " EXTRA_OEMESON = " \ @@ -56,6 +56,6 @@ EXTRA_OEMESON = " \ -Dyocto-deps=enabled \ " -SYSTEMD_SERVICE_${PN} += "bmcweb.service bmcweb.socket" +SYSTEMD_SERVICE:${PN} += "bmcweb.service bmcweb.socket" FULL_OPTIMIZATION = "-Os " diff --git a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb index 8db94b0c3..92f2342c8 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb @@ -10,7 +10,7 @@ inherit allarch inherit obmc-phosphor-systemd inherit setuptools3 -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-netserver \ python-json \ python-dbus \ @@ -18,7 +18,7 @@ RDEPENDS_${PN} += " \ pyphosphor-dbus \ " -SYSTEMD_SERVICE_${PN} += "rest-dbus.service rest-dbus.socket" +SYSTEMD_SERVICE:${PN} += "rest-dbus.service rest-dbus.socket" SRC_URI += "git://github.com/openbmc/rest-dbus.git" diff --git a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb index 0022d9243..6eaed0fe1 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig inherit obmc-phosphor-systemd -SYSTEMD_SERVICE_${PN} += "slpd-lite.service" +SYSTEMD_SERVICE:${PN} += "slpd-lite.service" DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag.bb index 2cba64e71..317269f82 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag.bb +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag.bb @@ -15,4 +15,4 @@ do_install() { install -D assettag.yaml ${D}${base_datadir}/events.d/assettag.yaml } -FILES_${PN} += "${base_datadir}/events.d/assettag.yaml" +FILES:${PN} += "${base_datadir}/events.d/assettag.yaml" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 638a1ac53..221b88c32 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager" -SRCREV = "706a9fcc53d2b96393aeb9e829599b2605f92595" +SRCREV = "1707945afbd6c73376a994f7a576a22c0bfb9c6e" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb index 1f108eb46..16790a381 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb @@ -30,7 +30,7 @@ DEPENDS += " \ OBMC_INVENTORY_PATH="${OBMC_DBUS_PATH_ROOT}/inventory" OBMC_INVENTORY_MGR_IFACE="${OBMC_DBUS_IFACE_ROOT}.Inventory.Manager" -DBUS_SERVICE_${PN} = "${OBMC_INVENTORY_MGR_IFACE}.service" +DBUS_SERVICE:${PN} = "${OBMC_INVENTORY_MGR_IFACE}.service" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 83df346f5..ac1440338 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "8da5f72db5a9d3374570cb860f52f35d518ac1c2" +SRCREV = "2ca843c10ee5b26d1c2db41a54cb0feb967800d8" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend index a6a8198d2..7e024f19e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPENDS += "systemd" @@ -19,8 +19,8 @@ SRC_URI += " \ " # make sure that the enterprise-numbers file gets installed in the root FS -FILES_${PN} += "/usr/share/misc/enterprise-numbers" -do_compile_prepend() { +FILES:${PN} += "/usr/share/misc/enterprise-numbers" +do_compile:prepend() { # copy the SRC_URI version of enterprise-numbers # to the build dir to prevent a fetch mkdir -p "${WORKDIR}/build" @@ -30,6 +30,6 @@ do_compile_prepend() { S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=9aa91e13d644326bf281924212862184" -EXTRA_OECONF_append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus " +EXTRA_OECONF:append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus " PV = "1.8.18+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb index 8f1d34b58..ec3d3a465 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb @@ -19,8 +19,8 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore" SRCREV = "c3abe753fca211f49eb68f7d34e37bfc9eb5d4c4" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" BLOBIPMI_PROVIDER_LIBRARY += "libbinarystore.so" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index 58825d475..b989ef78c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -18,9 +18,9 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" SRCREV = "f39e668c2b87c9453e0e28d5a8886b81ed80c50e" -FILES_${PN} += "${libdir}/ipmid-providers" +FILES:${PN} += "${libdir}/ipmid-providers" -EXTRA_OEMESON += " \ +EXTRA_OEMESON:append = " \ -Dtests=disabled \ -Dexamples=false \ " diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb index 6c7c82668..df5b65337 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig inherit obmc-phosphor-dbus-service -DBUS_SERVICE_${PN} = "org.openbmc.HostIpmi.service" +DBUS_SERVICE:${PN} = "org.openbmc.HostIpmi.service" PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS_${PN} += "phosphor-ipmi-host" +RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw" +RRECOMMENDS:${PN} += "phosphor-ipmi-host" DEPENDS += "autoconf-archive-native" DEPENDS += "systemd" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb index 2d8b49105..24c4941dc 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb @@ -17,7 +17,7 @@ SRC_URI = " \ file://cs_privilege_levels.json \ " -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/ipmi-providers/cipher_list.json \ ${datadir}/ipmi-providers/dcmi_cap.json \ ${datadir}/ipmi-providers/dcmi_sensors.json \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index 957dd36b2..e1da1570e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb @@ -16,10 +16,10 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats" SRCREV = "6b48b92e08abba4e7b31d69c9a74b1d262718a84" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" HOSTIPMI_PROVIDER_LIBRARY += "libethstatscmd.so" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index ce73cb06d..07ad73f5a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -44,14 +44,14 @@ EXTRA_OECONF = "--disable-tests --disable-build-host-tool" # Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly. IPMI_FLASH_BMC_ADDRESS ?= "0" -EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" +EXTRA_OECONF:append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "0077e34cfaca539f750014aa63ff491dca70ee1d" +SRCREV = "203ad80448552bb291cbebb9fdce362d58acc5f4" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ +SYSTEMD_SERVICE:${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ phosphor-ipmi-flash-bmc-verify.target \ phosphor-ipmi-flash-bmc-update.target" @@ -60,12 +60,12 @@ HOST_BIOS_TARGETS = "phosphor-ipmi-flash-bios-prepare.target \ phosphor-ipmi-flash-bios-verify.target \ phosphor-ipmi-flash-bios-update.target" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" -FILES_${PN}_append = " ${libdir}/tmpfiles.d" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN}:append = " ${libdir}/tmpfiles.d" BLOBIPMI_PROVIDER_LIBRARY += "libfirmwareblob.so" BLOBIPMI_PROVIDER_LIBRARY += "libversionblob.so" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb index ec10b7db2..b89311501 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb @@ -15,7 +15,7 @@ DEPENDS += "virtual/phosphor-ipmi-fru-read-bmc-inventory" DEPENDS += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory" PROVIDES += "virtual/phosphor-ipmi-fru-merge-config" -do_install_append() { +do_install:append() { SRC=${config_datadir} DEST=${D}${config_datadir} install -d ${DEST} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb index d3b15c9f5..bb1addd08 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}" PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory" -do_install_append() { +do_install:append() { DEST=${D}${config_datadir} install -d ${DEST} install bmc-fru-config.yaml ${DEST}/bmc-fru-config.yaml diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb index aad4aac1f..e87b8dfd0 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}" PROVIDES += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory" -do_install_append() { +do_install:append() { DEST=${D}${config_datadir} install -d ${DEST} install fru-config-not-sent-by-host.yaml ${DEST}/fru-config-not-sent-by-host.yaml diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb index 4ee1e16a3..c91fb7bd8 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb @@ -25,27 +25,27 @@ DEPENDS += " \ cli11 \ " -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" SRC_URI += "file://of-name-to-eeprom.sh" -SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service" +SYSTEMD_SERVICE:${PN} += "obmc-read-eeprom@.service" S = "${WORKDIR}/git" HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so" -FILES_${PN} += "${bindir}/of-name-to-eeprom.sh" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN} += "${bindir}/of-name-to-eeprom.sh" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" EXTRA_OECONF = " \ YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \ PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \ " -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/of-name-to-eeprom.sh ${D}${bindir} } diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 38ca9ccec..3013ee9b1 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "8f1b0b932a7567d1d64733582e8d44e5e6734fec" +SRCREV = "7a3296df0c2f9b8e04e5b60942fba086f999e1b9" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 5e937648e..03d4e4f2f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -5,7 +5,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -RRECOMMENDS_${PN} += "packagegroup-obmc-ipmid-providers-libs" +RRECOMMENDS:${PN} += "packagegroup-obmc-ipmid-providers-libs" inherit autotools pkgconfig inherit obmc-phosphor-ipmiprovider-symlink @@ -44,26 +44,26 @@ DEPENDS += "${PYTHON_PN}-mako-native" VIRTUAL-RUNTIME_ipmi-config ?= "phosphor-ipmi-config" -RDEPENDS_${PN}-dev += "phosphor-logging" -RDEPENDS_${PN}-dev += "phosphor-mapper-dev" -RDEPENDS_${PN} += "clear-once" -RDEPENDS_${PN} += "phosphor-network" -RDEPENDS_${PN} += "phosphor-time-manager" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_ipmi-config}" -RDEPENDS_${PN} += "virtual/obmc-watchdog" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-state-manager}" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-version}" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-updater}" +RDEPENDS:${PN}-dev += "phosphor-logging" +RDEPENDS:${PN}-dev += "phosphor-mapper-dev" +RDEPENDS:${PN} += "clear-once" +RDEPENDS:${PN} += "phosphor-network" +RDEPENDS:${PN} += "phosphor-time-manager" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_ipmi-config}" +RDEPENDS:${PN} += "virtual/obmc-watchdog" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-state-manager}" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-version}" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-updater}" inherit useradd USERADD_PACKAGES = "${PN}" # add ipmi group -GROUPADD_PARAM_${PN} = "ipmi" +GROUPADD_PARAM:${PN} = "ipmi" -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service" +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service" -RRECOMMENDS_${PN} += "phosphor-settings-manager" +RRECOMMENDS:${PN} += "phosphor-settings-manager" require ${BPN}.inc @@ -78,7 +78,7 @@ EXTRA_OECONF = " \ INVSENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \ FRU_YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \ " -EXTRA_OECONF_append = " \ +EXTRA_OECONF:append = " \ WHITELIST_CONF="${WHITELIST_CONF}" \ " @@ -93,17 +93,17 @@ HOSTIPMI_PROVIDER_LIBRARY += "libusercmds.so" NETIPMI_PROVIDER_LIBRARY += "libipmi20.so" NETIPMI_PROVIDER_LIBRARY += "libusercmds.so" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" # Soft Power Off # install the soft power off service in the host shutdown target SOFT_SVC = "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" SOFT_TGTFMT = "obmc-host-shutdown@{0}.target" SOFT_FMT = "../${SOFT_SVC}:${SOFT_TGTFMT}.requires/${SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" #Collect all hardcoded sensor yamls from different recipes and #merge all of them with sensor.yaml. diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index 489d09014..dbab372c9 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -3,13 +3,13 @@ DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \ implementing IPMB interfaces" SRC_URI = "git://github.com/openbmc/ipmbbridge.git" -SRCREV = "8fe0abe6d9f69f735e93d7055687fce4b56e80bf" +SRCREV = "bd78df6be9f677136ca190d50101c328267ddcd2" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SYSTEMD_SERVICE_${PN} = "ipmb.service" +SYSTEMD_SERVICE:${PN} = "ipmb.service" DEPENDS = "sdbusplus \ phosphor-logging \ @@ -19,4 +19,4 @@ DEPENDS = "sdbusplus \ S = "${WORKDIR}/git" inherit cmake systemd -FILES_${PN} += "/usr/share/ipmbbridge/ipmb-channels.json" +FILES:${PN} += "/usr/share/ipmbbridge/ipmb-channels.json" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb index cd7f376d0..bff352e59 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -12,12 +12,12 @@ PV = "1.0+git${SRCPV}" KCS_DEVICE ?= "ipmi-kcs3" -SYSTEMD_SERVICE_${PN} = "${PN}@${KCS_DEVICE}.service" -FILES_${PN} += "${systemd_system_unitdir}/${PN}@.service" +SYSTEMD_SERVICE:${PN} = "${PN}@${KCS_DEVICE}.service" +FILES:${PN} += "${systemd_system_unitdir}/${PN}@.service" PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS_${PN} += "phosphor-ipmi-host" +RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw" +RRECOMMENDS:${PN} += "phosphor-ipmi-host" DEPENDS += " \ fmt \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index 44a1b0c53..97df26289 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -15,14 +15,14 @@ DEPENDS += "phosphor-mapper" DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" -RRECOMMENDS_${PN} = "pam-ipmi" +RRECOMMENDS:${PN} = "pam-ipmi" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "60d6e4ed2b74c88621f43081951d86956557baa0" +SRCREV = "1c5b3ab05817d62a11f75c2a90b6891b18bf62cc" S = "${WORKDIR}/git" -FILES_${PN} += " \ +FILES:${PN} += " \ ${systemd_system_unitdir}/${PN}@.service \ ${systemd_system_unitdir}/${PN}@.socket \ " @@ -32,7 +32,7 @@ DEFAULT_RMCPP_IFACE = "eth0" RMCPP_IFACE ?= "${DEFAULT_RMCPP_IFACE}" # install parameterized service and socket files -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ ${PN}@${RMCPP_IFACE}.service \ ${PN}@${RMCPP_IFACE}.socket \ " @@ -41,7 +41,7 @@ SYSTEMD_SERVICE_${PN} = " \ # following lines in a bbappend: # # ALT_RMCPP_IFACE = "eth1" -# SYSTEMD_SERVICE_${PN} += " \ +# SYSTEMD_SERVICE:${PN} += " \ # ${PN}@${ALT_RMCPP_IFACE}.service \ # ${PN}@${ALT_RMCPP_IFACE}.socket \ # " diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb index 6259e4feb..19c03fb79 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb @@ -7,4 +7,4 @@ inherit native OBMC_IPMI_SENSORS_PROVIDERS = "phosphor-ipmi-sensor-inventory-mrw-config-native" -DEPENDS_append = " ${OBMC_IPMI_SENSORS_PROVIDERS} " +DEPENDS:append = " ${OBMC_IPMI_SENSORS_PROVIDERS} " diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb index 821a74669..948ae6985 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb @@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca inherit meson pkgconfig inherit systemd -SYSTEMD_SERVICE_${PN} = "ssifbridge.service" +SYSTEMD_SERVICE:${PN} = "ssifbridge.service" PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS_${PN} += "phosphor-ipmi-host" +RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw" +RRECOMMENDS:${PN} += "phosphor-ipmi-host" DEPENDS += "systemd" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb index 648bf2140..c4724f2e7 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb @@ -10,7 +10,7 @@ PROVIDES += "virtual/phosphor-led-manager-config-native" DEPENDS += "mrw-native mrw-perl-tools-native" # Generate a YAML files based on MRW input -do_install_append() { +do_install:append() { USE_MRW="${@bb.utils.contains('DISTRO_FEATURES', 'obmc-mrw', 'yes', 'no', d)}" DEST=${D}${datadir}/phosphor-led-manager diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb index 5d86f8aeb..0e1baadef 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb @@ -11,7 +11,7 @@ require phosphor-led-manager.inc S = "${WORKDIR}/git" -do_install_append() { +do_install:append() { SRC=${S}/xyz/openbmc_project/Led/ DEST=${D}${yaml_dir}/xyz/openbmc_project/Led/ install -d ${DEST}/Fru diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 920df3f96..544beae35 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "ad73885b724ea826ffc60c23bdbaaab91ee3cb1c" +SRCREV = "7152edcff6b44cd3b32ced057c1fd2e6ac6402e9" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 7d4e3281d..3bfd47d05 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -28,32 +28,33 @@ DEPENDS += "nlohmann-json" DEPENDS += "virtual/${PN}-config-native" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" S = "${WORKDIR}/git" -FILES_${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" +FILES:${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.LED.GroupManager.service" +DBUS_SERVICE:${PN} += "xyz.openbmc_project.LED.GroupManager.service" -SYSTEMD_SERVICE_${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" -SYSTEMD_SERVICE_${PN}-faultmonitor += "obmc-fru-fault-monitor.service" +SYSTEMD_SERVICE:${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" +SYSTEMD_SERVICE:${PN}-faultmonitor += "obmc-fru-fault-monitor.service" -SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK:${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +CHASSIS_TARGETS = "poweron poweroff" STATES = "start stop" -TMPLFMT = "obmc-led-group-{0}@.service" -TGTFMT = "obmc-power-{0}@0.target" -INSTFMT = "obmc-led-group-{0}@power_on.service" +TMPLFMT = "obmc-led-group-{1}@.service" +TGTFMT = "obmc-chassis-{0}@0.target" +INSTFMT = "obmc-led-group-{1}@power_on.service" FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'STATES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" +SYSTEMD_OVERRIDE:${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" -do_compile_prepend() { +do_compile:prepend() { if [ -f "${LED_YAML_PATH}/led.yaml" ]; then cp "${LED_YAML_PATH}/led.yaml" "${S}/led.yaml" elif [ -f "${STAGING_DATADIR_NATIVE}/${PN}/led.yaml" ]; then diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index f1a1112aa..e1f7f259f 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -14,16 +14,16 @@ DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.led.controller@.service" +DBUS_SERVICE:${PN} += "xyz.openbmc_project.led.controller@.service" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" SRCREV = "5ee5f3b7162cb5d8e6780a9571e0b0ca3daf7c6e" S = "${WORKDIR}/git" -do_install_append() { - install -d ${D}/${base_libdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${base_libdir}/udev/rules.d/ +do_install:append() { + install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ } diff --git a/meta-phosphor/recipes-phosphor/mctp/files/default b/meta-phosphor/recipes-phosphor/libmctp/files/default index cb33e8b61..cb33e8b61 100644 --- a/meta-phosphor/recipes-phosphor/mctp/files/default +++ b/meta-phosphor/recipes-phosphor/libmctp/files/default diff --git a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index eedecb7f8..c5c137628 100644 --- a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -11,13 +11,13 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp \ file://default" -SRCREV = "cfeaef8ecb0ab8c59ea4e145603523e599d60014" +SRCREV = "ae59f4fe3a3ceaf52a682ada2a2b54855fad2408" DEPENDS += "autoconf-archive-native \ systemd \ " -SYSTEMD_SERVICE_${PN} = "mctp-demux.service \ +SYSTEMD_SERVICE:${PN} = "mctp-demux.service \ mctp-demux.socket \ " @@ -27,9 +27,9 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, PACKAGECONFIG[astlpc-raw-kcs] = "--enable-astlpc-raw-kcs,--disable-astlpc-raw-kcs,udev,udev" -CONFFILES_${PN} = "${sysconfdir}/default/mctp" +CONFFILES:${PN} = "${sysconfdir}/default/mctp" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/mctp } diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index f6ee824a8..3b05b9e02 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -7,7 +7,7 @@ require recipes-phosphor/dump/phosphor-debug-collector.inc DEPENDS += "systemd" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${VIRTUAL-RUNTIME_base-utils} \ " diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 5ad350d67..244f3ea1b 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -16,8 +16,8 @@ DEPENDS += " \ phosphor-logging \ zlib \ " -RDEPENDS_${PN} += "obmc-console" -RRECOMMENDS_${PN} += "phosphor-debug-collector" +RDEPENDS:${PN} += "obmc-console" +RRECOMMENDS:${PN} += "phosphor-debug-collector" # Source code repository S = "${WORKDIR}/git" @@ -25,11 +25,11 @@ SRC_URI = "git://github.com/openbmc/phosphor-hostlogger" SRCREV = "042b5ba8438d1423f807feb5ef739cda063ea8d2" # Disable unit tests -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" # Systemd service template SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "hostlogger@.service" +SYSTEMD_SERVICE:${PN} = "hostlogger@.service" # Default service instance to install (single-host mode) DEFAULT_INSTANCE = "ttyVUART0" @@ -42,7 +42,7 @@ CUSTOM_CONFIGS = "${@custom_configs('${WORKDIR}')}" CUSTOM_SERVICES = "${@custom_services('${CUSTOM_CONFIGS}')}" # Preset systemd units -SYSTEMD_SERVICE_${PN} += "${@'${CUSTOM_SERVICES}' if len('${CUSTOM_SERVICES}') \ +SYSTEMD_SERVICE:${PN} += "${@'${CUSTOM_SERVICES}' if len('${CUSTOM_SERVICES}') \ else '${DEFAULT_SERVICE}'}" # Gets list of custom config files in a directory @@ -55,7 +55,7 @@ def custom_services(configs): return ' '.join(['hostlogger@' + i.replace('.conf', '.service') \ for i in configs.split()]) -do_install_append() { +do_install:append() { # Install config files if [ -n "${CUSTOM_CONFIGS}" ]; then for CONFIG_FILE in ${CUSTOM_CONFIGS}; do diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 9d9e93078..c59ca945c 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -26,7 +26,7 @@ DEPENDS += "sdeventplus" DEPENDS += "packagegroup-obmc-yaml-providers" PACKAGE_BEFORE_PN = "${PN}-test" -FILES_${PN}-test = "${bindir}/*-test" +FILES:${PN}-test = "${bindir}/*-test" # Package configuration LOGGING_PACKAGES = " \ @@ -34,27 +34,27 @@ LOGGING_PACKAGES = " \ phosphor-rsyslog-config \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}" SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}" DBUS_PACKAGES = "${LOGGING_PACKAGES}" USERADD_PACKAGES = "${PN}-base" -GROUPADD_PARAM_${PN}-base = "-r phosphor-logging" +GROUPADD_PARAM:${PN}-base = "-r phosphor-logging" -FILES_${PN}-base += " \ +FILES:${PN}-base += " \ ${datadir}/dbus-1 \ ${bindir}/phosphor-log-manager \ ${libdir}/libphosphor_logging.so.* \ " -DBUS_SERVICE_${PN}-base += "xyz.openbmc_project.Logging.service" +DBUS_SERVICE:${PN}-base += "xyz.openbmc_project.Logging.service" -DBUS_SERVICE_phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service" -FILES_phosphor-rsyslog-config += " \ +DBUS_SERVICE:phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service" +FILES:phosphor-rsyslog-config += " \ ${bindir}/phosphor-rsyslog-conf \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "7f1ec94d55bec2f482fa8169c2df6aebdc9ccf0c" +SRCREV = "87001e465fc420d3eedb3630bc162ed714a7809e" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index 22d38b83f..3f2ae8622 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -25,9 +25,9 @@ PROVIDES += "mboxctl" MBOXD_FLASH_SIZE ??= "32M" SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service" -do_install_append() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d +do_install:append() { + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/${nonarch_base_libdir}/udev/rules.d } TMPL = "mboxd-reload@.service" @@ -35,10 +35,10 @@ TGTFMT = "obmc-host-startmin@{0}.target" INSTFMT = "mboxd-reload@{0}.service" FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_SERVICE_${PN} += "mboxd.service" -SYSTEMD_SERVICE_${PN} += "mboxd-reload@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE:${PN} += "mboxd.service" +SYSTEMD_SERVICE:${PN} += "mboxd-reload@.service" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" # Enable virtual-pnor by DISTRO_FEATURE openpower-virtual-pnor. -PACKAGECONFIG_append_df-openpower-virtual-pnor = " virtual-pnor" +PACKAGECONFIG:append:df-openpower-virtual-pnor = " virtual-pnor" PACKAGECONFIG[virtual-pnor] = "--enable-virtual-pnor,--disable-virtual-pnor" diff --git a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb index e646d46b7..17ef04f55 100644 --- a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb +++ b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb @@ -23,8 +23,8 @@ PHOSPHOR_MISC_PACKAGES = " \ ${@bb.utils.contains('PACKAGECONFIG', 'usb-ctrl', '${PN}-usb-ctrl', '', d)} \ " -PACKAGES_remove = "${PN}" -RDEPENDS_${PN}-dev = "" +PACKAGES:remove = "${PN}" +RDEPENDS:${PN}-dev = "" PACKAGE_BEFORE_PN += "${PHOSPHOR_MISC_PACKAGES}" SYSTEMD_PACKAGES = "${PHOSPHOR_MISC_PACKAGES}" @@ -42,20 +42,20 @@ PACKAGECONFIG[http-redirect-awk] = "-Dhttp-redirect=enabled, -Dhttp-redirect=dis PACKAGECONFIG[usb-ctrl] = "-Dusb-ctrl=enabled, -Dusb-ctrl=disabled" # first-boot-set-hostname -FILES_${PN}-first-boot-set-hostname = "${bindir}/first-boot-set-hostname.sh" -SYSTEMD_SERVICE_${PN}-first-boot-set-hostname = "first-boot-set-hostname.service" +FILES:${PN}-first-boot-set-hostname = "${bindir}/first-boot-set-hostname.sh" +SYSTEMD_SERVICE:${PN}-first-boot-set-hostname = "first-boot-set-hostname.service" # first-boot-set-mac -FILES_${PN}-first-boot-set-mac = "${bindir}/first-boot-set-mac.sh" -SYSTEMD_SERVICE_${PN}-first-boot-set-mac = "first-boot-set-mac@.service" +FILES:${PN}-first-boot-set-mac = "${bindir}/first-boot-set-mac.sh" +SYSTEMD_SERVICE:${PN}-first-boot-set-mac = "first-boot-set-mac@.service" # http-redirect-awk -FILES_${PN}-http-redirect-awk = "${bindir}/http-redirect.awk" -SYSTEMD_SERVICE_${PN}-http-redirect-awk = " \ +FILES:${PN}-http-redirect-awk = "${bindir}/http-redirect.awk" +SYSTEMD_SERVICE:${PN}-http-redirect-awk = " \ http-redirect@.service \ http-redirect.socket \ " -RDEPENDS_${PN}-http-redirect-awk = "${VIRTUAL-RUNTIME_base-utils}" +RDEPENDS:${PN}-http-redirect-awk = "${VIRTUAL-RUNTIME_base-utils}" # usb-ctrl -FILES_${PN}-usb-ctrl = "${bindir}/usb-ctrl" +FILES:${PN}-usb-ctrl = "${bindir}/usb-ctrl" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb index b8c311bd1..ef73bfa77 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb @@ -17,6 +17,6 @@ SRC_URI += "${MRW_API_SRC_URI}" SRCREV = "${MRW_API_SRCREV}" do_install() { - install -d ${D}${PERLLIBDIRS_class-native}/site_perl/${PERLVERSION}/mrw - install -m 0755 scripts/Targets.pm ${D}${PERLLIBDIRS_class-native}/site_perl/${PERLVERSION}/mrw/Targets.pm + install -d ${D}${PERLLIBDIRS:class-native}/site_perl/${PERLVERSION}/mrw + install -m 0755 scripts/Targets.pm ${D}${PERLLIBDIRS:class-native}/site_perl/${PERLVERSION}/mrw/Targets.pm } diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index fe6c5facd..94b3eca46 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "1ea359943afbd59168f490778a528c858903b74d" +SRCREV = "b108fd740fdde4a9f0fe63e63ccdee695f5b92e7" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" @@ -32,9 +32,9 @@ PACKAGECONFIG[sync-mac] = "-Dsync-mac=true,-Dsync-mac=false,nlohmann-json," S = "${WORKDIR}/git" -FILES_${PN} += "${datadir}/dbus-1/system.d" +FILES:${PN} += "${datadir}/dbus-1/system.d" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Network.service" +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.Network.service" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index 191ad9236..349008f85 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd898696 SRC_URI += "git://github.com/openbmc/phosphor-snmp" SRCREV = "9e60ef5f73de20555bbc197eb93ba888775e19e5" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service" +DBUS_SERVICE:${PN} += "xyz.openbmc_project.Network.SNMP.service" DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 1598a7edb..e6c223e7a 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -33,36 +33,36 @@ PACKAGES = " \ ${PN}-user-mgmt-ldap \ " -SUMMARY_${PN}-bmc-state-mgmt = "BMC state management" -RDEPENDS_${PN}-bmc-state-mgmt = " \ +SUMMARY:${PN}-bmc-state-mgmt = "BMC state management" +RDEPENDS:${PN}-bmc-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-bmc-state-manager} \ phosphor-state-manager-systemd-target-monitor \ obmc-targets \ " -SUMMARY_${PN}-bmcweb = "bmcweb support" -RDEPENDS_${PN}-bmcweb = " \ +SUMMARY:${PN}-bmcweb = "bmcweb support" +RDEPENDS:${PN}-bmcweb = " \ bmcweb \ phosphor-bmcweb-cert-config \ " -SUMMARY_${PN}-chassis-state-mgmt = "Chassis state management" -RDEPENDS_${PN}-chassis-state-mgmt = " \ +SUMMARY:${PN}-chassis-state-mgmt = "Chassis state management" +RDEPENDS:${PN}-chassis-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-chassis-state-manager} \ obmc-phosphor-power \ " -SUMMARY_${PN}-console = "Serial over LAN support" -RDEPENDS_${PN}-console = " \ +SUMMARY:${PN}-console = "Serial over LAN support" +RDEPENDS:${PN}-console = " \ obmc-console \ " # Deprecated - add new packages to an existing packagegroup or create a new one. -SUMMARY_${PN}-extras = "Extra features" -RDEPENDS_${PN}-extras = "" +SUMMARY:${PN}-extras = "Extra features" +RDEPENDS:${PN}-extras = "" -SUMMARY_${PN}-devtools = "Development tools" -RDEPENDS_${PN}-devtools = " \ +SUMMARY:${PN}-devtools = "Development tools" +RDEPENDS:${PN}-devtools = " \ bash \ ffdc \ i2c-tools \ @@ -71,8 +71,8 @@ RDEPENDS_${PN}-devtools = " \ rsync \ " -SUMMARY_${PN}-dbus-monitor = "Support for dbus monitoring" -RDEPENDS_${PN}-dbus-monitor = " \ +SUMMARY:${PN}-dbus-monitor = "Support for dbus monitoring" +RDEPENDS:${PN}-dbus-monitor = " \ phosphor-dbus-monitor \ " @@ -80,118 +80,118 @@ RDEPENDS_${PN}-dbus-monitor = " \ # implementing fan control or system fan policy only. # Applications that create inventory or sensors should # be added those respective package groups instead. -SUMMARY_${PN}-fan-control = "Fan control" -RDEPENDS_${PN}-fan-control = " \ +SUMMARY:${PN}-fan-control = "Fan control" +RDEPENDS:${PN}-fan-control = " \ ${VIRTUAL-RUNTIME_obmc-fan-control} \ phosphor-fan-monitor \ " -SUMMARY_${PN}-fru-ipmi = "Support for EEPROMS with IPMI FRU" -RDEPENDS_${PN}-fru-ipmi = " \ +SUMMARY:${PN}-fru-ipmi = "Support for EEPROMS with IPMI FRU" +RDEPENDS:${PN}-fru-ipmi = " \ fru-device \ " -SUMMARY_${PN}-health-monitor = "Support for health monitoring" -RDEPENDS_${PN}-health-monitor = " \ +SUMMARY:${PN}-health-monitor = "Support for health monitoring" +RDEPENDS:${PN}-health-monitor = " \ phosphor-health-monitor \ " -SUMMARY_${PN}-host-state-mgmt = "Host state management" -RDEPENDS_${PN}-host-state-mgmt = " \ +SUMMARY:${PN}-host-state-mgmt = "Host state management" +RDEPENDS:${PN}-host-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-host-state-manager} \ ${VIRTUAL-RUNTIME_obmc-discover-system-state} \ " -SUMMARY_${PN}-ikvm = "KVM over IP support" -RDEPENDS_${PN}-ikvm = " \ +SUMMARY:${PN}-ikvm = "KVM over IP support" +RDEPENDS:${PN}-ikvm = " \ obmc-ikvm \ " -SUMMARY_${PN}-inventory = "Inventory applications" -RDEPENDS_${PN}-inventory = " \ +SUMMARY:${PN}-inventory = "Inventory applications" +RDEPENDS:${PN}-inventory = " \ ${VIRTUAL-RUNTIME_obmc-inventory-manager} \ ${VIRTUAL-RUNTIME_obmc-fan-presence} \ " -SUMMARY_${PN}-leds = "LED applications" -RDEPENDS_${PN}-leds = " \ +SUMMARY:${PN}-leds = "LED applications" +RDEPENDS:${PN}-leds = " \ ${VIRTUAL-RUNTIME_obmc-leds-manager} \ ${VIRTUAL-RUNTIME_obmc-leds-sysfs} \ ${VIRTUAL-RUNTIME_obmc-led-monitor} \ " -SUMMARY_${PN}-logging = "Logging applications" -RDEPENDS_${PN}-logging = " \ +SUMMARY:${PN}-logging = "Logging applications" +RDEPENDS:${PN}-logging = " \ phosphor-logging \ " -SUMMARY_${PN}-remote-logging = "Remote logging applications" -RDEPENDS_${PN}-remote-logging = " \ +SUMMARY:${PN}-remote-logging = "Remote logging applications" +RDEPENDS:${PN}-remote-logging = " \ rsyslog \ phosphor-rsyslog-config \ " -SUMMARY_${PN}-rng = "Random Number Generator support" -RDEPENDS_${PN}-rng = " \ +SUMMARY:${PN}-rng = "Random Number Generator support" +RDEPENDS:${PN}-rng = " \ rng-tools \ " -SUMMARY_${PN}-sensors = "Sensor applications" -RDEPENDS_${PN}-sensors = " \ +SUMMARY:${PN}-sensors = "Sensor applications" +RDEPENDS:${PN}-sensors = " \ ${VIRTUAL-RUNTIME_obmc-sensors-hwmon} \ " ${PN}-software-extras = "" -${PN}-software-extras_df-obmc-ubi-fs = " \ +${PN}-software-extras:df-obmc-ubi-fs = " \ phosphor-software-manager-updater-ubi \ " -${PN}-software-extras_df-phosphor-mmc = " \ +${PN}-software-extras:df-phosphor-mmc = " \ phosphor-software-manager-updater-mmc \ " -SUMMARY_${PN}-software = "Software applications" -RDEPENDS_${PN}-software = " \ +SUMMARY:${PN}-software = "Software applications" +RDEPENDS:${PN}-software = " \ ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \ ${VIRTUAL-RUNTIME_obmc-bmc-updater} \ ${VIRTUAL-RUNTIME_obmc-bmc-version} \ ${${PN}-software-extras} \ " -SUMMARY_${PN}-debug-collector = "BMC debug collector" -RDEPENDS_${PN}-debug-collector = " \ +SUMMARY:${PN}-debug-collector = "BMC debug collector" +RDEPENDS:${PN}-debug-collector = " \ ${VIRTUAL-RUNTIME_obmc-dump-manager} \ ${VIRTUAL-RUNTIME_obmc-dump-monitor} \ phosphor-debug-collector-dreport \ phosphor-debug-collector-scripts \ " -SUMMARY_${PN}-settings = "Settings applications" -RDEPENDS_${PN}-settings = " \ +SUMMARY:${PN}-settings = "Settings applications" +RDEPENDS:${PN}-settings = " \ phosphor-settings-manager \ " -SUMMARY_${PN}-network = "BMC Network Manager" -RDEPENDS_${PN}-network = " \ +SUMMARY:${PN}-network = "BMC Network Manager" +RDEPENDS:${PN}-network = " \ ${VIRTUAL-RUNTIME_obmc-network-manager} \ " -SUMMARY_${PN}-telemetry = "Telemetry solution" -RDEPENDS_${PN}-telemetry = " \ +SUMMARY:${PN}-telemetry = "Telemetry solution" +RDEPENDS:${PN}-telemetry = " \ telemetry \ " -SUMMARY_${PN}-user-mgmt = "User management applications" -RDEPENDS_${PN}-user-mgmt = " \ +SUMMARY:${PN}-user-mgmt = "User management applications" +RDEPENDS:${PN}-user-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-user-mgmt} \ " -RRECOMMENDS_${PN}-user-mgmt = " \ +RRECOMMENDS:${PN}-user-mgmt = " \ pam-plugin-access \ " -SUMMARY_${PN}-user-mgmt-ldap = "LDAP users and groups support" -RDEPENDS_${PN}-user-mgmt-ldap = " \ +SUMMARY:${PN}-user-mgmt-ldap = "LDAP users and groups support" +RDEPENDS:${PN}-user-mgmt-ldap = " \ ${PN}-user-mgmt \ nss-pam-ldapd \ phosphor-ldap \ diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb index 5892c23db..f7f4fda16 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb @@ -6,8 +6,8 @@ inherit packagegroup PROVIDES = "${PACKAGES}" PACKAGES = "${PN}-libs" -SUMMARY_${PN}-libs = "Extra providers for ipmid." -RDEPENDS_${PN}-libs = "${VIRTUAL-RUNTIME_phosphor-ipmi-providers}" +SUMMARY:${PN}-libs = "Extra providers for ipmid." +RDEPENDS:${PN}-libs = "${VIRTUAL-RUNTIME_phosphor-ipmi-providers}" # Warning. Add additional providers with whitelists to distro or machine # configuration and not in recipe context (bbappend) otherwise ipmid will not diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb index 6890493cd..edcc9ff2c 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb @@ -3,7 +3,7 @@ PR = "r1" inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ strace \ ldd \ ethtool \ diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bb index 783ce40ce..919c6b1ab 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bb @@ -16,4 +16,4 @@ OBMC_YAML_PROVIDER_RECIPES += " \ " DEPENDS = "${OBMC_YAML_PROVIDER_RECIPES}" -RDEPENDS_${PN} = "${OBMC_YAML_PROVIDER_RECIPES}" +RDEPENDS:${PN} = "${OBMC_YAML_PROVIDER_RECIPES}" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 1430aaacf..68b4ece2a 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "ab8017917ee36507bcfe4aacce5bc3fff6872c0f" +SRCREV = "430aaee5013789862de586473b43d2191d492a41" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index 44e42fbdb..bcf1bed23 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -17,8 +17,8 @@ DEPENDS += "cli11" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} += "pldmd.service" -SYSTEMD_SERVICE_${PN} += "pldmSoftPowerOff.service" +SYSTEMD_SERVICE:${PN} += "pldmd.service" +SYSTEMD_SERVICE:${PN} += "pldmSoftPowerOff.service" EXTRA_OEMESON = " \ -Dtests=disabled \ @@ -26,7 +26,7 @@ EXTRA_OEMESON = " \ " # Install pldmSoftPowerOff.service in correct targets -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { mkdir -p $D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/pldmSoftPowerOff.service" @@ -39,7 +39,7 @@ pkg_postinst_${PN} () { ln -s $TARGET $LINK } -pkg_prerm_${PN} () { +pkg_prerm:${PN} () { LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/pldmSoftPowerOff.service" rm $LINK diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb index 77df3acf5..01ddecbe0 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb @@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch -RDEPENDS_${PN}-monitor += "phosphor-power-monitor" +RDEPENDS:${PN}-monitor += "phosphor-power-monitor" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { mkdir -p $D$systemd_system_unitdir/multi-user.target.requires [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 @@ -23,7 +23,7 @@ pkg_postinst_${PN}() { done } -pkg_prerm_${PN}() { +pkg_prerm:${PN}() { [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb index ac91c353e..84ca499de 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch -RDEPENDS_${PN} += "phosphor-power-sequencer" +RDEPENDS:${PN} += "phosphor-power-sequencer" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants mkdir -p $D$systemd_system_unitdir/multi-user.target.requires @@ -23,7 +23,7 @@ pkg_postinst_${PN}() { ln -s $TARGET $LINK } -pkg_prerm_${PN}() { +pkg_prerm:${PN}() { LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" rm $LINK LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb index f84ad2826..4a5cdad30 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb @@ -10,6 +10,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch -RDEPENDS_${PN} += "phosphor-power" +RDEPENDS:${PN} += "phosphor-power" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 890c9ce2a..bcca05930 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "10eb00f68e444f3d7f4f23217820aff5e850bd46" +SRCREV = "1fd0b145874a089e2ccd11f3960342059eeb7012" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb index e9e5f3ee5..3db26f953 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb @@ -23,7 +23,7 @@ POWER_SERVICE_PACKAGES = " \ POWER_UTIL_PACKAGES = "${PN}-utils" PACKAGE_BEFORE_PN = "${POWER_SERVICE_PACKAGES} ${POWER_UTIL_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" SYSTEMD_PACKAGES = "${POWER_SERVICE_PACKAGES}" @@ -55,18 +55,18 @@ REGS_CONF_SVC = "phosphor-regulators-config.service" REGS_MON_ENA_SVC = "phosphor-regulators-monitor-enable.service" REGS_MON_DIS_SVC = "phosphor-regulators-monitor-disable.service" -SYSTEMD_SERVICE_${PN}-sequencer = "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}" -SYSTEMD_SERVICE_${PN}-monitor = "${@bb.utils.contains('PACKAGECONFIG', 'monitor', '${PSU_MONITOR_TMPL}', '', d)}" -SYSTEMD_SERVICE_${PN}-psu-monitor = "${PSU_MONITOR_SVC}" -SYSTEMD_SERVICE_${PN}-regulators = "${REGS_SVC} ${REGS_CONF_SVC} ${REGS_MON_ENA_SVC} ${REGS_MON_DIS_SVC}" +SYSTEMD_SERVICE:${PN}-sequencer = "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}" +SYSTEMD_SERVICE:${PN}-monitor = "${@bb.utils.contains('PACKAGECONFIG', 'monitor', '${PSU_MONITOR_TMPL}', '', d)}" +SYSTEMD_SERVICE:${PN}-psu-monitor = "${PSU_MONITOR_SVC}" +SYSTEMD_SERVICE:${PN}-regulators = "${REGS_SVC} ${REGS_CONF_SVC} ${REGS_MON_ENA_SVC} ${REGS_MON_DIS_SVC}" # TODO: cold-redundancy is not installed in the repo yet -# FILES_${PN}-cold-redundancy = "${bindir}/cold-redundancy" +# FILES:${PN}-cold-redundancy = "${bindir}/cold-redundancy" -FILES_${PN}-monitor = "${bindir}/psu-monitor" -FILES_${PN}-psu-monitor = "${bindir}/phosphor-psu-monitor ${datadir}/phosphor-psu-monitor" -FILES_${PN}-regulators = "${bindir}/phosphor-regulators ${datadir}/phosphor-regulators" -FILES_${PN}-regulators += "${bindir}/regsctl" -FILES_${PN}-sequencer = "${bindir}/pseq-monitor" -FILES_${PN}-utils = "${bindir}/psutils" +FILES:${PN}-monitor = "${bindir}/psu-monitor" +FILES:${PN}-psu-monitor = "${bindir}/phosphor-psu-monitor ${datadir}/phosphor-psu-monitor" +FILES:${PN}-regulators = "${bindir}/phosphor-regulators ${datadir}/phosphor-regulators" +FILES:${PN}-regulators += "${bindir}/regsctl" +FILES:${PN}-sequencer = "${bindir}/pseq-monitor" +FILES:${PN}-utils = "${bindir}/psutils" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb index 1ea2c9e2c..ed16ff6e3 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-psu-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-psu-code-mgmt" -SRCREV = "7905f587ac6aace27e7238a815b7cf5c1025c6ea" +SRCREV = "6d62ceb307409a3b5f1b0012558108bfbfa4300c" SUMMARY = "Phosphor PSU software manager" DESCRIPTION = "Providing PSU firmware version and upgrade" @@ -24,8 +24,8 @@ DEPENDS = " \ # The default config of this repo depends on utils from phosphor-power. # If your system does not depend on phosphor-power, please use -# RDEPENDS_${PN}_remove to remove the dependency. -RDEPENDS_${PN} += "phosphor-power" +# RDEPENDS:${PN}:remove to remove the dependency. +RDEPENDS:${PN} += "phosphor-power" # The below configs are expected to be overriden by machine layer @@ -48,5 +48,5 @@ EXTRA_OEMESON = " \ ${PSU_UPDATE_SERVICE} \ " -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Software.Psu.Updater.service" -SYSTEMD_SERVICE_${PN} += "psu-update@.service" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Software.Psu.Updater.service" +SYSTEMD_SERVICE:${PN} += "psu-update@.service" diff --git a/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb index 5642f1601..eb8e39cd0 100644 --- a/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb +++ b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb @@ -4,18 +4,18 @@ inherit update-alternatives LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" SRC_URI += "file://init" -FILES_${PN} += "${base_sbindir}/init" +FILES:${PN} += "${base_sbindir}/init" do_install() { install -d ${D}/${base_sbindir} install -m 0755 ${WORKDIR}/init ${D}/${base_sbindir}/preinit-mounts } -ALTERNATIVE_${PN} = "init" +ALTERNATIVE:${PN} = "init" ALTERNATIVE_TARGET[init] = "${base_sbindir}/preinit-mounts" ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index de720730a..4b165f86b 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -9,7 +9,7 @@ DESCRIPTION = "Utility to write IPMI SEL records to the journal" # SEL_LOGGER_MONITOR_THRESHOLD_EVENTS: # Monitors and logs SEL records for threshold sensor events -inherit cmake systemd +inherit meson systemd S = "${WORKDIR}/git" LICENSE = "Apache-2.0" @@ -19,19 +19,19 @@ DEPENDS += " \ boost \ sdbusplus \ systemd \ - phosphor-logging \ " SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "e9da2599f10f1b696f61c97f8c8036acfde05e18" +SRCREV = "a138ebd3c759f95c53d61170c05e69bf31718114" PV = "0.1+git${SRCPV}" -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Logging.IPMI.service" +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.Logging.IPMI.service" PACKAGECONFIG ??= "" -PACKAGECONFIG[log-threshold] = "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON,-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=OFF," -PACKAGECONFIG[log-pulse] = "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON,-DREDFISH_LOG_MONITOR_PULSE_EVENTS=OFF," -PACKAGECONFIG[log-watchdog] = "-DSEL_LOGGER_MONITOR_WATCHDOG_EVENTS=ON,-DSEL_LOGGER_MONITOR_WATCHDOG_EVENTS=OFF," -PACKAGECONFIG[log-alarm] = "-DSEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS=ON,-DSEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS=OFF," -PACKAGECONFIG[send-to-logger] = "-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE=ON,-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE=OFF,phosphor-logging" +PACKAGECONFIG[log-threshold] = "-Dlog-threshold=true,-Dlog-threshold=false," +PACKAGECONFIG[log-pulse] = "-Dlog-pulse=true,-Dlog-pulse=false," +PACKAGECONFIG[log-watchdog] = "-Dlog-watchdog=true,-Dlog-watchdog=false," +PACKAGECONFIG[log-alarm] = "-Dlog-alarm=true,-Dlog-alarm=false," +PACKAGECONFIG[send-to-logger] = "-Dsend-to-logger=true,-Dsend-to-logger=false,phosphor-logging" +PACKAGECONFIG[clears-sel] = "-Dclears-sel=true,-Dclears-sel=false" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index ec9e5b86a..d37cbbdfe 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "5cf0f99210890d0cd52d5929e919316d238a5701" +SRCREV = "5ab424a6a4ea56e5fbfad5a1813bed7bfabbd399" PV = "0.1+git${SRCPV}" @@ -34,34 +34,34 @@ PACKAGECONFIG[psusensor] = "-Dpsu=enabled, -Dpsu=disabled" PACKAGECONFIG[nvmesensor] = "-Dnvme=enabled, -Dnvme=disabled" PACKAGECONFIG[external] = "-Dexternal=enabled, -Dexternal=disabled" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'adcsensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'adcsensor', \ 'xyz.openbmc_project.adcsensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpusensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpusensor', \ 'xyz.openbmc_project.cpusensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'exitairtempsensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'exitairtempsensor', \ 'xyz.openbmc_project.exitairsensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'fansensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'fansensor', \ 'xyz.openbmc_project.fansensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'hwmontempsensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'hwmontempsensor', \ 'xyz.openbmc_project.hwmontempsensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'intrusionsensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'intrusionsensor', \ 'xyz.openbmc_project.intrusionsensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'ipmbsensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'ipmbsensor', \ 'xyz.openbmc_project.ipmbsensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'mcutempsensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'mcutempsensor', \ 'xyz.openbmc_project.mcutempsensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'psusensor', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'psusensor', \ 'xyz.openbmc_project.psusensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'external', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'external', \ 'xyz.openbmc_project.externalsensor.service', \ '', d)}" @@ -70,3 +70,4 @@ inherit meson systemd S = "${WORKDIR}/git" +EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb index ab222ab0f..d1e97c4e0 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb @@ -9,7 +9,7 @@ inherit mrw-xml DEPENDS += "mrw-perl-tools-native mrw-native" -do_compile_append() { +do_compile:append() { ${STAGING_BINDIR_NATIVE}/perl-native/perl \ ${STAGING_BINDIR_NATIVE}/hwmon.pl \ -x ${mrw_datadir}/${MRW_XML} \ diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index d0c99e4bd..68338c6cf 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -15,8 +15,8 @@ PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl PACKAGE_BEFORE_PN = "max31785-msl" SYSTEMD_PACKAGES = "${PN} max31785-msl" -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Hwmon@.service" -SYSTEMD_SERVICE_max31785-msl = "${@bb.utils.contains('PACKAGECONFIG', 'max31785-msl', 'phosphor-max31785-msl@.service', '', d)}" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Hwmon@.service" +SYSTEMD_SERVICE:max31785-msl = "${@bb.utils.contains('PACKAGECONFIG', 'max31785-msl', 'phosphor-max31785-msl@.service', '', d)}" DEPENDS += " \ sdbusplus \ @@ -28,20 +28,20 @@ DEPENDS += " \ cli11 \ " -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" -FILES_${PN} += "${base_libdir}/systemd/system/xyz.openbmc_project.Hwmon@.service" -RDEPENDS_${PN} += "\ +FILES:${PN} += "${base_libdir}/systemd/system/xyz.openbmc_project.Hwmon@.service" +RDEPENDS:${PN} += "\ bash \ " -RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_phosphor-hwmon-config}" +RRECOMMENDS:${PN} += "${VIRTUAL-RUNTIME_phosphor-hwmon-config}" -FILES_max31785-msl = "\ +FILES:max31785-msl = "\ ${base_libdir}/systemd/system/phosphor-max31785-msl@.service \ ${bindir}/max31785-msl \ " -RDEPENDS_max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools bash" +RDEPENDS:max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools bash" SRC_URI += "git://github.com/openbmc/phosphor-hwmon" @@ -53,7 +53,7 @@ S = "${WORKDIR}/git" # 1. It adds HW_SENSOR_ID value if not set. The value being calculated # as sha256sum. # 2. For each hwmon the script generates busconfig ACLs. -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { hwmon_dir="$D/etc/default/obmc/hwmon" dbus_dir="$D/etc/dbus-1/system.d" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 235ac42be..927b3cfd7 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=git" -SRCREV = "be3439961f5aedbff56d30bae4cd64b02e6125ae" +SRCREV = "e528b0ae32cbc4c5c7d2595deda1d44d2c1aeb45" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.nvme.manager.service" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.nvme.manager.service" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 51ad59a0b..7745a9e6f 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "4ac7a7f28e7469f0b2e9be096c31294334a6cd1a" +SRCREV = "74c1e7d8c50175017306e347532c8d7e98dc66d5" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" +SYSTEMD_SERVICE:${PN} = "phosphor-virtual-sensor.service" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb index 1ea501a6d..b3c491883 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb @@ -11,7 +11,7 @@ inherit phosphor-settings-manager require phosphor-settings-manager.inc -DBUS_SERVICE_${PN} = "xyz.openbmc_project.Settings.service" +DBUS_SERVICE:${PN} = "xyz.openbmc_project.Settings.service" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-mako-native" diff --git a/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf_git.bb b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf_git.bb index 85191c636..77a253769 100644 --- a/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf_git.bb +++ b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf_git.bb @@ -20,13 +20,13 @@ SRC_URI += "file://gpio_defs.json" # rootfs for applicaitons to use this library. # This next line tells bitbake to skip the check which # ensures no links are put in the rootfs -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" # Ensure the library is not in the dev package FILES_SOLIBSDEV = "" # Now add the link to the production package -FILES_${PN} += "${libdir}/libopenbmc_intf.so" +FILES:${PN} += "${libdir}/libopenbmc_intf.so" do_install() { oe_runmake install DESTDIR=${D} diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb new file mode 100644 index 000000000..f5a046bc9 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -0,0 +1,39 @@ +HOMEPAGE = "http://github.com/openbmc/smbios-mdr" +SUMMARY = "Extract CPU and Memory Inventory from SMSMBIOS Table and PECI" +DESCRIPTION = "This package parses SMBIOS tables, reads Intel CPU PIROM and PECI and provides a dedicated IPMI blob to receive SMBIOS tables sent from LinuxBoot" + +PR = "r1" +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +inherit cmake systemd +inherit obmc-phosphor-ipmiprovider-symlink + +DEPENDS += " \ + boost \ + systemd \ + sdbusplus \ + phosphor-dbus-interfaces \ + phosphor-logging \ + " + +PACKAGECONFIG ?= "cpuinfo" +PACKAGECONFIG[smbios-no-dimm] = "-DDIMM_DBUS=OFF,-DDIMM_DBUS=ON" +PACKAGECONFIG[cpuinfo] = "-DCPU_INFO=ON,-DCPU_INFO=OFF,libpeci i2c-tools" +PACKAGECONFIG[smbios-ipmi-blob] = "-DIPMI_BLOB=ON,-DIPMI_BLOB=OFF,phosphor-ipmi-blobs" + +EXTRA_OECMAKE = "-DYOCTO=ON" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/smbios-mdr.git" +SRCREV = "511b06c05d43c217aa5d7620bd052fafda09d586" + +SYSTEMD_SERVICE:${PN} += "smbios-mdrv2.service" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpuinfo', 'xyz.openbmc_project.cpuinfo.service', '', d)}" + +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" +BLOBIPMI_PROVIDER_LIBRARY += "${@bb.utils.contains('PACKAGECONFIG', 'smbios-ipmi-blob', 'libsmbiosstore.so', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index f2be54c58..fd43707bf 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -15,7 +15,7 @@ SRCREV = "a19b509352cc7d9fcacf345f81163bf6998ec7b4" inherit meson pkgconfig systemd S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "srvcfg-manager.service" +SYSTEMD_SERVICE:${PN} = "srvcfg-manager.service" DEPENDS = " \ boost \ diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index 342bb9c1f..915ca310c 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -22,7 +22,7 @@ def get_service(d): else: return " ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) -SYSTEMD_SERVICE_${PN} = "${@get_service(d)}" +SYSTEMD_SERVICE:${PN} = "${@get_service(d)}" DEPENDS += " \ sdbusplus \ @@ -30,5 +30,5 @@ DEPENDS += " \ phosphor-logging \ " -FILES_${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode@.service" -FILES_${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode.service" +FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode@.service" +FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode.service" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc index 2c01dea63..c692c6163 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc @@ -1,4 +1,4 @@ -pkg_postinst_${PN}-obmc-targets_append() { +pkg_postinst:${PN}-obmc-targets:append() { mkdir -p $D$systemd_system_unitdir/multi-user.target.requires LINK="$D$systemd_system_unitdir/multi-user.target.requires/obmc-host-reset@0.target" @@ -29,14 +29,6 @@ pkg_postinst_${PN}-obmc-targets_append() { ln -s $TARGET $LINK mkdir -p $D$systemd_system_unitdir/obmc-host-reset@0.target.requires - LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-check@0.service" - TARGET="../phosphor-reset-host-check@.service" - ln -s $TARGET $LINK - - LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-sensor-states@0.service" - TARGET="../phosphor-reset-sensor-states@.service" - ln -s $TARGET $LINK - LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-running@0.service" TARGET="../phosphor-reset-host-running@.service" ln -s $TARGET $LINK @@ -89,7 +81,7 @@ pkg_postinst_${PN}-obmc-targets_append() { ln -s $TARGET $LINK } -pkg_prerm_${PN}-obmc-targets_append() { +pkg_prerm:${PN}-obmc-targets:append() { LINK="$D$systemd_system_unitdir/multi-user.target.requires/obmc-host-reset@0.target" rm $LINK @@ -109,12 +101,6 @@ pkg_prerm_${PN}-obmc-targets_append() { LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/phosphor-set-host-transition-to-off@0.service" rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-check@0.service" - rm $LINK - - LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-sensor-states@0.service" - rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/phosphor-reset-sensor-states@0.service" rm $LINK diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index acc96e18d..2e3b3b1cf 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -23,7 +23,7 @@ STATE_MGR_PACKAGES = " \ ${PN}-scheduled-host-transition \ " PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" DBUS_PACKAGES = "${STATE_MGR_PACKAGES}" @@ -38,10 +38,10 @@ SYSTEMD_PACKAGES = "${PN}-discover \ # sensors on a BMC reset or system power loss. # Neither is required for host state function but are # recommended to deal properly with these reset scenarios. -RRECOMMENDS_${PN}-host = "${PN}-host-check ${PN}-reset-sensor-states" +RRECOMMENDS:${PN}-host = "${PN}-host-check ${PN}-reset-sensor-states" # The obmc-targets are the base targets required to boot a computer system -RRECOMMENDS_${PN}-host += "${PN}-obmc-targets" +RRECOMMENDS:${PN}-host += "${PN}-obmc-targets" inherit meson pkgconfig inherit obmc-phosphor-dbus-service @@ -55,46 +55,45 @@ DEPENDS += "libcereal" DEPENDS += "nlohmann-json" DEPENDS += "cli11" -RDEPENDS_${PN}-chassis += "bash" +RDEPENDS:${PN}-chassis += "bash" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" -FILES_${PN}-host = "${bindir}/phosphor-host-state-manager" -DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service" -DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service" -SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service" -SYSTEMD_SERVICE_${PN}-host += "phosphor-clear-one-time@.service" -SYSTEMD_SERVICE_${PN}-host += "phosphor-set-host-transition-to-running@.service" -SYSTEMD_SERVICE_${PN}-host += "phosphor-set-host-transition-to-off@.service" +FILES:${PN}-host = "${bindir}/phosphor-host-state-manager" +DBUS_SERVICE:${PN}-host += "xyz.openbmc_project.State.Host.service" +DBUS_SERVICE:${PN}-host += "phosphor-reboot-host@.service" +SYSTEMD_SERVICE:${PN}-host += "phosphor-reset-host-reboot-attempts@.service" +SYSTEMD_SERVICE:${PN}-host += "phosphor-clear-one-time@.service" +SYSTEMD_SERVICE:${PN}-host += "phosphor-set-host-transition-to-running@.service" +SYSTEMD_SERVICE:${PN}-host += "phosphor-set-host-transition-to-off@.service" -FILES_${PN}-chassis = "${bindir}/phosphor-chassis-state-manager" -DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" +FILES:${PN}-chassis = "${bindir}/phosphor-chassis-state-manager" +DBUS_SERVICE:${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" -FILES_${PN}-chassis += "${bindir}/obmcutil" +FILES:${PN}-chassis += "${bindir}/obmcutil" -FILES_${PN}-bmc = "${bindir}/phosphor-bmc-state-manager" -DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service" +FILES:${PN}-bmc = "${bindir}/phosphor-bmc-state-manager" +DBUS_SERVICE:${PN}-bmc += "xyz.openbmc_project.State.BMC.service" -FILES_${PN}-hypervisor = "${bindir}/phosphor-hypervisor-state-manager" -DBUS_SERVICE_${PN}-hypervisor += "xyz.openbmc_project.State.Hypervisor.service" +FILES:${PN}-hypervisor = "${bindir}/phosphor-hypervisor-state-manager" +DBUS_SERVICE:${PN}-hypervisor += "xyz.openbmc_project.State.Hypervisor.service" -FILES_${PN}-discover = "${bindir}/phosphor-discover-system-state" -SYSTEMD_SERVICE_${PN}-discover += "phosphor-discover-system-state@.service" +FILES:${PN}-discover = "${bindir}/phosphor-discover-system-state" +SYSTEMD_SERVICE:${PN}-discover += "phosphor-discover-system-state@.service" -FILES_${PN}-host-check = "${bindir}/phosphor-host-check" -SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-check@.service" -SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-running@.service" +FILES:${PN}-host-check = "${bindir}/phosphor-host-check" +SYSTEMD_SERVICE:${PN}-host-check += "phosphor-reset-host-running@.service" -SYSTEMD_SERVICE_${PN}-reset-sensor-states += "phosphor-reset-sensor-states@.service" +SYSTEMD_SERVICE:${PN}-reset-sensor-states += "phosphor-reset-sensor-states@.service" -FILES_${PN}-systemd-target-monitor = " \ +FILES:${PN}-systemd-target-monitor = " \ ${bindir}/phosphor-systemd-target-monitor \ ${sysconfdir}/phosphor-systemd-target-monitor/phosphor-target-monitor-default.json \ " -SYSTEMD_SERVICE_${PN}-systemd-target-monitor += "phosphor-systemd-target-monitor.service" +SYSTEMD_SERVICE:${PN}-systemd-target-monitor += "phosphor-systemd-target-monitor.service" -FILES_${PN}-scheduled-host-transition = "${bindir}/phosphor-scheduled-host-transition" -DBUS_SERVICE_${PN}-scheduled-host-transition += "xyz.openbmc_project.State.ScheduledHostTransition.service" +FILES:${PN}-scheduled-host-transition = "${bindir}/phosphor-scheduled-host-transition" +DBUS_SERVICE:${PN}-scheduled-host-transition += "xyz.openbmc_project.State.ScheduledHostTransition.service" # Chassis power synchronization targets # - start-pre: Services to run before we start power on process @@ -163,26 +162,26 @@ CRASH_TIMEOUT_TGTFMT = "obmc-host-{0}@{1}.target" QUIESCE_INSTFMT = "obmc-host-quiesce@{1}.target" QUIESCE_FMT = "../${QUIESCE_TMPL}:${CRASH_TIMEOUT_TGTFMT}.wants/${QUIESCE_INSTFMT}" -SYSTEMD_SERVICE_${PN}-obmc-targets += " \ +SYSTEMD_SERVICE:${PN}-obmc-targets += " \ obmc-fans-ready.target \ obmc-fan-control.target \ obmc-fan-control-ready@.target \ obmc-fan-watchdog-takeover.target \ " -SYSTEMD_SERVICE_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS')}" -SYSTEMD_SERVICE_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_ACTION_FMT', 'CHASSIS_ACTION_TARGETS')}" -SYSTEMD_SERVICE_${PN}-obmc-targets += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}" -SYSTEMD_SERVICE_${PN}-obmc-targets += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}" +SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS')}" +SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_ACTION_FMT', 'CHASSIS_ACTION_TARGETS')}" +SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}" +SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "65bfcf57920d6fac62dbc9dd4a4fabdfe0c53228" +SRCREV = "0a675215d6a6d2eb13e030ba0f618a4691de58d4" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/system/obmc-control-bmc_git.bb b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc_git.bb index 7044f7923..70dac0ad7 100644 --- a/meta-phosphor/recipes-phosphor/system/obmc-control-bmc_git.bb +++ b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc_git.bb @@ -11,4 +11,4 @@ inherit pkgconfig SKELETON_DIR = "bmcctl" FMT = "org.openbmc.control.Bmc@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_BMC_INSTANCES')}" +DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_BMC_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb index 9879a61f4..41a4c1e24 100644 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb +++ b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-pydbus-service PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN} += "virtual-obmc-system-mgmt" +RPROVIDES:${PN} += "virtual-obmc-system-mgmt" S = "${WORKDIR}" SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 0499052bf..f0f28a096 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "a74e44f6ef7db43d38eb600fbfee152b31b30514" +SRCREV = "93064d8fcef2c6fde1f61c0cedacb46b21eab039" S = "${WORKDIR}/git" @@ -22,6 +22,6 @@ DEPENDS = "boost \ sdbusplus \ systemd" -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Telemetry.service" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Telemetry.service" EXTRA_OEMESON = "-Dbuildtest=false" diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 5c54a9b65..18a7c505a 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -23,15 +23,15 @@ inherit useradd USERADD_PACKAGES = "${PN} phosphor-ldap" DBUS_PACKAGES = "${USERADD_PACKAGES}" # add groups needed for privilege maintenance -GROUPADD_PARAM_${PN} = "priv-admin; priv-operator; priv-user " -GROUPADD_PARAM_phosphor-ldap = "priv-admin; priv-operator; priv-user " +GROUPADD_PARAM:${PN} = "priv-admin; priv-operator; priv-user " +GROUPADD_PARAM:phosphor-ldap = "priv-admin; priv-operator; priv-user " -DBUS_SERVICE_${PN} += "xyz.openbmc_project.User.Manager.service" -FILES_phosphor-ldap += " \ +DBUS_SERVICE:${PN} += "xyz.openbmc_project.User.Manager.service" +FILES:phosphor-ldap += " \ ${bindir}/phosphor-ldap-conf \ ${bindir}/phosphor-ldap-mapper \ " -DBUS_SERVICE_phosphor-ldap = " \ +DBUS_SERVICE:phosphor-ldap = " \ xyz.openbmc_project.Ldap.Config.service \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " diff --git a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb index 0c171dd3a..8480bc60b 100644 --- a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb +++ b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb @@ -25,5 +25,5 @@ do_install() { install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir}/ } -SYSTEMD_SERVICE_${PN} += "fbterm.service" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "fbterm" +SYSTEMD_SERVICE:${PN} += "fbterm.service" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "fbterm" diff --git a/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb index 9f3e21344..62d19ec82 100644 --- a/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb +++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb @@ -14,16 +14,16 @@ inherit systemd DEPENDS += "autoconf-archive-native" DEPENDS += "systemd" -RDEPENDS_${PN} += "fbterm" +RDEPENDS:${PN} += "fbterm" SRCREV = "26ac7f7bd6af52db63451d3633bcf1b167eea3d1" PV = "0.1+git${SRCPV}" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} += "uart-render-controller.service" +SYSTEMD_SERVICE:${PN} += "uart-render-controller.service" -do_install_append() { +do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/uart-render-controller.service ${D}${systemd_system_unitdir}/ } diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index eb97c9816..9fe1e6081 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit meson pkgconfig inherit obmc-phosphor-dbus-service -RPROVIDES_${PN} += "virtual/obmc-watchdog" +RPROVIDES:${PN} += "virtual/obmc-watchdog" PROVIDES += "virtual/obmc-watchdog" DEPENDS += "cli11" @@ -20,7 +20,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "systemd" SRC_URI += "git://github.com/openbmc/phosphor-watchdog" -SRCREV = "61bc6cdd56285e64642c26e86d84a824f25c9e88" +SRCREV = "15c5bd1b60300255d9dd2ffdd77eaf6dfce51722" S = "${WORKDIR}/git" EXTRA_OEMESON = " \ @@ -28,10 +28,10 @@ EXTRA_OEMESON = " \ " # Copies config file having arguments for host watchdog -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/watchdog/poweron" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" # For now, watching PowerOn is the only usecase OBMC_HOST_WATCHDOG_INSTANCES = "poweron" @@ -40,10 +40,10 @@ OBMC_HOST_WATCHDOG_INSTANCES = "poweron" # an argument, so making it this way. WATCHDOG_TMPL = "phosphor-watchdog@.service" ENABLE_WATCHDOG_TMPL = "obmc-enable-host-watchdog@.service" -SYSTEMD_SERVICE_${PN} += "${WATCHDOG_TMPL}" +SYSTEMD_SERVICE:${PN} += "${WATCHDOG_TMPL}" # To Enable Host Watchdog early during poweron -SYSTEMD_SERVICE_${PN} += "${ENABLE_WATCHDOG_TMPL}" +SYSTEMD_SERVICE:${PN} += "${ENABLE_WATCHDOG_TMPL}" WATCHDOG_TGTFMT = "phosphor-watchdog@{0}.service" ENABLE_WATCHDOG_TGTFMT = "obmc-enable-host-watchdog@{0}.service" @@ -51,5 +51,5 @@ ENABLE_WATCHDOG_TGTFMT = "obmc-enable-host-watchdog@{0}.service" WATCHDOG_FMT = "../${WATCHDOG_TMPL}:obmc-host-startmin@{1}.target.wants/${WATCHDOG_TGTFMT}" ENABLE_WATCHDOG_FMT = "../${ENABLE_WATCHDOG_TMPL}:obmc-host-startmin@{0}.target.wants/${ENABLE_WATCHDOG_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/webui/nlf_2.1.1.bb b/meta-phosphor/recipes-phosphor/webui/nlf_2.1.1.bb index b43ed8eba..6911d6a6c 100644 --- a/meta-phosphor/recipes-phosphor/webui/nlf_2.1.1.bb +++ b/meta-phosphor/recipes-phosphor/webui/nlf_2.1.1.bb @@ -107,48 +107,48 @@ S = "${WORKDIR}/npm" inherit npm -LICENSE_${PN} = "MIT" -LICENSE_${PN}-octetstream-promisify = "MIT" -LICENSE_${PN}-ansicolors = "MIT" -LICENSE_${PN}-archy = "MIT" -LICENSE_${PN}-asap = "MIT" -LICENSE_${PN}-balanced-match = "MIT" -LICENSE_${PN}-brace-expansion = "MIT" -LICENSE_${PN}-commander = "MIT" -LICENSE_${PN}-compare-versions = "MIT" -LICENSE_${PN}-concat-map = "MIT" -LICENSE_${PN}-debug = "MIT" -LICENSE_${PN}-fsrealpath = "ISC" -LICENSE_${PN}-glob = "ISC" -LICENSE_${PN}-glob-all = "MIT" -LICENSE_${PN}-hosted-git-info = "ISC" -LICENSE_${PN}-inflight = "ISC" -LICENSE_${PN}-inherits = "ISC" -LICENSE_${PN}-lodashassign = "MIT" -LICENSE_${PN}-lodashassignin = "MIT" -LICENSE_${PN}-lodashclone = "MIT" -LICENSE_${PN}-lodashclonedeep = "MIT" -LICENSE_${PN}-lodashflatten = "MIT" -LICENSE_${PN}-lodashget = "MIT" -LICENSE_${PN}-lodashset = "MIT" -LICENSE_${PN}-lru-cache = "ISC" -LICENSE_${PN}-minimatch = "ISC" -LICENSE_${PN}-minimist = "MIT" -LICENSE_${PN}-ms = "MIT" -LICENSE_${PN}-once = "ISC" -LICENSE_${PN}-path-is-absolute = "MIT" -LICENSE_${PN}-promise = "MIT" -LICENSE_${PN}-promise-fs = "MIT" -LICENSE_${PN}-pseudomap = "ISC" -LICENSE_${PN}-semver = "ISC" -LICENSE_${PN}-snyk-module = "Apache-2.0" -LICENSE_${PN}-snyk-resolve-debug = "MIT" -LICENSE_${PN}-snyk-resolve-ms = "MIT" -LICENSE_${PN}-snyk-resolve = "Apache-2.0" -LICENSE_${PN}-snyk-resolve-deps = "Apache-2.0" -LICENSE_${PN}-snyk-tree = "Apache-2.0" -LICENSE_${PN}-snyk-try-require = "Apache-2.0" -LICENSE_${PN}-then-fs = "MIT" -LICENSE_${PN}-wrappy = "ISC" -LICENSE_${PN}-yallist = "ISC" -LICENSE_${PN}-yargs = "MIT" +LICENSE:${PN} = "MIT" +LICENSE:${PN}-octetstream-promisify = "MIT" +LICENSE:${PN}-ansicolors = "MIT" +LICENSE:${PN}-archy = "MIT" +LICENSE:${PN}-asap = "MIT" +LICENSE:${PN}-balanced-match = "MIT" +LICENSE:${PN}-brace-expansion = "MIT" +LICENSE:${PN}-commander = "MIT" +LICENSE:${PN}-compare-versions = "MIT" +LICENSE:${PN}-concat-map = "MIT" +LICENSE:${PN}-debug = "MIT" +LICENSE:${PN}-fsrealpath = "ISC" +LICENSE:${PN}-glob = "ISC" +LICENSE:${PN}-glob-all = "MIT" +LICENSE:${PN}-hosted-git-info = "ISC" +LICENSE:${PN}-inflight = "ISC" +LICENSE:${PN}-inherits = "ISC" +LICENSE:${PN}-lodashassign = "MIT" +LICENSE:${PN}-lodashassignin = "MIT" +LICENSE:${PN}-lodashclone = "MIT" +LICENSE:${PN}-lodashclonedeep = "MIT" +LICENSE:${PN}-lodashflatten = "MIT" +LICENSE:${PN}-lodashget = "MIT" +LICENSE:${PN}-lodashset = "MIT" +LICENSE:${PN}-lru-cache = "ISC" +LICENSE:${PN}-minimatch = "ISC" +LICENSE:${PN}-minimist = "MIT" +LICENSE:${PN}-ms = "MIT" +LICENSE:${PN}-once = "ISC" +LICENSE:${PN}-path-is-absolute = "MIT" +LICENSE:${PN}-promise = "MIT" +LICENSE:${PN}-promise-fs = "MIT" +LICENSE:${PN}-pseudomap = "ISC" +LICENSE:${PN}-semver = "ISC" +LICENSE:${PN}-snyk-module = "Apache-2.0" +LICENSE:${PN}-snyk-resolve-debug = "MIT" +LICENSE:${PN}-snyk-resolve-ms = "MIT" +LICENSE:${PN}-snyk-resolve = "Apache-2.0" +LICENSE:${PN}-snyk-resolve-deps = "Apache-2.0" +LICENSE:${PN}-snyk-tree = "Apache-2.0" +LICENSE:${PN}-snyk-try-require = "Apache-2.0" +LICENSE:${PN}-then-fs = "MIT" +LICENSE:${PN}-wrappy = "ISC" +LICENSE:${PN}-yallist = "ISC" +LICENSE:${PN}-yargs = "MIT" diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index c7af9f7b1..54c63bfc4 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -9,11 +9,11 @@ SRC_URI = "git://github.com/openbmc/phosphor-webui.git" SRCREV = "51229f8005cb20a12e8d0f057d4565f31d84fa29" S = "${WORKDIR}/git" -DEPENDS_prepend = "nodejs-native " +DEPENDS:prepend = "nodejs-native " inherit allarch -FILES_${PN} += "${datadir}/www/*" +FILES:${PN} += "${datadir}/www/*" do_compile () { cd ${S} diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 6986026f5..cd155b7da 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,10 +6,10 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "03dc2b7b9f0672aac84349fbc77aab55403447e0" +SRCREV = "aaff26ef8262df7d6b5bfdd5da52b75a158a4ec5" S = "${WORKDIR}/git" -DEPENDS_prepend = "nodejs-native nlf-native " +DEPENDS:prepend = "nodejs-native nlf-native " # allarch is required because the files this recipe produces (html and # javascript) are valid for any target, regardless of architecture. The allarch @@ -28,13 +28,15 @@ export CFLAGS = "${BUILD_CFLAGS}" export CPPFLAGS = "${BUILD_CPPFLAGS}" export CXXFLAGS = "${BUILD_CXXFLAGS}" -FILES_${PN} += "${datadir}/www/*" +FILES:${PN} += "${datadir}/www/*" + +EXTRA_OENPM ?= "" do_compile () { cd ${S} rm -rf node_modules npm --loglevel info --proxy=${http_proxy} --https-proxy=${https_proxy} install - npm run build + npm run build ${EXTRA_OENPM} } do_install () { |