diff options
Diffstat (limited to 'meta-google/recipes-phosphor')
11 files changed, 46 insertions, 46 deletions
diff --git a/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend b/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend index 8ba6e7c33..47e290b35 100644 --- a/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend +++ b/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend @@ -1,2 +1,2 @@ -PHOSPHOR_MAPPER_SERVICE_append = " com.google.gbmc" -PHOSPHOR_MAPPER_INTERFACE_append = " com.google.gbmc" +PHOSPHOR_MAPPER_SERVICE:append = " com.google.gbmc" +PHOSPHOR_MAPPER_INTERFACE:append = " com.google.gbmc" diff --git a/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb b/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb index 7eba3b0fc..4bff6e331 100644 --- a/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb +++ b/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb @@ -10,9 +10,9 @@ inherit systemd SRC_URI += "file://config-dummy.json" SRC_URI += "file://dummy-verify.service" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash" -SYSTEMD_SERVICE_${PN} += "dummy-verify.service" +SYSTEMD_SERVICE:${PN} += "dummy-verify.service" do_install() { install -d ${D}${datadir}/phosphor-ipmi-flash diff --git a/meta-google/recipes-phosphor/flash/google-key.bb b/meta-google/recipes-phosphor/flash/google-key.bb index 220211526..62d54f25e 100644 --- a/meta-google/recipes-phosphor/flash/google-key.bb +++ b/meta-google/recipes-phosphor/flash/google-key.bb @@ -5,8 +5,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN} += "gnupg" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "gnupg" SRC_URI += " \ file://platforms_gbmc_bringup.gpg \ diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb index c71a579e1..9e55afce5 100644 --- a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd PROVIDES += "virtual/bmc-update" -RPROVIDES_${PN} += "virtual/bmc-update" +RPROVIDES:${PN} += "virtual/bmc-update" -RDEPENDS_${PN} += "google-key" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "google-key" +RDEPENDS:${PN} += "bash" SRC_URI += " \ file://config-bmc.json \ @@ -21,10 +21,10 @@ SRC_URI += " \ file://inplace-gbmc-version.sh \ " -SYSTEMD_SERVICE_${PN} += "inplace-gbmc-verify.service" -SYSTEMD_SERVICE_${PN} += "inplace-gbmc-version.service" +SYSTEMD_SERVICE:${PN} += "inplace-gbmc-verify.service" +SYSTEMD_SERVICE:${PN} += "inplace-gbmc-version.service" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash" do_install() { sed -i 's,@ALLOW_DEV@,,' ${WORKDIR}/inplace-gbmc-verify.sh @@ -39,6 +39,6 @@ do_install() { install -m 0644 ${WORKDIR}/config-bmc.json ${D}${datadir}/phosphor-ipmi-flash } -do_install_prepend_dev() { +do_install:prepend:dev() { sed -i 's,@ALLOW_DEV@,--allow-dev,' ${WORKDIR}/inplace-gbmc-verify.sh } diff --git a/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend index 01669cca8..204ed0353 100644 --- a/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend +++ b/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend @@ -2,6 +2,6 @@ # while the machine is booting. Especially when host serial logs also get # written. This enables the verbose output of the daemon, providing # the logging behavior. -do_install_append_gbmc_dev() { +do_install:append:gbmc:dev() { sed -i '/^ExecStart=/ s,$, -v,' ${D}${systemd_system_unitdir}/lpcsnoop.service } diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index 942dfc14c..dce86826f 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,25 +1,25 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " google-ipmi-sys" -OBMC_IMAGE_EXTRA_INSTALL_append = " google-ipmi-i2c" -OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-blobs" -OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-ethstats" -OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-flash" +OBMC_IMAGE_EXTRA_INSTALL:append = " google-ipmi-sys" +OBMC_IMAGE_EXTRA_INSTALL:append = " google-ipmi-i2c" +OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-blobs" +OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-ethstats" +OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-flash" # Google BMC (gBMC) specific installs -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " iproute2 iproute2-ss" -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-systemd-config" -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-iperf3" -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " authorized-keys-comp" -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc_dev = " gbmc-dev-ssh-key" -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \ +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " iproute2 iproute2-ss" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-systemd-config" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-iperf3" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " authorized-keys-comp" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc:dev = " gbmc-dev-ssh-key" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \ '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else " gbmc-ncsi-config"}' -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \ +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \ '${@"" if not d.getVar("GBMC_MAC_EEPROM_OF_NAME") else " gbmc-mac-config"}' # Include these useful utilities for all gbmc platforms -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " ipmitool" -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " iotools" -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " lrzsz" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " ipmitool" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " iotools" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " lrzsz" # Add gBMC update recipes -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " dummy-gbmc-update" -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " virtual/bmc-update" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " dummy-gbmc-update" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " virtual/bmc-update" diff --git a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend index 905a39a48..de696efb3 100644 --- a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend +++ b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend @@ -1,20 +1,20 @@ # This is needed to guarantee that our whitelist takes # precendence over the OpenBMC one -FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:" -SRC_URI_append_gbmc_dev = " file://whitelist.dev" +SRC_URI:append:gbmc:dev = " file://whitelist.dev" -do_install_append_gbmc_dev() { +do_install:append:gbmc:dev() { cat ${WORKDIR}/whitelist.dev >>${D}/whitelist } -SRC_URI_append_gbmc_dev = " file://rwfs-clean-dev.patch" +SRC_URI:append:gbmc:dev = " file://rwfs-clean-dev.patch" # Required for the clean-dev patch to detect version changes -RDEPENDS_${PN}_append_gbmc_dev = " os-release" +RDEPENDS:${PN}:append:gbmc:dev = " os-release" -do_install_append_gbmc_prod() { +do_install:append:gbmc:prod() { echo "clean-rwfs-filesystem" > ${D}/init-options-base chmod 0644 ${D}/init-options-base } -FILES_${PN}_append_gbmc_prod = " /init-options-base" +FILES:${PN}:append:gbmc:prod = " /init-options-base" diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 03e99b2d0..56f7933d4 100644 --- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1,13 +1,13 @@ -FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:" -SRC_URI_append_gbmc = " file://gbmc_bridge.json" +SRC_URI:append:gbmc = " file://gbmc_bridge.json" -DEPENDS_append_gbmc = " jq-native" +DEPENDS:append:gbmc = " jq-native" GBMCBR_IPMI_CHANNEL ?= "11" # Replace a channel in config.json to add gbmcbr reporting -do_install_append_gbmc() { +do_install:append:gbmc() { chjson=${D}${datadir}/ipmi-providers/channel_config.json overlapping="$(jq '."${GBMCBR_IPMI_CHANNEL}" | .is_valid and .name != "gbmcbr"' $chjson)" if [ "$overlapping" != "false" ]; then diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend index 4519baea6..0c05a9ece 100644 --- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend @@ -1,2 +1,2 @@ # Enable registration via Google OEM Number in addition to OpenBMC. -EXTRA_OECONF_append = " --enable-google" +EXTRA_OECONF:append = " --enable-google" diff --git a/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend index 4a1cbe139..800355225 100644 --- a/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,3 +1,3 @@ # Platforms with Hoth don't use the U-Boot environment since this would allow # bypassing attestation. -PACKAGECONFIG_remove_hoth = "uboot-env" +PACKAGECONFIG:remove:hoth = "uboot-env" diff --git a/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 46d11234e..764f0c828 100644 --- a/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,5 +1,5 @@ #Override the default time settings from BMC/NTP to Host/Manual, so that host #can set BMC time via an IPMI command. -FILESEXTRAPATHS_append_gbmc := ":${THISDIR}/${PN}" -SRC_URI_append_gbmc = " file://timemanager-default-HOST-MANUAL.override.yml" +FILESEXTRAPATHS:append:gbmc := ":${THISDIR}/${PN}" +SRC_URI:append:gbmc = " file://timemanager-default-HOST-MANUAL.override.yml" |