From 6f7466418cc95a27f07ae932fa6fdd56e9c7f90d Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 6 Aug 2021 07:40:55 -0500 Subject: meta-facebook: prep for new override syntax Ran `scripts/contrib/convert-overrides.py` from upstream Yocto and fixed up a few by hand that were missed. Tested: Built bletchley and tiogapass. Signed-off-by: Patrick Williams Change-Id: I0489ba007132901697e4ef1a29b03a3591b3ee3b --- meta-facebook/conf/layer.conf | 4 +-- .../conf/machine/include/facebook-withhost.inc | 2 +- meta-facebook/conf/machine/include/facebook.inc | 12 ++++---- meta-facebook/meta-bletchley/conf/layer.conf | 4 +-- .../meta-bletchley/conf/local.conf.sample | 6 ++-- .../u-boot/u-boot-aspeed-sdk_%.bbappend | 2 +- .../u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend | 2 +- meta-facebook/meta-tiogapass/conf/layer.conf | 4 +-- .../meta-tiogapass/conf/local.conf.sample | 8 +++--- .../meta-tiogapass/conf/machine/tiogapass.conf | 2 +- .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 2 +- .../u-boot/u-boot-fw-utils-aspeed_%.bbappend | 2 +- .../recipes-extended/rsyslog/rsyslog_%.bbappend | 8 +++--- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- meta-facebook/meta-yosemitev2/conf/layer.conf | 4 +-- .../meta-yosemitev2/conf/local.conf.sample | 8 +++--- .../meta-yosemitev2/conf/machine/yosemitev2.conf | 2 +- .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 2 +- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- .../recipes-fb/fb-powerctrl/fb-powerctrl.bb | 6 ++-- meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb | 20 +++++++------- .../packagegroups/packagegroup-fb-apps.bb | 32 +++++++++++----------- .../console/obmc-console_%.bbappend | 14 +++++----- .../fans/phosphor-pid-control_%.bbappend | 4 +-- .../flash/phosphor-software-manager_%.bbappend | 8 +++--- .../hostlogger/phosphor-hostlogger_%.bbappend | 10 +++---- .../images/obmc-phosphor-image.bbappend | 4 +-- .../ipmi/phosphor-ipmi-config.bbappend | 2 +- .../ipmi/phosphor-ipmi-ipmb_%.bbappend | 6 ++-- .../packagegroups/packagegroup-obmc-apps.bbappend | 4 +-- .../sel-logger/phosphor-sel-logger_%.bbappend | 2 +- .../sensors/phosphor-nvme_%.bbappend | 6 ++-- .../sensors/phosphor-virtual-sensor_%.bbappend | 6 ++-- .../settings/phosphor-settings-manager_%.bbappend | 4 +-- .../watchdog/phosphor-watchdog_%.bbappend | 6 ++-- .../chassis/x86-power-control_%.bbappend | 2 +- 36 files changed, 107 insertions(+), 107 deletions(-) (limited to 'meta-facebook') diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index c0ca08f37..a22a085f9 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -6,5 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "facebook-layer" -BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott" +BBFILE_PATTERN:facebook-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT:facebook-layer := "gatesgarth hardknott" diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index ebe79d1a4..dba7444aa 100644 --- a/meta-facebook/conf/machine/include/facebook-withhost.inc +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -10,6 +10,6 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER:virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" OVERRIDES .= ":fb-withhost" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 2993dc438..33e95aff5 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -6,12 +6,12 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" -PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER:virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER:virtual/obmc-fan-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER:virtual/obmc-flash-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER:virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER:virtual/obmc-system-mgmt = "packagegroup-fb-apps" -IMAGE_FEATURES_remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-ikvm" OVERRIDES .= ":facebook" diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf index 505e67c68..51e1caba3 100644 --- a/meta-facebook/meta-bletchley/conf/layer.conf +++ b/meta-facebook/meta-bletchley/conf/layer.conf @@ -6,6 +6,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "bletchley-layer" -BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/" +BBFILE_PATTERN:bletchley-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_bletchley-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT:bletchley-layer := "gatesgarth hardknott" diff --git a/meta-facebook/meta-bletchley/conf/local.conf.sample b/meta-facebook/meta-bletchley/conf/local.conf.sample index 0c5e4cd5f..aeb3ae0b8 100644 --- a/meta-facebook/meta-bletchley/conf/local.conf.sample +++ b/meta-facebook/meta-bletchley/conf/local.conf.sample @@ -93,7 +93,7 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" # # Extra image configuration defaults @@ -202,8 +202,8 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#PACKAGECONFIG:append:pn-qemu-native = " sdl" +#PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend index 2789df998..d526638c0 100644 --- a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch \ diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend index b7bdbd200..c9401d177 100644 --- a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-aspeed-sdk:" +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:" SRC_URI += " \ file://0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch \ diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf index 94db7e114..34cb1eb2b 100644 --- a/meta-facebook/meta-tiogapass/conf/layer.conf +++ b/meta-facebook/meta-tiogapass/conf/layer.conf @@ -6,6 +6,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "tiogapass-layer" -BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/" +BBFILE_PATTERN:tiogapass-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_tiogapass-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT:tiogapass-layer := "gatesgarth hardknott" diff --git a/meta-facebook/meta-tiogapass/conf/local.conf.sample b/meta-facebook/meta-tiogapass/conf/local.conf.sample index 641963aed..c7b9c3c64 100644 --- a/meta-facebook/meta-tiogapass/conf/local.conf.sample +++ b/meta-facebook/meta-tiogapass/conf/local.conf.sample @@ -65,7 +65,7 @@ MACHINE ??= "tiogapass" # DISTRO ?= "openbmc-phosphor" # As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream +# where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not # useful to most new users. # DISTRO ?= "poky-bleeding" @@ -93,7 +93,7 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" # # Extra image configuration defaults @@ -204,8 +204,8 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#PACKAGECONFIG:append:pn-qemu-native = " sdl" +#PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf index 1e6ee084b..deaf0f28e 100644 --- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf +++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf @@ -9,5 +9,5 @@ require conf/machine/include/obmc-bsp-common.inc SERIAL_CONSOLES = "57600;ttyS4" -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" +PREFERRED_PROVIDER:virtual/obmc-host-ctl ?= "" FLASH_SIZE = "32768" diff --git a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index b9bf0af2a..db85451db 100644 --- a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch" diff --git a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend index f24fe5e4f..d66a385e6 100644 --- a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend +++ b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-aspeed:" +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed:" SRC_URI += "file://0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch" diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend index eeeea1a30..104d13b4a 100644 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://rsyslog.conf \ file://rsyslog.logrotate \ @@ -6,12 +6,12 @@ SRC_URI += "file://rsyslog.conf \ file://rotate-event-logs.timer \ " -PACKAGECONFIG_append = " imjournal" +PACKAGECONFIG:append = " imjournal" -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir} rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf } -SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service rotate-event-logs.timer" +SYSTEMD_SERVICE:${PN} += " rotate-event-logs.service rotate-event-logs.timer" diff --git a/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed_%.bbappend index 0eb088404..df490bc84 100644 --- a/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" SRC_URI += "file://tiogapass.cfg" diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf index 977d5df67..9144ca541 100644 --- a/meta-facebook/meta-yosemitev2/conf/layer.conf +++ b/meta-facebook/meta-yosemitev2/conf/layer.conf @@ -6,6 +6,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "yosemitev2-layer" -BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/" +BBFILE_PATTERN:yosemitev2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_yosemitev2-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT:yosemitev2-layer := "gatesgarth hardknott" diff --git a/meta-facebook/meta-yosemitev2/conf/local.conf.sample b/meta-facebook/meta-yosemitev2/conf/local.conf.sample index 297d077cc..c9dffc2e4 100644 --- a/meta-facebook/meta-yosemitev2/conf/local.conf.sample +++ b/meta-facebook/meta-yosemitev2/conf/local.conf.sample @@ -65,7 +65,7 @@ MACHINE ??= "yosemitev2" # DISTRO ?= "openbmc-phosphor" # As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream +# where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not # useful to most new users. # DISTRO ?= "poky-bleeding" @@ -93,7 +93,7 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" # # Extra image configuration defaults @@ -204,8 +204,8 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#PACKAGECONFIG:append:pn-qemu-native = " sdl" +#PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index d246cc9b3..9119189bc 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -9,6 +9,6 @@ require conf/machine/include/obmc-bsp-common.inc SERIAL_CONSOLES = "57600;ttyS4" -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" +PREFERRED_PROVIDER:virtual/obmc-host-ctl ?= "" FLASH_SIZE = "32768" OBMC_HOST_INSTANCES = "1 2 3 4" diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 1c38b11ba..298738f04 100644 --- a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI +="file://0001-board-aspeed-Add-Mux-for-yosemitev2.patch" SRC_URI +="file://0002-spl-host-console-handle.patch" diff --git a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend index 9020b66fb..299aebaf2 100644 --- a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" SRC_URI += "file://yosemitev2.cfg" diff --git a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb index 1f476adee..ee7202164 100644 --- a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb +++ b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" +FILESEXTRAPATHS:append := "${THISDIR}/files:" inherit obmc-phosphor-systemd LICENSE = "Apache-2.0" @@ -14,10 +14,10 @@ SRC_URI = "file://setup_gpio.sh \ file://LICENSE" DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "host-gpio.service host-poweron.service host-poweroff.service" +SYSTEMD_SERVICE:${PN} = "host-gpio.service host-poweron.service host-poweroff.service" do_install() { install -d ${D}/usr/sbin diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 28586a989..9c7eff7fa 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -15,25 +15,25 @@ DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd " inherit cmake obmc-phosphor-ipmiprovider-symlink EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" -EXTRA_OECMAKE_append_yosemitev2 = " -DBIC=1" +EXTRA_OECMAKE:append:yosemitev2 = " -DBIC=1" -EXTRA_OECMAKE_append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'" +EXTRA_OECMAKE:append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'" LIBRARY_NAMES = "libzfboemcmds.so" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" -FILES_${PN}_append = " ${datadir}/lcd-debug/post_desc.json" -FILES_${PN}_append = " ${datadir}/lcd-debug/gpio_desc.json" -FILES_${PN}_append = " ${datadir}/lcd-debug/cri_sensors.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/post_desc.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/gpio_desc.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/cri_sensors.json" -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}" +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}" -do_install_append(){ +do_install:append(){ install -d ${D}${includedir}/fb-ipmi-oem install -m 0644 -D ${S}/include/*.hpp ${D}${includedir}/fb-ipmi-oem } diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index 6b61bba5a..d9c2abd53 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -10,7 +10,7 @@ PACKAGES = " \ ${PN}-flash \ ${PN}-system \ " -PACKAGES_append_fb-withhost = " \ +PACKAGES:append:fb-withhost = " \ ${PN}-chassis \ ${PN}-hostmgmt \ " @@ -20,31 +20,31 @@ PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-chassis = "Facebook Chassis" -RDEPENDS_${PN}-chassis = " \ +SUMMARY:${PN}-chassis = "Facebook Chassis" +RDEPENDS:${PN}-chassis = " \ x86-power-control \ " -SUMMARY_${PN}-extras_tiogapass = "Extra features for tiogapass" -RDEPENDS_${PN}-extras_tiogapass = "phosphor-nvme" +SUMMARY:${PN}-extras:tiogapass = "Extra features for tiogapass" +RDEPENDS:${PN}-extras:tiogapass = "phosphor-nvme" -SUMMARY_${PN}-fans = "Facebook Fans" -RDEPENDS_${PN}-fans = " \ +SUMMARY:${PN}-fans = "Facebook Fans" +RDEPENDS:${PN}-fans = " \ phosphor-pid-control \ " -SUMMARY_${PN}-flash = "Facebook Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "Facebook Flash" +RDEPENDS:${PN}-flash = " \ phosphor-software-manager \ " RDEPENDS_PN_SYSTEM_EXTRAS = "" -RDEPENDS_PN_SYSTEM_EXTRAS_fb-withhost = " \ +RDEPENDS_PN_SYSTEM_EXTRAS:fb-withhost = " \ fb-powerctrl \ phosphor-ipmi-ipmb \ fb-ipmi-oem \ @@ -55,8 +55,8 @@ RDEPENDS_PN_SYSTEM_EXTRAS_fb-withhost = " \ phosphor-host-postd \ " -SUMMARY_${PN}-system = "Facebook System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "Facebook System" +RDEPENDS:${PN}-system = " \ entity-manager \ dbus-sensors \ phosphor-virtual-sensor \ diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index f0a1c7be8..266614079 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" OBMC_CONSOLE_HOST_TTY = "ttyS2" -SRC_URI_append_tiogapass = " file://server.ttyS2.conf" -SRC_URI_append_yosemitev2 = " file://server.ttyS0.conf \ +SRC_URI:append:tiogapass = " file://server.ttyS2.conf" +SRC_URI:append:yosemitev2 = " file://server.ttyS0.conf \ file://server.ttyS1.conf \ file://server.ttyS2.conf \ file://server.ttyS3.conf \ @@ -11,12 +11,12 @@ SRC_URI_append_yosemitev2 = " file://server.ttyS0.conf \ file://client.2202.conf \ file://client.2203.conf" -SRC_URI_remove = "file://${BPN}.conf" +SRC_URI:remove = "file://${BPN}.conf" -SYSTEMD_SERVICE_${PN}_remove_yosemitev2 = "obmc-console-ssh.socket" -EXTRA_OECONF_append_yosemitev2 = " --enable-concurrent-servers" +SYSTEMD_SERVICE:${PN}:remove:yosemitev2 = "obmc-console-ssh.socket" +EXTRA_OECONF:append:yosemitev2 = " --enable-concurrent-servers" -do_install_append() { +do_install:append() { # Install the server configuration install -m 0755 -d ${D}${sysconfdir}/${BPN} install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/ diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 83567e906..4cdfe5a9e 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OECONF_append = " --enable-configure-dbus=yes" +EXTRA_OECONF:append = " --enable-configure-dbus=yes" diff --git a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 2d0363286..047f01970 100644 --- a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://bios-update.sh" -PACKAGECONFIG_append = " flash_bios" -RDEPENDS_${PN} += "bash" +PACKAGECONFIG:append = " flash_bios" +RDEPENDS:${PN} += "bash" -do_install_append() { +do_install:append() { install -d ${D}/${sbindir} install -m 0755 ${WORKDIR}/bios-update.sh ${D}/${sbindir}/ } diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend index 3c280ceba..8ae2e609e 100644 --- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend +++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://ttyS2.conf" -SRC_URI_append_yosemitev2 += "file://ttyS0.conf" -SRC_URI_append_yosemitev2 += "file://ttyS1.conf" -SRC_URI_append_yosemitev2 += "file://ttyS3.conf" +SRC_URI:append:yosemitev2 += "file://ttyS0.conf" +SRC_URI:append:yosemitev2 += "file://ttyS1.conf" +SRC_URI:append:yosemitev2 += "file://ttyS3.conf" -do_install_append() { +do_install:append() { # Install the configurations install -m 0755 -d ${D}${sysconfdir}/${BPN} diff --git a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend index ad9c87ae4..f62ffdbc7 100644 --- a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -IMAGE_FEATURES_remove_fb-nohost = "obmc-console" +IMAGE_FEATURES:remove:fb-nohost = "obmc-console" diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index 1a9d9e0a5..9557c2681 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" -SRC_URI_append = " file://ipmb-channels.json" +SRC_URI:append = " file://ipmb-channels.json" -do_install_append() { +do_install:append() { install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ ${D}/usr/share/ipmbbridge } diff --git a/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index dbcc895d4..d7953e133 100644 --- a/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PACKAGES_remove_fb-nohost = "\ +PACKAGES:remove:fb-nohost = "\ ${PN}-console \ " diff --git a/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index ac98c7ce7..ca35bcb6a 100644 --- a/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " log-threshold log-pulse" +PACKAGECONFIG:append = " log-threshold log-pulse" diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend index 95a590704..94db23f76 100644 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" -SRC_URI_append = " file://nvme_config.json" +SRC_URI:append = " file://nvme_config.json" -do_install_append() { +do_install:append() { install -m 0644 -D ${WORKDIR}/nvme_config.json \ ${D}/etc/nvme } diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 94650bab6..4487aa279 100644 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" -SRC_URI_append = " file://${MACHINE}_sensor_config.json" +SRC_URI:append = " file://${MACHINE}_sensor_config.json" -do_install_append() { +do_install:append() { install -d ${D}/usr/share/phosphor-virtual-sensor diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 2b4c4c0cb..56f43c7e7 100644 --- a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_yosemitev2 = " file://settings-manager.override.yml" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append:yosemitev2 = " file://settings-manager.override.yml" diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index b0dcd093c..140154990 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}_remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_SERVICE_${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" +SYSTEMD_OVERRIDE_${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE:${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend index aa99b7e8d..c119baca9 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" EXTRA_OECMAKE += "-DCHASSIS_SYSTEM_RESET=ON" -- cgit v1.2.3