From 01077cd5cc87d994a51d673b866813a9cdc72111 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Oct 2021 14:52:53 +0300 Subject: Convert to new override syntax This is the result of automated script (0.9.3) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Change-Id: Ic802229aca0527ee0cd8eaf948876b94c3955808 Reviewed-by: Mikko Gronoff --- meta-boot2qt-distro/conf/distro/b2qt.conf | 8 ++++---- meta-boot2qt-distro/conf/distro/include/fsl.inc | 2 +- meta-boot2qt-distro/conf/distro/include/intel.inc | 2 +- meta-boot2qt-distro/conf/distro/include/jetson.inc | 6 +++--- .../conf/distro/include/machine-settings.inc | 2 +- meta-boot2qt-distro/conf/distro/include/no-gpl3.inc | 12 ++++++------ .../conf/distro/include/raspberrypi.inc | 2 +- meta-boot2qt-distro/conf/distro/include/toradex.inc | 4 ++-- meta-boot2qt-distro/conf/local.conf.sample | 6 +++--- .../recipes-graphics/vulkan/vulkan-loader_%.bbappend | 2 +- .../recipes-kernel/linux/linux-fslc-imx_5.%.bbappend | 4 ++-- .../recipes-kernel/linux/linux-imx_5.%.bbappend | 4 ++-- .../recipes-qt/boot2qt-addons/default-qt-envs.bbappend | 12 ++++++------ .../freescale-layer/recipes-qt/qt6/qtbase_git.bbappend | 4 ++-- .../initrdscripts/initramfs-framework_1.0.bbappend | 16 ++++++++-------- .../intel/recipes-kernel/linux/linux-intel_%.bbappend | 2 +- .../mediasdk/intel-mediasdk_%.bbappend | 2 +- .../intel/recipes-qt/default-qt-envs.bbappend | 4 ++-- .../recipes-bsp/bootfiles/rpi-config_git.bbappend | 2 +- .../recipes-graphics/wayland/weston_%.bbappend | 2 +- .../recipes-kernel/linux/linux-raspberrypi_%.bbappend | 2 +- .../recipes-qt/boot2qt-addons/default-qt-envs.bbappend | 2 +- .../recipes-qt/boot2qt-addons/qbsp-readme.bbappend | 2 +- .../tegra/recipes-bsp/u-boot/u-boot-tegra_%.bbappend | 2 +- .../recipes-connectivity/bluez5/bluez5_%.bbappend | 6 +++--- .../initrdscripts/tegra-minimal-init_1.0.bbappend | 2 +- .../recipes-graphics/jpeg/libjpeg-turbo_%.bbappend | 2 +- .../tegra/recipes-kernel/linux/linux-tegra_%.bbappend | 2 +- ...r1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bbappend | 2 +- .../recipes-bsp/tezi-metadata/tezi-metadata_%.bbappend | 4 ++-- .../packagegroup-b2qt-embedded-base.bbappend | 2 +- .../recipes-kernel/linux/linux-toradex_5.%.bbappend | 6 +++--- .../recipes-qt/boot2qt-addons/qbsp-readme.bbappend | 2 +- .../connman-conf/connman-conf.bbappend | 6 +++--- .../recipes-core/base-files/base-files_3.0.14.bbappend | 4 ++-- .../recipes-core/initscripts/initscripts_1.0.bbappend | 2 +- .../recipes-core/meta/meta-environment.bbappend | 2 +- ...ivesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 4 ++-- .../packagegroups/packagegroup-b2qt-embedded-base.bb | 2 +- .../packagegroup-b2qt-embedded-gstreamer.bb | 2 +- .../packagegroup-b2qt-embedded-toolchain-target.bb | 6 +++--- .../packagegroups/packagegroup-b2qt-embedded-tools.bb | 2 +- .../recipes-core/systemd/systemd_%.bbappend | 8 ++++---- .../binutils/binutils-cross-canadian_2.%.bbappend | 2 +- .../recipes-devtools/gcc/gcc-cross-canadian_%.bbappend | 4 ++-- .../recipes-devtools/gdb/gdb-cross-canadian_%.bbappend | 18 +++++++++--------- .../mingw-w64/nativesdk-mingw-w64-runtime_%.bbappend | 2 +- .../recipes-devtools/perl/perl_5.%.bbappend | 2 +- .../recipes-devtools/qemu/qemu_%.bbappend | 2 +- .../recipes-extended/libarchive/libarchive_%.bbappend | 2 +- .../recipes-extended/zstd/zstd_%.bbappend | 8 ++++---- .../recipes-graphics/wayland/weston-init.bbappend | 2 +- .../linux-firmware/linux-firmware_%.bbappend | 14 +++++++------- .../recipes-kernel/lttng/babeltrace_%.bbappend | 2 +- meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend | 2 +- .../alsa-utils/alsa-utils_%.bbappend | 4 ++-- .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 2 +- .../gstreamer/gstreamer1.0-plugins-ugly_%.bbappend | 4 ++-- .../pulseaudio/pulseaudio_%.bbappend | 2 +- .../recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb | 2 +- ...dk-packagegroup-b2qt-embedded-qt6-toolchain-host.bb | 2 +- .../packagegroups/packagegroup-b2qt-embedded-addons.bb | 2 +- meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend | 4 ++-- .../recipes-qt/qt6/qtvirtualkeyboard_git.bbappend | 4 ++-- .../recipes-support/rng-tools/rng-tools_%.bbappend | 2 +- meta-boot2qt/classes/deploy-buildinfo.bbclass | 6 +++--- meta-boot2qt/classes/deploy-conf.bbclass | 4 ++-- meta-boot2qt/classes/image_types_sdcard.bbclass | 8 ++++---- meta-boot2qt/classes/populate_b2qt_qt6_sdk.bbclass | 4 ++-- meta-boot2qt/classes/populate_b2qt_sdk.bbclass | 2 +- meta-boot2qt/classes/qbsp.bbclass | 4 ++-- meta-boot2qt/conf/layer.conf | 2 +- .../recipes-alexa/avs-device-sdk/avs-device-sdk.inc | 10 +++++----- .../avs-device-sdk/avs-device-sdk_1.12.1.bb | 2 +- meta-boot2qt/recipes-alexa/openblas/openblas_0.3.5.bb | 2 +- meta-boot2qt/recipes-alexa/snowboy/snowboy_1.3.0.bb | 4 ++-- meta-boot2qt/recipes-core/dbus/dbus-session.bb | 2 +- .../python/nativesdk-prebuild-python.inc | 2 +- .../recipes-graphics/fonts/otf-noto-arabic_git.bb | 2 +- meta-boot2qt/recipes-graphics/fonts/otf-noto_git.bb | 2 +- .../recipes-graphics/fonts/ttf-devanagari_2.94.0.bb | 2 +- .../recipes-graphics/fonts/ttf-freefont_20120503.bb | 6 +++--- .../recipes-graphics/fonts/ttf-opensans_git.bb | 2 +- .../recipes-graphics/hunspell/hunspell-dicts_git.bb | 2 +- .../boot2qt-addons/boot2qt-appcontroller_git.bb | 6 +++--- .../boot2qt-addons/boot2qt-startupscreen_git.bb | 4 ++-- .../recipes-qt/boot2qt-addons/default-qt-envs.bb | 4 ++-- meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb | 6 +++--- .../recipes-qt/qt6/installer-framework-native_4.1.0.bb | 2 +- meta-boot2qt/recipes-support/curl/curl_%.bbappend | 6 +++--- 90 files changed, 178 insertions(+), 178 deletions(-) diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index 54b4bf74..12111fc2 100644 --- a/meta-boot2qt-distro/conf/distro/b2qt.conf +++ b/meta-boot2qt-distro/conf/distro/b2qt.conf @@ -33,8 +33,8 @@ DISTRO = "b2qt" DISTRO_NAME = "Boot to Qt for Embedded Linux" SDK_VERSION := "${DISTRO_VERSION}" -SDK_VENDOR_mingw32 = "-w64" -SDK_VENDOR_sdkmingw32 = "-w64" +SDK_VENDOR:mingw32 = "-w64" +SDK_VENDOR:sdkmingw32 = "-w64" SDK_MACHINE = "${@d.getVar('SDKMACHINE') or '${SDK_ARCH}'}" SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}" @@ -45,10 +45,10 @@ MAINTAINER = "B2Qt " SYSVINIT_ENABLED_GETTYS = "" -DISTRO_FEATURES_DEFAULT_remove = "irda pcmcia pci 3g nfc zeroconf x11" +DISTRO_FEATURES_DEFAULT:remove = "irda pcmcia pci 3g nfc zeroconf x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" -DISTRO_FEATURES_FILTER_NATIVESDK_append = " wayland" +DISTRO_FEATURES_FILTER_NATIVESDK:append = " wayland" FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache" diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc index 4779ef45..ee135c63 100644 --- a/meta-boot2qt-distro/conf/distro/include/fsl.inc +++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc @@ -61,4 +61,4 @@ PREFERRED_VERSION_gstreamer1.0-plugins-bad_use-nxp-bsp ?= "1.16.3.imx" PREFERRED_VERSION_gstreamer1.0-plugins-ugly_use-nxp-bsp ?= "1.16.0" PREFERRED_VERSION_gstreamer1.0-libav_use-nxp-bsp ?= "1.16.0" -MACHINE_GSTREAMER_1_0_PLUGIN_append_imxgpu = " imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:append_imxgpu = " imx-gst1.0-plugin" diff --git a/meta-boot2qt-distro/conf/distro/include/intel.inc b/meta-boot2qt-distro/conf/distro/include/intel.inc index 754c79db..df1534da 100644 --- a/meta-boot2qt-distro/conf/distro/include/intel.inc +++ b/meta-boot2qt-distro/conf/distro/include/intel.inc @@ -31,7 +31,7 @@ DEPLOY_CONF_NAME = "Intel NUC" IMAGE_FSTYPES += "wic.xz" -DISTRO_FEATURES_remove = "usbgadget" +DISTRO_FEATURES:remove = "usbgadget" DEPLOY_CONF_IMAGE_TYPE = "wic.xz" diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc index 4de139b1..9d415f99 100644 --- a/meta-boot2qt-distro/conf/distro/include/jetson.inc +++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc @@ -52,11 +52,11 @@ QBSP_IMAGE_CONTENT += "\ " # NVIDIA's Vulkan support is for X only -DISTRO_FEATURES_remove = "vulkan" +DISTRO_FEATURES:remove = "vulkan" # https://github.com/madisongh/meta-tegra/issues/236 -KERNEL_MODULE_AUTOLOAD_remove = "tegra-udrm" -KERNEL_MODULE_PROBECONF_remove = "tegra-udrm" +KERNEL_MODULE_AUTOLOAD:remove = "tegra-udrm" +KERNEL_MODULE_PROBECONF:remove = "tegra-udrm" module_conf_tegra-udrm = "" NVIDIA_DEVNET_MIRROR ?= "file://${BSPDIR}/sources/nvidia-devnet-mirror" diff --git a/meta-boot2qt-distro/conf/distro/include/machine-settings.inc b/meta-boot2qt-distro/conf/distro/include/machine-settings.inc index f42b0322..a6d7a5ce 100644 --- a/meta-boot2qt-distro/conf/distro/include/machine-settings.inc +++ b/meta-boot2qt-distro/conf/distro/include/machine-settings.inc @@ -30,7 +30,7 @@ MACHINE_FAMILY ??= "empty" MACHINE_FAMILY_imx = "fsl" MACHINE_FAMILY_intel-x86-common = "intel" -MACHINE_FAMILY_qemuall = "qemu" +MACHINE_FAMILY:qemuall = "qemu" MACHINE_FAMILY_rpi = "raspberrypi" MACHINE_FAMILY_tegra = "jetson" diff --git a/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc b/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc index 8f7fc497..c653548b 100644 --- a/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc +++ b/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc @@ -33,15 +33,15 @@ INCOMPATIBLE_LICENSE += "*GPLv3" -IMAGE_FEATURES_remove_pn-b2qt-embedded-qt6-image = "tools-debug debug-tweaks" +IMAGE_FEATURES:remove:pn-b2qt-embedded-qt6-image = "tools-debug debug-tweaks" -RDEPENDS_packagegroup-b2qt-embedded-tools_remove_pn-packagegroup-b2qt-embedded-tools = "binutils binutils-symlinks perf" -RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "ttf-freefont-mono" +RDEPENDS:packagegroup-b2qt-embedded-tools:remove:pn-packagegroup-b2qt-embedded-tools = "binutils binutils-symlinks perf" +RDEPENDS:packagegroup-b2qt-embedded-base:remove:pn-packagegroup-b2qt-embedded-base = "ttf-freefont-mono" -PACKAGECONFIG_remove_pn-qtvirtualkeyboard = "hunspell" -PACKAGECONFIG_remove_pn-python3-pygobject = "cairo" +PACKAGECONFIG:remove:pn-qtvirtualkeyboard = "hunspell" +PACKAGECONFIG:remove:pn-python3-pygobject = "cairo" # intel nuc specific changes IMAGE_FSTYPES_intel-x86-common = "tar.gz" -MACHINE_EXTRA_INSTALL_remove_intel-x86-common = "grub-efi-config" +MACHINE_EXTRA_INSTALL:remove_intel-x86-common = "grub-efi-config" QBSP_IMAGE_CONTENT_intel-x86-common = "" diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc index a39e1080..ce03264b 100644 --- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc +++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc @@ -44,7 +44,7 @@ QBSP_IMAGE_CONTENT += "\ ${IMAGE_LINK_NAME}.info \ " -MACHINE_EXTRA_INSTALL_append_arm = "\ +MACHINE_EXTRA_INSTALL:append:arm = "\ omxplayer \ " diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index 12e56557..01a60830 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -56,7 +56,7 @@ IMX_BOOT_SOC_TARGET_mx8mp = "iMX8MP" GPULESS_FEATURES = "wayland opengl vulkan webengine" GPULESS_FEATURES_imxgpu = "" -DISTRO_FEATURES_remove = "${GPULESS_FEATURES}" +DISTRO_FEATURES:remove = "${GPULESS_FEATURES}" # Suitable DRI device DRI_DEVICE_apalis-imx6 = "card1" @@ -70,4 +70,4 @@ DRI_DEVICE_verdin-imx8mm = "card0" DRI_DEVICE_verdin-imx8mp = "card0" # remove support for 256MB version colibri-imx6ull in tezi image, since image will be too large for it. -TORADEX_PRODUCT_IDS_remove_colibri-imx6ull = "0036" +TORADEX_PRODUCT_IDS:remove_colibri-imx6ull = "0036" diff --git a/meta-boot2qt-distro/conf/local.conf.sample b/meta-boot2qt-distro/conf/local.conf.sample index 056212f8..ac0d3c4a 100644 --- a/meta-boot2qt-distro/conf/local.conf.sample +++ b/meta-boot2qt-distro/conf/local.conf.sample @@ -267,8 +267,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_pn-qemu-native = "sdl" -#PACKAGECONFIG_pn-nativesdk-qemu = "sdl" +#PACKAGECONFIG:pn-qemu-native = "sdl" +#PACKAGECONFIG:pn-nativesdk-qemu = "sdl" #ASSUME_PROVIDED += "libsdl-native" @@ -290,6 +290,6 @@ QT_SDK_PATH = "" # If you have access to QtSafeRenderer sources, either from git or QtSDK, # you can enable it by uncommenting following line -#DISTRO_FEATURES_BACKFILL_append = " qtsaferenderer" +#DISTRO_FEATURES_BACKFILL:append = " qtsaferenderer" include conf/distro/include/${MACHINE}.pre.inc diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend index 17f70ca5..e1840b90 100644 --- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -RRECOMMENDS_${PN}_use-nxp-bsp = "libvulkan-imx" +RRECOMMENDS:${PN}_use-nxp-bsp = "libvulkan-imx" diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-fslc-imx_5.%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-fslc-imx_5.%.bbappend index a6685754..76793019 100644 --- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-fslc-imx_5.%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-fslc-imx_5.%.bbappend @@ -28,9 +28,9 @@ ############################################################################ # kernel image files are not needed in the image -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" -do_preconfigure_prepend() { +do_preconfigure:prepend() { # FunctionFS for qdbd echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx_5.%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx_5.%.bbappend index 93302cc1..9f506076 100644 --- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx_5.%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx_5.%.bbappend @@ -28,9 +28,9 @@ ############################################################################ # kernel image files are not needed in the image -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" -do_preconfigure_prepend() { +do_preconfigure:prepend() { # FunctionFS for qdbd echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend index 91cae3f3..65f23830 100644 --- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -27,38 +27,38 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://kms.conf.in" # Default DRI device to use with KMS DRI_DEVICE ?= "card0" -do_configure_append() { +do_configure:append() { echo "FB_MULTI_BUFFER=2" >> ${WORKDIR}/defaults echo "QT_QPA_EGLFS_FORCEVSYNC=1" >> ${WORKDIR}/defaults } -do_configure_append_mx8() { +do_configure:append_mx8() { echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults echo "QT_QPA_EGLFS_KMS_ATOMIC=1" >> ${WORKDIR}/defaults echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults sed -e 's/@DEVICE@/${DRI_DEVICE}/' ${WORKDIR}/kms.conf.in > ${WORKDIR}/kms.conf } -do_configure_append_use-mainline-bsp() { +do_configure:append_use-mainline-bsp() { echo "QT_QPA_EGLFS_KMS_ATOMIC=1" >> ${WORKDIR}/defaults echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults sed -e 's/@DEVICE@/${DRI_DEVICE}/' ${WORKDIR}/kms.conf.in > ${WORKDIR}/kms.conf } -do_install_append() { +do_install:append() { if [ -e ${WORKDIR}/kms.conf ]; then install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ fi } -do_configure_append_mx8mm() { +do_configure:append_mx8mm() { # QtWebEngine screen tearing issues with imx8mm (QTBUG-80665) echo "QTWEBENGINE_DISABLE_GPU_THREAD=1" >> ${WORKDIR}/defaults } diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt6/qtbase_git.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt6/qtbase_git.bbappend index 45ce17c6..fec0402d 100644 --- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt6/qtbase_git.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt6/qtbase_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -PACKAGECONFIG_append_mx8 = " gbm kms" -PACKAGECONFIG_append_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' gbm kms', '', d)}" +PACKAGECONFIG:append_mx8 = " gbm kms" +PACKAGECONFIG:append_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' gbm kms', '', d)}" diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend b/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend index 2a8ac895..69e458dc 100644 --- a/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend @@ -27,14 +27,14 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://rtsx_pci_sdmmc \ file://network \ " -do_install_append() { +do_install:append() { install -m 0755 ${WORKDIR}/rtsx_pci_sdmmc ${D}/init.d/20-rtsx_pci_sdmmc install -m 0755 ${WORKDIR}/network ${D}/init.d/30-network } @@ -44,10 +44,10 @@ PACKAGES += "\ initramfs-module-r8169 \ " -SUMMARY_initramfs-module-rtsx-pci-sdmmc = "initramfs support for rtsx_pci_sdmmc" -RDEPENDS_initramfs-module-rtsx-pci-sdmmc = "${PN}-base" -FILES_initramfs-module-rtsx-pci-sdmmc = "/init.d/20-rtsx_pci_sdmmc" +SUMMARY:initramfs-module-rtsx-pci-sdmmc = "initramfs support for rtsx_pci_sdmmc" +RDEPENDS:initramfs-module-rtsx-pci-sdmmc = "${PN}-base" +FILES:initramfs-module-rtsx-pci-sdmmc = "/init.d/20-rtsx_pci_sdmmc" -SUMMARY_initramfs-module-r8169 = "initramfs support for Realtek LAN driver" -RDEPENDS_initramfs-module-r8169 = "${PN}-base" -FILES_initramfs-module-r8169 = "/init.d/30-network" +SUMMARY:initramfs-module-r8169 = "initramfs support for Realtek LAN driver" +RDEPENDS:initramfs-module-r8169 = "${PN}-base" +FILES:initramfs-module-r8169 = "/init.d/30-network" diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-kernel/linux/linux-intel_%.bbappend b/meta-boot2qt-distro/dynamic-layers/intel/recipes-kernel/linux/linux-intel_%.bbappend index a61cf4d5..04d8647a 100644 --- a/meta-boot2qt-distro/dynamic-layers/intel/recipes-kernel/linux/linux-intel_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/intel/recipes-kernel/linux/linux-intel_%.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://wlan-realtek.cfg \ file://b2qt.cfg \ diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend b/meta-boot2qt-distro/dynamic-layers/intel/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend index 1ab33178..255388ec 100644 --- a/meta-boot2qt-distro/dynamic-layers/intel/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/intel/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend @@ -27,6 +27,6 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-fix-build-with-gold-linker.patch" diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs.bbappend index a18fe08d..05424634 100644 --- a/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs.bbappend @@ -29,11 +29,11 @@ SRC_URI += "file://kms.conf" -do_configure_append() { +do_configure:append() { echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults echo "QSG_RENDER_LOOP=basic" >> ${WORKDIR}/defaults } -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ } diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend index e570bec3..9ed5fd79 100644 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -do_deploy_append_raspberrypi4() { +do_deploy:append_raspberrypi4() { echo "# enable both hdmi outputs" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt echo "max_framebuffers=2" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt } diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-graphics/wayland/weston_%.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-graphics/wayland/weston_%.bbappend index 25ec2642..f8ec936b 100644 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-graphics/wayland/weston_%.bbappend @@ -28,4 +28,4 @@ ############################################################################ # from https://www.mail-archive.com/yocto@yoctoproject.org/msg33193.html -PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', 'kms', d)}" +PACKAGECONFIG:remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', 'kms', d)}" diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend index 067d2b9b..24a31deb 100644 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -27,6 +27,6 @@ ## ############################################################################ -do_configure_prepend() { +do_configure:prepend() { echo "CONFIG_UPROBE_EVENTS=y" >> ${WORKDIR}/defconfig } diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs.bbappend index d19cb297..c6e51022 100644 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -do_configure_append() { +do_configure:append() { echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults echo "QT_QPA_EGLFS_KMS_ATOMIC=0" >> ${WORKDIR}/defaults } diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme.bbappend index 64d9670e..93e8c5b5 100644 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra_%.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra_%.bbappend index 437bb241..e5368061 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra_%.bbappend @@ -26,7 +26,7 @@ ## $QT_END_LICENSE$ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://0001-nvidia-Fix-sd-card-boot-for-jetson-tx2.patch \ diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-connectivity/bluez5/bluez5_%.bbappend index 4f16d180..72551736 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -27,15 +27,15 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://hciattach.service \ " -SYSTEMD_SERVICE_${PN} += "hciattach.service" +SYSTEMD_SERVICE:${PN} += "hciattach.service" -do_install_append() { +do_install:append() { install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/hciattach.service ${D}/${systemd_unitdir}/system } diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init_1.0.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init_1.0.bbappend index b3fbb8ff..6dc1800f 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init_1.0.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init_1.0.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://init-boot.sh \ " diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend index c92eafa3..c9a9950c 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend @@ -28,4 +28,4 @@ ############################################################################ # Enable v8 API -EXTRA_OECONF_append_class-target = " --with-jpeg8" +EXTRA_OECONF:append:class-target = " --with-jpeg8" diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra_%.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra_%.bbappend index 11a3bd05..b146d0fc 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra_%.bbappend @@ -26,7 +26,7 @@ ## $QT_END_LICENSE$ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \ diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bbappend index 019e6e03..e9e14f5c 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bbappend @@ -26,7 +26,7 @@ ## $QT_END_LICENSE$ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://0001-Fix-multiple-definition-of-default_nvbuf_api_version.patch \ diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/tezi-metadata/tezi-metadata_%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/tezi-metadata/tezi-metadata_%.bbappend index 3f7d7962..432a7361 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/tezi-metadata/tezi-metadata_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/tezi-metadata/tezi-metadata_%.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ file://TEZI_B2QT_EULA.TXT \ @@ -38,7 +38,7 @@ SRC_URI += "\ SRC_URI[md5sum] = "281877560900c6481eee019a923f5e28" SRC_URI[sha256sum] = "36c31c812e6d6223f46f2a32cad37f46060a7c05420a4ba491cbea6193039eee" -do_deploy_append () { +do_deploy:append () { install -m 644 ${WORKDIR}/TEZI_B2QT_EULA.TXT ${DEPLOYDIR} install -m 644 ${WORKDIR}/Built_with_Qt.png ${DEPLOYDIR} } diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bbappend index a6e3e96f..a0d2cc4d 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bbappend @@ -33,4 +33,4 @@ FIRMWARE_colibri-imx6ull = "linux-firmware" FIRMWARE_colibri-imx7 = "linux-firmware" FIRMWARE_colibri-imx7-emmc = "linux-firmware" -RDEPENDS_${PN}_remove = "${FIRMWARE}" +RDEPENDS:${PN}:remove = "${FIRMWARE}" diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.%.bbappend index 3361bdb5..20abcb26 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.%.bbappend @@ -27,11 +27,11 @@ ## ############################################################################ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree" -do_preconfigure_prepend () { +do_preconfigure:prepend () { # FunctionFS for qdbd echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend index 64d9670e..93e8c5b5 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend index 06dc61dd..5c4d5501 100644 --- a/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend +++ b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend @@ -27,16 +27,16 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" CONNMAN_SETTINGS_DIR := "${localstatedir}/lib/connman" -FILES_${PN} += "${CONNMAN_SETTINGS_DIR}/settings" +FILES:${PN} += "${CONNMAN_SETTINGS_DIR}/settings" SRC_URI += "file://settings \ " -do_install_append() { +do_install:append() { install -d ${D}/${CONNMAN_SETTINGS_DIR} install -m 0644 ${WORKDIR}/settings ${D}/${CONNMAN_SETTINGS_DIR}/settings } diff --git a/meta-boot2qt-distro/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-boot2qt-distro/recipes-core/base-files/base-files_3.0.14.bbappend index 1dc55019..8e51431e 100644 --- a/meta-boot2qt-distro/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-boot2qt-distro/recipes-core/base-files/base-files_3.0.14.bbappend @@ -27,12 +27,12 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://blacklist.conf \ " -do_install_append() { +do_install:append() { ln -s /home/root ${D}/root echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname diff --git a/meta-boot2qt-distro/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-boot2qt-distro/recipes-core/initscripts/initscripts_1.0.bbappend index e2550b10..8723d54e 100644 --- a/meta-boot2qt-distro/recipes-core/initscripts/initscripts_1.0.bbappend +++ b/meta-boot2qt-distro/recipes-core/initscripts/initscripts_1.0.bbappend @@ -27,6 +27,6 @@ ## ############################################################################ -do_configure_append() { +do_configure:append() { sed -i -e "/echo/d" ${WORKDIR}/banner.sh } diff --git a/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend b/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend index 65cc6b33..39138622 100644 --- a/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend +++ b/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend @@ -29,7 +29,7 @@ inherit image-buildinfo -toolchain_create_sdk_version_append () { +toolchain_create_sdk_version:append () { echo 'Layer Revisions:' >> $versionfile echo '${@get_layer_revs(d)}' >> $versionfile } diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index ae26591a..c7705372 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -35,7 +35,7 @@ inherit packagegroup nativesdk MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ nativesdk-cmake \ nativesdk-gperf \ @@ -47,7 +47,7 @@ RDEPENDS_${PN} = "\ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \ " -RDEPENDS_${PN}_remove_mingw32 = "\ +RDEPENDS:${PN}:remove:mingw32 = "\ nativesdk-python3-modules \ nativesdk-python3-misc \ nativesdk-perl-modules \ diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb index 4cfe660f..9ca74371 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb @@ -35,7 +35,7 @@ inherit packagegroup MACHINE_EXTRA_INSTALL ?= "" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ kernel-modules \ linux-firmware \ ca-certificates \ diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb index 39e492ab..3420a501 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb @@ -35,7 +35,7 @@ inherit packagegroup MACHINE_GSTREAMER_1_0_PLUGIN ?= "" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ gstreamer1.0-meta-base \ gstreamer1.0-meta-video \ gstreamer1.0-meta-audio \ diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bb index ea82e864..a0e967eb 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bb @@ -38,10 +38,10 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" MACHINE_EXTRA_INSTALL_SDK ?= "" GCC-SANITIZERS ?= "gcc-sanitizers" -GCC-SANITIZERS_mipsarch = "" -GCC-SANITIZERS_libc-musl = "" +GCC-SANITIZERS:mipsarch = "" +GCC-SANITIZERS:libc-musl = "" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ packagegroup-core-standalone-sdk-target \ ${GCC-SANITIZERS} \ ${MACHINE_EXTRA_INSTALL_SDK} \ diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb index 33020682..9c29850f 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb @@ -33,7 +33,7 @@ PR = "r0" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ alsa-utils-amixer \ binutils \ binutils-symlinks \ diff --git a/meta-boot2qt-distro/recipes-core/systemd/systemd_%.bbappend b/meta-boot2qt-distro/recipes-core/systemd/systemd_%.bbappend index 96b89100..b1296691 100644 --- a/meta-boot2qt-distro/recipes-core/systemd/systemd_%.bbappend +++ b/meta-boot2qt-distro/recipes-core/systemd/systemd_%.bbappend @@ -27,12 +27,12 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://usb-rndis.network \ " -PACKAGECONFIG_append = " networkd" +PACKAGECONFIG:append = " networkd" # By default sytemd uses it's build time as epoch. This causes problems when # using yocto cache since systemd build time might be more than day older than @@ -41,9 +41,9 @@ PACKAGECONFIG_append = " networkd" # result as failure because last mount time is in the future. This can be worked # around by setting TIME_EPOCH to 0, which causes fsck to detect the system time as # insane and ignore the mount time error. -EXTRA_OECONF_append = " --with-time-epoch=0" +EXTRA_OECONF:append = " --with-time-epoch=0" -do_install_append() { +do_install:append() { # remove login from tty1 rm -f ${D}${sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service # set up link-local IPs for USB network interface diff --git a/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend b/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend index 9232742d..da08b595 100644 --- a/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend @@ -1 +1 @@ -FILES_${PN}-staticdev_append_sdkmingw32 = " ${libdir}/bfd-plugins/lib*.a" +FILES:${PN}-staticdev:append:sdkmingw32 = " ${libdir}/bfd-plugins/lib*.a" diff --git a/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend index 3ab8ba90..b34b0aca 100644 --- a/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -do_install_append () { +do_install:append () { # remove real-ld symlink rm ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/real-ld${EXEEXT} # add symlinks for ld.bfd and ld.gold @@ -36,7 +36,7 @@ do_install_append () { done } -do_install_append_sdkmingw32() { +do_install:append:sdkmingw32() { ln -sf ../libwinpthread-1.dll ${D}${bindir} ln -sf ${BINRELPATH}/libwinpthread-1.dll $dest } diff --git a/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend index 4d77c947..7d288796 100644 --- a/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend @@ -27,16 +27,16 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend_sdkmingw32 := "${THISDIR}/${BPN}:" -SRC_URI_append_sdkmingw32 = " file://0001-Do-not-use-win32-specific-filehandling.patch" +FILESEXTRAPATHS:prepend:sdkmingw32 := "${THISDIR}/${BPN}:" +SRC_URI:append:sdkmingw32 = " file://0001-Do-not-use-win32-specific-filehandling.patch" -DEPENDS_append_sdkmingw32 = " nativesdk-prebuild-python" -RDEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python" -EXTRA_OECONF_remove_sdkmingw32 = "--without-python --with-python=no" -EXTRA_OECONF_append_sdkmingw32 = " --with-python=${WORKDIR}/python_win" -CXXFLAGS_append_sdkmingw32 = " -D_hypot=hypot" +DEPENDS:append:sdkmingw32 = " nativesdk-prebuild-python" +RDEPENDS:${PN}:append:sdkmingw32 = " nativesdk-prebuild-python" +EXTRA_OECONF:remove:sdkmingw32 = "--without-python --with-python=no" +EXTRA_OECONF:append:sdkmingw32 = " --with-python=${WORKDIR}/python_win" +CXXFLAGS:append:sdkmingw32 = " -D_hypot=hypot" -do_configure_prepend_sdkmingw32() { +do_configure:prepend:sdkmingw32() { cat > ${WORKDIR}/python_win << EOF #! /bin/sh case "\$2" in @@ -50,7 +50,7 @@ EOF chmod +x ${WORKDIR}/python_win } -do_install_append_sdkmingw32() { +do_install:append:sdkmingw32() { ln -s ../python35.dll ${D}${bindir}/ ln -s ../python35.zip ${D}${bindir}/ ln -s ../libgcc_s_seh-1.dll ${D}${bindir}/ diff --git a/meta-boot2qt-distro/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_%.bbappend b/meta-boot2qt-distro/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_%.bbappend index 2546bfe8..1b5fb46b 100644 --- a/meta-boot2qt-distro/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_%.bbappend @@ -1 +1 @@ -EXTRA_OECONF_x86-64 = "--disable-lib32" +EXTRA_OECONF:x86-64 = "--disable-lib32" diff --git a/meta-boot2qt-distro/recipes-devtools/perl/perl_5.%.bbappend b/meta-boot2qt-distro/recipes-devtools/perl/perl_5.%.bbappend index 5f4baf77..e2addb40 100644 --- a/meta-boot2qt-distro/recipes-devtools/perl/perl_5.%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/perl/perl_5.%.bbappend @@ -27,6 +27,6 @@ ## ############################################################################ -do_install_append_class-nativesdk () { +do_install:append:class-nativesdk () { sed -i -e 's|$OECORE_NATIVE_SYSROOT/|${SDKPATHNATIVE}|g' ${D}${bindir}/perl } diff --git a/meta-boot2qt-distro/recipes-devtools/qemu/qemu_%.bbappend b/meta-boot2qt-distro/recipes-devtools/qemu/qemu_%.bbappend index b09058c9..878ed5a1 100644 --- a/meta-boot2qt-distro/recipes-devtools/qemu/qemu_%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/qemu/qemu_%.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-linux-user-add-support-for-MADV_DONTNEED.patch \ " diff --git a/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend b/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend index d432602c..70d7e636 100644 --- a/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend +++ b/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend @@ -28,4 +28,4 @@ ############################################################################ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd," -PACKAGECONFIG_append = " zstd" +PACKAGECONFIG:append = " zstd" diff --git a/meta-boot2qt-distro/recipes-extended/zstd/zstd_%.bbappend b/meta-boot2qt-distro/recipes-extended/zstd/zstd_%.bbappend index 9a2f1a79..81e7138c 100644 --- a/meta-boot2qt-distro/recipes-extended/zstd/zstd_%.bbappend +++ b/meta-boot2qt-distro/recipes-extended/zstd/zstd_%.bbappend @@ -27,8 +27,8 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/${PN}:" -SRC_URI_append_mingw32 = " file://0001-Makefile-fix-build-for-mingw.patch" -OS_mingw32 = "Windows" +FILESEXTRAPATHS:prepend:mingw32 := "${THISDIR}/${PN}:" +SRC_URI:append:mingw32 = " file://0001-Makefile-fix-build-for-mingw.patch" +OS:mingw32 = "Windows" export OS -FILES_${PN}_append_mingw32 = " ${libdir}/*.dll" +FILES:${PN}:append:mingw32 = " ${libdir}/*.dll" diff --git a/meta-boot2qt-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-boot2qt-distro/recipes-graphics/wayland/weston-init.bbappend index 7ff335bb..c91966fb 100644 --- a/meta-boot2qt-distro/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-boot2qt-distro/recipes-graphics/wayland/weston-init.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -do_install_append() { +do_install:append() { # remove udev rules rm -rf ${D}${sysconfdir}/udev } diff --git a/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index e1607960..a3ad006b 100644 --- a/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -27,10 +27,10 @@ ## ############################################################################ -FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*" -FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*" -FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.*" -FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.*" -FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.*" -FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.*" -FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.*" +FILES:${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*" +FILES:${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*" +FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.*" +FILES:${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.*" +FILES:${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.*" +FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.*" +FILES:${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.*" diff --git a/meta-boot2qt-distro/recipes-kernel/lttng/babeltrace_%.bbappend b/meta-boot2qt-distro/recipes-kernel/lttng/babeltrace_%.bbappend index 44292396..150bf822 100644 --- a/meta-boot2qt-distro/recipes-kernel/lttng/babeltrace_%.bbappend +++ b/meta-boot2qt-distro/recipes-kernel/lttng/babeltrace_%.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ git://git.efficios.com/babeltrace.git;branch=stable-1.5 \ " diff --git a/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend b/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend index a1f587d0..b845ad5c 100644 --- a/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend +++ b/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -PACKAGECONFIG_remove = "scripting" +PACKAGECONFIG:remove = "scripting" diff --git a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend index 0dd97d22..305d5dff 100644 --- a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend +++ b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend @@ -27,6 +27,6 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_apalis-imx6 = " file://0001-Increase-default-playback-volume.patch" +SRC_URI:append_apalis-imx6 = " file://0001-Increase-default-playback-volume.patch" diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 6302495a..565f9ac4 100644 --- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -27,6 +27,6 @@ ## ############################################################################ -PACKAGECONFIG_append = " faad" +PACKAGECONFIG:append = " faad" PACKAGECONFIG_GL_imxpxp = "" diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend index e3383161..11cf35d6 100644 --- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend +++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -PACKAGECONFIG_append = " x264" -FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/*.prs" +PACKAGECONFIG:append = " x264" +FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/*.prs" diff --git a/meta-boot2qt-distro/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index b631a5fd..dd97761d 100644 --- a/meta-boot2qt-distro/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/meta-boot2qt-distro/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -PACKAGECONFIG_append = " autospawn-for-root" +PACKAGECONFIG:append = " autospawn-for-root" diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb index 91f0d494..3250d89f 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb @@ -78,7 +78,7 @@ PACKAGE_EXCLUDE += "\ qtwebsockets-dev \ " -SDK_POSTPROCESS_COMMAND_prepend = "apply_ci_fixes;" +SDK_POSTPROCESS_COMMAND:prepend = "apply_ci_fixes;" apply_ci_fixes () { # If the request has more than two labels, it is rejected (e.g., apache2.test-net.qt.local) diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt6-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt6-toolchain-host.bb index e7102c40..a208e5a5 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt6-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt6-toolchain-host.bb @@ -33,7 +33,7 @@ PR = "r0" inherit packagegroup nativesdk -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ nativesdk-packagegroup-b2qt-embedded-toolchain-host \ nativesdk-packagegroup-qt6-toolchain-host \ " diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb index 9364f007..0e6176bd 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb @@ -34,7 +34,7 @@ inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ boot2qt-appcontroller \ boot2qt-startupscreen \ qdb \ diff --git a/meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend index f1c602bd..8c9a5396 100644 --- a/meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend @@ -35,8 +35,8 @@ PACKAGECONFIG += " \ xkbcommon \ " -do_configure_prepend() { +do_configure:prepend() { echo "QMAKE_PLATFORM += boot2qt" >> ${S}/mkspecs/oe-device-extra.pri } -EXTRA_OECMAKE_remove = "-DQT_AVOID_CMAKE_ARCHIVING_API=ON" +EXTRA_OECMAKE:remove = "-DQT_AVOID_CMAKE_ARCHIVING_API=ON" diff --git a/meta-boot2qt-distro/recipes-qt/qt6/qtvirtualkeyboard_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt6/qtvirtualkeyboard_git.bbappend index 4f480995..018b21c0 100644 --- a/meta-boot2qt-distro/recipes-qt/qt6/qtvirtualkeyboard_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt6/qtvirtualkeyboard_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -PACKAGECONFIG_append = " hunspell" -RDEPENDS_${PN} += "hunspell-dicts" +PACKAGECONFIG:append = " hunspell" +RDEPENDS:${PN} += "hunspell-dicts" diff --git a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_%.bbappend index b6b80845..911840cc 100644 --- a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_%.bbappend +++ b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_%.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -PACKAGECONFIG_remove = "libjitterentropy" +PACKAGECONFIG:remove = "libjitterentropy" diff --git a/meta-boot2qt/classes/deploy-buildinfo.bbclass b/meta-boot2qt/classes/deploy-buildinfo.bbclass index dbcda729..df83e507 100644 --- a/meta-boot2qt/classes/deploy-buildinfo.bbclass +++ b/meta-boot2qt/classes/deploy-buildinfo.bbclass @@ -31,15 +31,15 @@ inherit image-buildinfo buildinfo[depends] += "qtbase-native:do_populate_sysroot" -IMAGE_BUILDINFO_VARS_append = " QT_VERSION" +IMAGE_BUILDINFO_VARS:append = " QT_VERSION" -python buildinfo_prepend () { +python buildinfo:prepend () { import subprocess qtversion = subprocess.check_output(['qmake', '-query', 'QT_VERSION']).decode('utf-8').strip() d.setVar('QT_VERSION', qtversion) } -python buildinfo_append () { +python buildinfo:append () { import shutil shutil.copyfile( d.expand('${IMAGE_ROOTFS}${IMAGE_BUILDINFO_FILE}'), diff --git a/meta-boot2qt/classes/deploy-conf.bbclass b/meta-boot2qt/classes/deploy-conf.bbclass index 4ff21949..7ce2ea92 100644 --- a/meta-boot2qt/classes/deploy-conf.bbclass +++ b/meta-boot2qt/classes/deploy-conf.bbclass @@ -36,7 +36,7 @@ DEPLOY_CONF_TYPE ?= "Boot2Qt" DEPLOY_CONF_IMAGE_TYPE ?= "" DEPLOY_CONF_IMAGE_DEP ?= "${DEPLOY_CONF_IMAGE_TYPE}" -IMAGE_CMD_conf() { +IMAGE_CMD:conf() { IMAGE_UNCOMPRESSED_SIZE=0 IMAGE_TYPE=$(file -L ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE} | awk '{ print $2 }') if [ -e "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE}" ] && [ "${IMAGE_TYPE}" = "XZ" ] ; then @@ -55,4 +55,4 @@ imageuncompressedsize=$IMAGE_UNCOMPRESSED_SIZE asroot=true EOF } -IMAGE_TYPEDEP_conf = "${DEPLOY_CONF_IMAGE_DEP}" +IMAGE_TYPEDEP:conf = "${DEPLOY_CONF_IMAGE_DEP}" diff --git a/meta-boot2qt/classes/image_types_sdcard.bbclass b/meta-boot2qt/classes/image_types_sdcard.bbclass index e0401212..9719f592 100644 --- a/meta-boot2qt/classes/image_types_sdcard.bbclass +++ b/meta-boot2qt/classes/image_types_sdcard.bbclass @@ -29,13 +29,13 @@ IMAGE_ROOTFS_EXTRA_SPACE = "100000" -IMAGE_CMD_wic_append() { +IMAGE_CMD:wic:append() { rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img ln -s ${IMAGE_NAME}.rootfs.wic ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img } # create flash package that utilizes the SD card image -create_tegraflash_pkg_append() { +create_tegraflash_pkg:append() { cd ${WORKDIR}/tegraflash cat > prepare-image.sh <> ${WORKDIR}/appcontroller.conf echo "platform=${MACHINE}" >> ${WORKDIR}/appcontroller.conf echo "environmentFile=/etc/default/qt" >> ${WORKDIR}/appcontroller.conf } -do_install_append() { +do_install:append() { install -m 0755 -d ${D}${sysconfdir} install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ } diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb index b4bd9595..4f9ad3e6 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb @@ -48,12 +48,12 @@ DEPENDS += "qtbase qtdeclarative qtdeclarative-native" S = "${WORKDIR}/git/startupscreen" -do_install_append() { +do_install:append() { install -m 0755 -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/startupscreen.service ${D}${systemd_unitdir}/system/ } -SYSTEMD_SERVICE_${PN} = "startupscreen.service" +SYSTEMD_SERVICE:${PN} = "startupscreen.service" SRCREV = "e5dc5380f41c281ac751a02dccd24cc445721277" diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb index 8778e32e..2b678a52 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb @@ -44,7 +44,7 @@ do_configure() { echo "QT_QPA_PLATFORM=${QT_QPA_PLATFORM}" >> ${WORKDIR}/defaults } -do_install_append() { +do_install:append() { install -m 0755 -d ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/defaults ${D}${sysconfdir}/default/qt @@ -56,5 +56,5 @@ do_install_append() { touch ${D}/var/lib/systemd/linger/root } -SYSTEMD_SERVICE_${PN} = "b2qt.service" +SYSTEMD_SERVICE:${PN} = "b2qt.service" diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb index 256a4795..cacad2a9 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb @@ -51,10 +51,10 @@ PV = "1.3.0+git${SRCPV}" REQUIRED_DISTRO_FEATURES = "systemd" DEPENDS = "qtbase qtdeclarative qtdeclarative-native" -RRECOMMENDS_${PN} += "kernel-module-usb-f-fs kernel-module-usb-f-rndis" +RRECOMMENDS:${PN} += "kernel-module-usb-f-fs kernel-module-usb-f-rndis" EXTRA_OECMAKE += "-DDAEMON_ONLY=ON" -do_install_append() { +do_install:append() { install -m 0755 ${WORKDIR}/b2qt-gadget-network.sh ${D}${bindir}/ install -m 0755 ${WORKDIR}/qdbd-init.sh ${D}${bindir}/ @@ -66,6 +66,6 @@ do_install_append() { install -m 0644 ${WORKDIR}/defaults ${D}${sysconfdir}/default/qdbd } -SYSTEMD_SERVICE_${PN} = "qdbd.service" +SYSTEMD_SERVICE:${PN} = "qdbd.service" inherit systemd diff --git a/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb b/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb index 2527e600..b6a16650 100644 --- a/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb +++ b/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb @@ -47,4 +47,4 @@ do_install() { install -m 0755 -t ${D}${bindir} ${S}/bin/* } -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" diff --git a/meta-boot2qt/recipes-support/curl/curl_%.bbappend b/meta-boot2qt/recipes-support/curl/curl_%.bbappend index 9fe597e8..cff12109 100644 --- a/meta-boot2qt/recipes-support/curl/curl_%.bbappend +++ b/meta-boot2qt/recipes-support/curl/curl_%.bbappend @@ -1,4 +1,4 @@ -PACKAGECONFIG_append = " nghttp2 libssh2 libidn " -PACKAGECONFIG_remove_class-native = " nghttp2 " -PACKAGECONFIG_remove_class-nativesdk = " nghttp2 libssh2 " +PACKAGECONFIG:append = " nghttp2 libssh2 libidn " +PACKAGECONFIG:remove:class-native = " nghttp2 " +PACKAGECONFIG:remove:class-nativesdk = " nghttp2 libssh2 " -- cgit v1.2.3