diff --git a/meta-digi-arm/classes/fsl-eula-graphics.bbclass b/meta-digi-arm/classes/fsl-eula-graphics.bbclass index 1feb7bb56..7d9f0653e 100644 --- a/meta-digi-arm/classes/fsl-eula-graphics.bbclass +++ b/meta-digi-arm/classes/fsl-eula-graphics.bbclass @@ -1,9 +1,9 @@ # fsl-eula-graphics.bbclass extends the naming scheme in fsl-eula.bbclass # to allow for graphics-backend-specific archives. IMX_PACKAGE_NAME_APPEND = "" -IMX_PACKAGE_NAME_APPEND_class-target = \ +IMX_PACKAGE_NAME_APPEND:class-target = \ "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-wayland', \ bb.utils.contains('DISTRO_FEATURES', 'x11', '-x11', \ '-fb', d), d)}" -IMX_PACKAGE_NAME_append_class-target = "${IMX_PACKAGE_NAME_APPEND}" -SRC_URI_NAME_append_class-target = "${IMX_PACKAGE_NAME_APPEND}" +IMX_PACKAGE_NAME:append:class-target = "${IMX_PACKAGE_NAME_APPEND}" +SRC_URI_NAME:append:class-target = "${IMX_PACKAGE_NAME_APPEND}" diff --git a/meta-digi-arm/classes/fsl-eula2-package-arch.bbclass b/meta-digi-arm/classes/fsl-eula2-package-arch.bbclass index ff34c9b84..c161de76b 100644 --- a/meta-digi-arm/classes/fsl-eula2-package-arch.bbclass +++ b/meta-digi-arm/classes/fsl-eula2-package-arch.bbclass @@ -3,14 +3,14 @@ # combinations of a) target versus native/nativesdk components, and b) the # target or native architecture. -IMX_PACKAGE_NAME_append = "-${TARGET_ARCH}" -IMX_PACKAGE_NAME_class-native_append = "-${BUILD_ARCH}" -IMX_PACKAGE_NAME_class-nativesdk_append = "-${BUILD_ARCH}" +IMX_PACKAGE_NAME:append = "-${TARGET_ARCH}" +IMX_PACKAGE_NAME:class-native:append = "-${BUILD_ARCH}" +IMX_PACKAGE_NAME:class-nativesdk:append = "-${BUILD_ARCH}" -SRC_URI_append = ";name=${SRC_URI_NAME}" +SRC_URI:append = ";name=${SRC_URI_NAME}" SRC_URI_NAME = "${TARGET_ARCH}" -SRC_URI_NAME_class-native = "${BUILD_ARCH}-native" -SRC_URI_NAME_class-nativesdk = "${BUILD_ARCH}-nativesdk" +SRC_URI_NAME:class-native = "${BUILD_ARCH}-native" +SRC_URI_NAME:class-nativesdk = "${BUILD_ARCH}-nativesdk" -INSANE_SKIP_${PN}_remove = "arch" -INSANE_SKIP_${PN}-dbg_remove = "arch" +INSANE_SKIP:${PN}:remove = "arch" +INSANE_SKIP:${PN}-dbg:remove = "arch" diff --git a/meta-digi-arm/classes/fsl-eula2-unpack2.bbclass b/meta-digi-arm/classes/fsl-eula2-unpack2.bbclass index 29b05c4a6..1f9964c52 100644 --- a/meta-digi-arm/classes/fsl-eula2-unpack2.bbclass +++ b/meta-digi-arm/classes/fsl-eula2-unpack2.bbclass @@ -13,8 +13,8 @@ S = "${WORKDIR}/${IMX_PACKAGE_NAME}" # For native apps, insert the user-local sysroot path # For nativesdk apps, insert the correct distro folder D_SUBDIR = "" -D_SUBDIR_class-native = "${STAGING_DIR_NATIVE}" -D_SUBDIR_class-nativesdk = "/opt/${DISTRO}" +D_SUBDIR:class-native = "${STAGING_DIR_NATIVE}" +D_SUBDIR:class-nativesdk = "/opt/${DISTRO}" # SCR is the location and name of the Software Content Register file # relative to ${D}${D_SUBDIR}. @@ -33,4 +33,4 @@ do_install () { rm ${D}${D_SUBDIR}/${SCR} } -FILES_${PN} = "/" +FILES:${PN} = "/" diff --git a/meta-digi-arm/classes/fsl-eula2.bbclass b/meta-digi-arm/classes/fsl-eula2.bbclass index 2d1afb256..4bf9c053c 100644 --- a/meta-digi-arm/classes/fsl-eula2.bbclass +++ b/meta-digi-arm/classes/fsl-eula2.bbclass @@ -9,8 +9,8 @@ # configuration-specific archives, as can be seen in fsl-eula-graphics.bbclass # and fsl-eula2-package-arch.bbclass. IMX_PACKAGE_NAME = "${BPN}-${IMX_PACKAGE_VERSION}" -IMX_PACKAGE_NAME_class-native = "${PN}-${IMX_PACKAGE_VERSION}" -IMX_PACKAGE_NAME_class-nativesdk = "${PN}-${IMX_PACKAGE_VERSION}" +IMX_PACKAGE_NAME:class-native = "${PN}-${IMX_PACKAGE_VERSION}" +IMX_PACKAGE_NAME:class-nativesdk = "${PN}-${IMX_PACKAGE_VERSION}" -INSANE_SKIP_${PN} += "arch" -INSANE_SKIP_${PN}-dbg += "arch" +INSANE_SKIP:${PN} += "arch" +INSANE_SKIP:${PN}-dbg += "arch" diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 91ce923e0..9aef0aea5 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -18,7 +18,7 @@ do_image_boot_vfat[depends] += " \ ${@TRUSTFENCE_BOOTIMAGE_DEPENDS(d)} \ " -IMAGE_CMD_boot.vfat() { +IMAGE_CMD:boot.vfat() { BOOTIMG_FILES="$(readlink -e ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin)" BOOTIMG_FILES_SYMLINK="${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" if [ -n "${KERNEL_DEVICETREE}" ]; then @@ -81,7 +81,7 @@ do_image_boot_ubifs[depends] += " \ ${@TRUSTFENCE_BOOTIMAGE_DEPENDS(d)} \ " -IMAGE_CMD_boot.ubifs() { +IMAGE_CMD:boot.ubifs() { BOOTIMG_FILES_SYMLINK="${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" if [ -n "${KERNEL_DEVICETREE}" ]; then for DTB in ${KERNEL_DEVICETREE}; do @@ -131,7 +131,7 @@ do_image_recovery_vfat[depends] += " \ ${RECOVERY_INITRAMFS_IMAGE}:do_image_complete \ " -IMAGE_CMD_recovery.vfat() { +IMAGE_CMD:recovery.vfat() { # Use 'boot.vfat' image as base cp --remove-destination ${IMGDEPLOYDIR}/${IMAGE_NAME}.boot.vfat ${IMGDEPLOYDIR}/${IMAGE_NAME}.recovery.vfat @@ -142,7 +142,7 @@ IMAGE_CMD_recovery.vfat() { # Remove the default ".rootfs." suffix for 'recovery.vfat' images do_image_recovery_vfat[imgsuffix] = "." -IMAGE_TYPEDEP_recovery.vfat = "boot.vfat" +IMAGE_TYPEDEP:recovery.vfat = "boot.vfat" do_image_recovery_ubifs[depends] += " \ mtd-utils-native:do_populate_sysroot \ @@ -151,7 +151,7 @@ do_image_recovery_ubifs[depends] += " \ ${RECOVERY_INITRAMFS_IMAGE}:do_image_complete \ " -IMAGE_CMD_recovery.ubifs() { +IMAGE_CMD:recovery.ubifs() { RECOVERYIMG_FILES_SYMLINK="${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" if [ -n "${KERNEL_DEVICETREE}" ]; then for DTB in ${KERNEL_DEVICETREE}; do @@ -214,7 +214,7 @@ trustence_sign_cpio() { fi } CONVERSIONTYPES += "tf" -CONVERSION_CMD_tf = "trustence_sign_cpio ${IMAGE_NAME}.rootfs.${type}" +CONVERSION_CMD:tf = "trustence_sign_cpio ${IMAGE_NAME}.rootfs.${type}" CONVERSION_DEPENDS_tf = "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" IMAGE_TYPES += "cpio.gz.u-boot.tf" @@ -285,7 +285,7 @@ do_image_sdcard[depends] = " \ # | | | | # 0 4MiB 4MiB + BOOT_SPACE SDIMG_SIZE # -IMAGE_CMD_sdcard() { +IMAGE_CMD:sdcard() { # Align boot partition and calculate total sdcard image size BOOT_SPACE_ALIGNED="$(expr \( \( ${BOARD_BOOTIMAGE_PARTITION_SIZE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1 \) / ${IMAGE_ROOTFS_ALIGNMENT} \) \* ${IMAGE_ROOTFS_ALIGNMENT})" SDIMG_SIZE="$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE)" @@ -324,5 +324,5 @@ IMAGE_CMD_sdcard() { } # The sdcard image requires the boot and rootfs images to be built before -IMAGE_TYPEDEP_sdcard = "${SDIMG_BOOTFS_TYPE} ${SDIMG_ROOTFS_TYPE}.gz" +IMAGE_TYPEDEP:sdcard = "${SDIMG_BOOTFS_TYPE} ${SDIMG_ROOTFS_TYPE}.gz" diff --git a/meta-digi-arm/classes/remove-pkg-postinst-ontarget.bbclass b/meta-digi-arm/classes/remove-pkg-postinst-ontarget.bbclass index b30e168ce..dacb75498 100644 --- a/meta-digi-arm/classes/remove-pkg-postinst-ontarget.bbclass +++ b/meta-digi-arm/classes/remove-pkg-postinst-ontarget.bbclass @@ -1,2 +1,2 @@ -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget:${PN}() { } diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf index 414e64168..b9494320d 100644 --- a/meta-digi-arm/conf/layer.conf +++ b/meta-digi-arm/conf/layer.conf @@ -30,7 +30,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V27 = "e565271ec9a80ce47abbddc4 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V29 = "28241cb895217d7946e40e7227136d02" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V30 = "03bcadc8dc0a788f66ca9e2b89f56c6f" -FSL_EULA_FILE_MD5SUMS_append = " \ +FSL_EULA_FILE_MD5SUMS:append = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V23} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V24} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V24.1} \ diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index e44ca6382..5a3f8eec8 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -6,7 +6,7 @@ include conf/machine/include/ccimx6.inc # Wireless external module -WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" +WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" HAS_WIFI_VIRTWLANS = "true" # Wireless p2p interface @@ -15,8 +15,8 @@ WLAN_P2P_DEVICE_NAME ?= "ccimx6qp-p2p" MACHINE_FEATURES += "cryptochip" # Firmware -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d" diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 361bf5ec1..a98d7982a 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -6,12 +6,12 @@ include conf/machine/include/ccimx6.inc # Wireless external module -WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" +WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" HAS_WIFI_VIRTWLANS = "true" # Firmware -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k firmware-qualcomm-qca6564-bt', '', d)}" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl firmware-qualcomm-qca6564-wifi', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k firmware-qualcomm-qca6564-bt', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl firmware-qualcomm-qca6564-wifi', '', d)}" PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d" diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf index 77142f4dc..56cc48f12 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf @@ -27,7 +27,7 @@ KERNEL_DEVICETREE ?= " \ imx6ul-ccimx6ulsbc-id135.dtb \ imx6ul-ccimx6ulsbc-id136.dtb \ " -KERNEL_DEVICETREE_use-mainline-bsp ?= "imx6ul-ccimx6ulsbcpro.dtb" +KERNEL_DEVICETREE:use-mainline-bsp ?= "imx6ul-ccimx6ulsbcpro.dtb" KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6ul_defconfig" diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf index 327016beb..de232c8cd 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf @@ -26,7 +26,7 @@ KERNEL_DEVICETREE ?= " \ imx6ul-ccimx6ulstarter-wb.dtb \ imx6ul-ccimx6ulstarter-id129.dtb \ " -KERNEL_DEVICETREE_use-mainline-bsp ?= "imx6ul-ccimx6ulsbcexpress.dtb" +KERNEL_DEVICETREE:use-mainline-bsp ?= "imx6ul-ccimx6ulsbcexpress.dtb" KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6ul_defconfig" diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index ad514fead..c001dff39 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -24,8 +24,8 @@ UBOOT_CONFIG = "ccmp15_trusted_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" # Define list of devicetree per board # Extra DTB for board - need to specify it with .dtb ... -STM32MP_KERNEL_DEVICETREE_ccmp15-dvk += "ccmp157-dvk.dtb" -STM32MP_KERNEL_DEVICETREE_ccmp15-dvk += "ccmp151-dvk.dtb" +STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += "ccmp157-dvk.dtb" +STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += "ccmp151-dvk.dtb" # ========================================================================= # Machine features @@ -38,7 +38,7 @@ MACHINE_FEATURES += "mca" # ========================================================================= # Firmware # ========================================================================= -MACHINE_FIRMWARE_append = " firmware-murata firmware-murata-mfgtest" +MACHINE_FIRMWARE:append = " firmware-murata firmware-murata-mfgtest" MACHINE_EXTRA_RRECOMMENDS += " \ ${MACHINE_FIRMWARE} \ diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 6d17e9d22..ff503b09b 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -23,8 +23,8 @@ WIRELESS_MODULE ?= "" # Firmware MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx6q" -MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" -MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d" +MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q" +MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d" MACHINE_EXTRA_RDEPENDS += " \ e2fsprogs-mke2fs \ @@ -45,4 +45,4 @@ TRUSTFENCE_SIGN_MODE = "HAB" # Adding 'wayland' along with 'x11' enables the xwayland backend # Adding pam is required for SELinux functionality -DISTRO_FEATURES_append = " wayland pam" +DISTRO_FEATURES:append = " wayland pam" diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 192e05da0..7e6d03df8 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -17,13 +17,13 @@ STORAGE_MEDIA = "mtd" # Wireless external module WIRELESS_MODULE ?= "" -WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" +WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" HAS_WIFI_VIRTWLANS = "true" # Firmware MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx6q" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" MACHINE_EXTRA_RDEPENDS += " \ imx-kobs \ @@ -35,10 +35,10 @@ MACHINE_EXTRA_RRECOMMENDS += " \ ${WIRELESS_MODULE} \ ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)} \ " -MACHINE_EXTRA_RRECOMMENDS_remove_use-mainline-bsp = "${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:remove:use-mainline-bsp = "${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" MACHINE_FEATURES += "wifi bluetooth cryptochip mca" -MACHINE_FEATURES_remove_use-mainline-bsp = "wifi" +MACHINE_FEATURES:remove:use-mainline-bsp = "wifi" # mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files) # Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size. diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc index dfd26afef..deb179862 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8m.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc @@ -26,13 +26,13 @@ STORAGE_MEDIA = "mmc" # Wireless external module WIRELESS_MODULE ?= "" -WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" +WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" HAS_WIFI_VIRTWLANS = "true" # Firmware MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" MACHINE_EXTRA_RDEPENDS += " \ e2fsprogs-mke2fs \ @@ -59,5 +59,5 @@ TRUSTFENCE_SIGN_MODE = "HAB" # Adding 'wayland' along with 'x11' enables the xwayland backend # Vulkan is necessary for wayland to build -DISTRO_FEATURES_append = " wayland vulkan systemd pam" +DISTRO_FEATURES:append = " wayland vulkan systemd pam" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 2ca8e15c5..69a21a2dd 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -43,13 +43,13 @@ STORAGE_MEDIA = "mmc" # Wireless external module WIRELESS_MODULE ?= "" -WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" +WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" HAS_WIFI_VIRTWLANS = "true" # Firmware MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}" +MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}" MACHINE_EXTRA_RDEPENDS += " \ e2fsprogs-mke2fs \ @@ -76,5 +76,5 @@ TRUSTFENCE_SIGN_MODE = "AHAB" # Adding 'wayland' along with 'x11' enables the xwayland backend # Vulkan is necessary for wayland to build -DISTRO_FEATURES_append = " wayland vulkan systemd pam" +DISTRO_FEATURES:append = " wayland vulkan systemd pam" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 58205d69a..0b8d2cc4a 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" PREFERRED_PROVIDER_u-boot ??= "u-boot-dey" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-dey" PREFERRED_PROVIDER_virtual/kernel ??= "linux-dey" -PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc" +PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # Update default libc version diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 26c7ed6d4..ecd419242 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -2,8 +2,8 @@ include conf/machine/include/digi-defaults.inc XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante" -XSERVER_DRIVER_append_mx8 = " xf86-video-modesetting" +XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" +XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting" XSERVER = "xserver-xorg \ xf86-input-evdev \ ${XSERVER_DRIVER}" @@ -45,13 +45,13 @@ MACHINE_SOCARCH_SUFFIX_mx8mm = "-mx8mm" MACHINE_SOCARCH_SUFFIX_mx8mp = "-mx8mp" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER_append_imxvpu = " \ +MACHINE_SOCARCH_FILTER:append:imxvpu = " \ imx-codec \ imx-vpuwrap \ libimxvpuapi \ virtual/imxvpu \ " -MACHINE_SOCARCH_FILTER_append_imxgpu = " \ +MACHINE_SOCARCH_FILTER:append:imxgpu = " \ virtual/egl \ virtual/mesa \ virtual/libopenvg \ @@ -61,29 +61,29 @@ MACHINE_SOCARCH_FILTER_append_imxgpu = " \ libgal-imx \ pango \ " -MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ +MACHINE_SOCARCH_FILTER:append:imxgpu2d = " \ virtual/libg2d \ " -MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \ +MACHINE_SOCARCH_FILTER:append:imxgpu3d = " \ virtual/libgl \ virtual/libgles1 \ virtual/libgles2 \ " -MACHINE_SOCARCH_FILTER_append_mx6q = " \ +MACHINE_SOCARCH_FILTER:append:mx6q = " \ virtual/opencl-icd \ opencl-headers \ " -MACHINE_SOCARCH_FILTER_append_mx8 = " \ +MACHINE_SOCARCH_FILTER:append:mx8 = " \ virtual/opencl-icd \ opencl-headers \ " -MACHINE_SOCARCH_FILTER_append_mx8qm = " \ +MACHINE_SOCARCH_FILTER:append:mx8qm = " \ virtual/libopenvx \ " INHERIT += "fsl-dynamic-packagearch" -SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \ +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \ libimxvpuapi->virtual/imxvpu \ imx-vpuwrap->virtual/imxvpu \ imx-codec->virtual/imxvpu \ @@ -136,8 +136,8 @@ MACHINEOVERRIDES =. "imx:" MACHINEOVERRIDES =. "use-nxp-bsp:" # U-Boot 2017.X requires a specific dtc version. -PREFERRED_VERSION_dtc-native_ccimx6 ?= "1.4.5" -PREFERRED_VERSION_nativesdk-dtc_ccimx6 ?= "1.4.5" +PREFERRED_VERSION_dtc-native:ccimx6 ?= "1.4.5" +PREFERRED_VERSION_nativesdk-dtc:ccimx6 ?= "1.4.5" DEY_BUILD_PLATFORM = "NXP" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb index 26ba88bc6..9d96d5c6b 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb @@ -18,6 +18,6 @@ addtask deploy after do_install before do_build PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8)" -COMPATIBLE_MACHINE_mx8m = "(^$)" -COMPATIBLE_MACHINE_mx8x = "(^$)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" +COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" +COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb index 35855c0f9..38f0d90f7 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb @@ -21,4 +21,4 @@ addtask deploy after do_install before do_build PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8m)" +COMPATIBLE_MACHINE = "(mx8m-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_8.14.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_8.14.bb index e76d3e520..ff7c4ab18 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_8.14.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_8.14.bb @@ -62,7 +62,7 @@ do_install() { # as second one, and for every file match - it creates a separate package, # which contains only files that matches the pattern. # -python populate_packages_prepend() { +python populate_packages:prepend() { easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d) do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin', output_pattern='firmware-imx-easrc-%s', @@ -120,11 +120,11 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu # files it makes no sense. PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi" -FILES_${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" -FILES_${PN}-hdmi = " \ +FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" +FILES:${PN}-hdmi = " \ ${nonarch_base_libdir}/firmware/hdmitxfw.bin \ ${nonarch_base_libdir}/firmware/hdmirxfw.bin \ ${nonarch_base_libdir}/firmware/dpfw.bin \ " -COMPATIBLE_MACHINE = "(imx)" +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.4.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.4.bb index 8fde4bb68..6a94237fe 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.4.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.4.bb @@ -13,9 +13,9 @@ SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \ " SRCREV = "5782363f92a2fdf926784449270433cf3ddf44bd" -SRC_URI_append_ccimx8mn = " file://0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch \ +SRC_URI:append:ccimx8mn = " file://0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch \ file://0002-imx8mn-Disable-M7-debug-console.patch" -SRC_URI_append_ccimx8mm = " file://0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch \ +SRC_URI:append:ccimx8mm = " file://0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch \ file://0002-imx8mm-Disable-M4-debug-console.patch" S = "${WORKDIR}/git" @@ -25,22 +25,22 @@ inherit deploy BOOT_TOOLS = "imx-boot-tools" PLATFORM ?= "INVALID" -PLATFORM_mx8qm = "imx8qm" -PLATFORM_mx8x = "imx8qx" -PLATFORM_mx8mq = "imx8mq" -PLATFORM_mx8mm = "imx8mm" -PLATFORM_mx8mn = "imx8mn" -PLATFORM_mx8mnul = "imx8mn" -PLATFORM_mx8mp = "imx8mp" -PLATFORM_mx8mpul = "imx8mp" -PLATFORM_mx8dx = "imx8dx" -PLATFORM_mx8dxl = "imx8dxl" -PLATFORM_mx8ulp = "imx8ulp" +PLATFORM:mx8qm-nxp-bsp = "imx8qm" +PLATFORM:mx8x-nxp-bsp = "imx8qx" +PLATFORM:mx8mq-nxp-bsp = "imx8mq" +PLATFORM:mx8mm-nxp-bsp = "imx8mm" +PLATFORM:mx8mn-nxp-bsp = "imx8mn" +PLATFORM:mx8mnul-nxp-bsp = "imx8mn" +PLATFORM:mx8mp-nxp-bsp = "imx8mp" +PLATFORM:mx8mpul-nxp-bsp = "imx8mp" +PLATFORM:mx8dx-nxp-bsp = "imx8dx" +PLATFORM:mx8dxl-nxp-bsp = "imx8dxl" +PLATFORM:mx8ulp-nxp-bsp = "imx8ulp" # Clear LDFLAGS to avoid the option -Wl recognize issue # Clear CFLAGS to avoid coherent_arm out of OCRAM size limitation (64KB) - i.MX 8MQ only CLEAR_FLAGS ?= "LDFLAGS" -CLEAR_FLAGS_mx8mq = "LDFLAGS CFLAGS" +CLEAR_FLAGS:mx8mq-nxp-bsp = "LDFLAGS CFLAGS" EXTRA_OEMAKE += " \ CROSS_COMPILE="${TARGET_PREFIX}" \ @@ -70,4 +70,4 @@ do_deploy() { addtask deploy after do_compile PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-lib/imx-lib_git.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-lib/imx-lib_git.bbappend index aff10cb08..6648a61bc 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-lib/imx-lib_git.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-lib/imx-lib_git.bbappend @@ -9,11 +9,11 @@ SRC_URI = " \ " SRCREV = "87ddd80953835eb29027d1d5a12044a08e809e40" -PLATFORM_mx8ulp = "IMX8ULP" +PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP" -do_install_append () { +do_install:append () { # Remove .go file for Android find ${D}/ -name *.go -exec rm {} \; } -COMPATIBLE_MACHINE = "(mx6|mx7|mx8ulp)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8ulp-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index 9b496346b..58fab25a4 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -4,27 +4,27 @@ require imx-mkimage_git.inc IMX_M4_DEMOS = "" -IMX_M4_DEMOS_mx8 = "imx-m4-demos:do_deploy" -IMX_M4_DEMOS_mx8m = "" +IMX_M4_DEMOS:mx8-nxp-bsp = "imx-m4-demos:do_deploy" +IMX_M4_DEMOS:mx8m-nxp-bsp = "" M4_DEFAULT_IMAGE ?= "m4_image.bin" -M4_DEFAULT_IMAGE_mx8qxp = "imx8qx_m4_TCM_power_mode_switch.bin" -M4_DEFAULT_IMAGE_mx8dxl = "imx8dxl_m4_TCM_power_mode_switch.bin" -M4_DEFAULT_IMAGE_mx8dx = "imx8qx_m4_TCM_power_mode_switch.bin" +M4_DEFAULT_IMAGE:mx8qxp-nxp-bsp = "imx8qx_m4_TCM_power_mode_switch.bin" +M4_DEFAULT_IMAGE:mx8dxl-nxp-bsp = "imx8dxl_m4_TCM_power_mode_switch.bin" +M4_DEFAULT_IMAGE:mx8dx-nxp-bsp = "imx8qx_m4_TCM_power_mode_switch.bin" # Setting for i.MX 8ULP -IMX_M4_DEMOS_mx8ulp = "imx-m33-demos:do_deploy" -M4_DEFAULT_IMAGE_mx8ulp = "imx8ulp_m33_TCM_rpmsg_lite_str_echo_rtos.bin" -ATF_MACHINE_NAME_mx8ulp = "bl31-imx8ulp.bin" -IMX_EXTRA_FIRMWARE_mx8ulp = "firmware-upower firmware-sentinel" -SECO_FIRMWARE_NAME_mx8ulp = "mx8ulpa0-ahab-container.img" -SOC_TARGET_mx8ulp = "iMX8ULP" -SOC_FAMILY_mx8ulp = "mx8ulp" +IMX_M4_DEMOS:mx8ulp-nxp-bsp = "imx-m33-demos:do_deploy" +M4_DEFAULT_IMAGE:mx8ulp-nxp-bsp = "imx8ulp_m33_TCM_rpmsg_lite_str_echo_rtos.bin" +ATF_MACHINE_NAME:mx8ulp-nxp-bsp = "bl31-imx8ulp.bin" +IMX_EXTRA_FIRMWARE:mx8ulp-nxp-bsp = "firmware-upower firmware-sentinel" +SECO_FIRMWARE_NAME:mx8ulp-nxp-bsp = "mx8ulpa0-ahab-container.img" +SOC_TARGET:mx8ulp-nxp-bsp = "iMX8ULP" +SOC_FAMILY:mx8ulp-nxp-bsp = "mx8ulp" do_compile[depends] += "${IMX_M4_DEMOS}" -do_compile_prepend() { +do_compile:prepend() { case ${SOC_FAMILY} in mx8) cp ${DEPLOY_DIR_IMAGE}/imx8qm_m4_TCM_power_mode_switch_m40.bin \ @@ -55,7 +55,7 @@ compile_mx8ulp() { cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/upower.bin ${BOOT_STAGING}/upower.bin } -do_deploy_append() { +do_deploy:append() { case ${SOC_FAMILY} in mx8) install -m 0644 ${BOOT_STAGING}/m4_image.bin ${DEPLOYDIR}/${BOOT_TOOLS} @@ -92,29 +92,29 @@ deploy_mx8ulp() { inherit boot-artifacts require dynamic-layers/freescale-layer/recipes-bsp/imx-seco/ccimx8x-seco-fw.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append_ccimx8m = " file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch" +SRC_URI:append:ccimx8m = " file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch" -IMX_EXTRA_FIRMWARE_ccimx8x = "digi-sc-firmware imx-seco" +IMX_EXTRA_FIRMWARE:ccimx8x = "digi-sc-firmware imx-seco" -IMX_BOOT_SOC_TARGET_mx8mm = "iMX8MM" -IMX_BOOT_SOC_TARGET_mx8mn = "iMX8MN" -IMX_BOOT_SOC_TARGET_mx8mp = "iMX8MP" -IMX_BOOT_SOC_TARGET_mx8x = "iMX8QX" +IMX_BOOT_SOC_TARGET:mx8mm-nxp-bsp = "iMX8MM" +IMX_BOOT_SOC_TARGET:mx8mn-nxp-bsp = "iMX8MN" +IMX_BOOT_SOC_TARGET:mx8mp-nxp-bsp = "iMX8MP" +IMX_BOOT_SOC_TARGET:mx8x-nxp-bsp = "iMX8QX" -DEPENDS_append_ccimx8x = " coreutils-native" -DEPENDS_append_mx8 += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" +DEPENDS:append:ccimx8x = " coreutils-native" +DEPENDS:append:mx8-nxp-bsp += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" -IMX_M4_DEMOS_mx8mm = "imx-m4-demos:do_deploy" +IMX_M4_DEMOS:mx8mm-nxp-bsp = "imx-m4-demos:do_deploy" -M4_DEFAULT_IMAGE_mx8mm = "imx8mm_m4_TCM_hello_world.bin" +M4_DEFAULT_IMAGE:mx8mm-nxp-bsp = "imx8mm_m4_TCM_hello_world.bin" IMX_M7_DEMOS = "" -IMX_M7_DEMOS_mx8mn = "imx-m7-demos:do_deploy" +IMX_M7_DEMOS:mx8mn-nxp-bsp = "imx-m7-demos:do_deploy" M7_DEFAULT_IMAGE ?= "m7_image.bin" -M7_DEFAULT_IMAGE_mx8mn = "imx8mn_m7_TCM_hello_world.bin" +M7_DEFAULT_IMAGE:mx8mn-nxp-bsp = "imx8mn_m7_TCM_hello_world.bin" do_compile[depends] += " \ ${IMX_M7_DEMOS} \ @@ -131,10 +131,10 @@ do_populate_lic[depends] += " \ firmware-imx:do_populate_lic \ " -IMXBOOT_TARGETS_ccimx8x = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \ +IMXBOOT_TARGETS:ccimx8x = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \ 'flash flash_regression_linux_m4', d)}" -IMXBOOT_TARGETS_ccimx8m = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_spl_uboot', d)}" +IMXBOOT_TARGETS:ccimx8m = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_spl_uboot', d)}" compile_mx8x() { bbnote 8QX boot binary build @@ -234,7 +234,7 @@ do_compile () { } # ConnectCore 8M Nano and 8M Mini do not have different binaries -UBOOT_RAM_COMBINATIONS_ccimx8m = "" +UBOOT_RAM_COMBINATIONS:ccimx8m = "" do_install () { install -d ${D}/boot @@ -253,7 +253,7 @@ do_install () { fi } -deploy_mx8m_append() { +deploy_mx8m:append() { if [ -e ${BOOT_STAGING}/m7_image.bin ] ; then cp ${BOOT_STAGING}/m7_image.bin ${DEPLOYDIR}/${BOOT_TOOLS} fi @@ -313,7 +313,7 @@ do_deploy () { } -do_deploy_append () { +do_deploy:append () { if [ "${TRUSTFENCE_SIGN}" = "1" ]; then export CONFIG_SIGN_KEYS_PATH="${TRUSTFENCE_SIGN_KEYS_PATH}" [ -n "${TRUSTFENCE_KEY_INDEX}" ] && export CONFIG_KEY_INDEX="${TRUSTFENCE_KEY_INDEX}" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bb index ecfebd1b5..98309143a 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" -SRC_URI_append_ccimx8mn = " file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch" +SRC_URI:append:ccimx8mn = " file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch" # Beware: applied last to first DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ @@ -31,5 +31,5 @@ do_install () { install -m 0755 mkimage_imx8 ${D}${bindir}/mkimage_imx8 } -FILES_${PN} = "${bindir}" +FILES:${PN} = "${bindir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/ccimx8x-seco-fw.inc b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/ccimx8x-seco-fw.inc index c130bc20f..060c610ed 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/ccimx8x-seco-fw.inc +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/ccimx8x-seco-fw.inc @@ -1,3 +1,3 @@ # For the ccimx8x, we generate images for both the B0 and the C0 revisions of # the i.MX8X silicon, so deploy both versions of the firmware. -SECO_FIRMWARE_NAME_ccimx8x = "mx8qx*0-ahab-container.img" +SECO_FIRMWARE_NAME:ccimx8x = "mx8qx*0-ahab-container.img" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 273990b66..0bce35a16 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -26,5 +26,5 @@ do_install () { chown -R root:root "${D}" } -COMPATIBLE_MACHINE = "(mx8)" -COMPATIBLE_MACHINE_mx8m = "(^$)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" +COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_3.8.4.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_3.8.4.bb index 0b430ae15..e8463473b 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_3.8.4.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_3.8.4.bb @@ -24,5 +24,5 @@ do_deploy () { install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} } -COMPATIBLE_MACHINE = "(mx8)" -COMPATIBLE_MACHINE_mx8m = "(^$)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" +COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-test/imx-test_git.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-test/imx-test_git.bbappend index d30ce9eca..854f20fdd 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-test/imx-test_git.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-test/imx-test_git.bbappend @@ -10,4 +10,4 @@ SRC_URI = " \ " SRCREV = "a26b1ee51177e317aa05251d4c8f10c4c68064f6" -PACKAGECONFIG_append_mx8m = " swpdm" +PACKAGECONFIG:append:mx8m-nxp-bsp = " swpdm" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bbappend index 749b73997..6cc325431 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bbappend @@ -1,4 +1,4 @@ # Copyright (C) 2021 Digi International. # Make the package compatible with al platforms, not just with NXP's EVK -COMPATIBLE_MACHINE = "(mx8mp)" +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb index 1dbd382f8..6ff888602 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" DEPENDS = "imx-vpu-hantro" -DEPENDS_append_mx8mp = " imx-vpu-hantro-vc" +DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" SRC_URI = " \ ${FSL_MIRROR}/${BP}.tar.gz \ @@ -12,9 +12,9 @@ SRC_URI = " \ SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b" SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8" -PLATFORM_mx8mm = "IMX8MM" -PLATFORM_mx8mq = "IMX8MQ" -PLATFORM_mx8mp = "IMX8MP" +PLATFORM:mx8mm-nxp-bsp = "IMX8MM" +PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" +PLATFORM:mx8mp-nxp-bsp = "IMX8MP" EXTRA_OEMAKE = " \ CROSS_COMPILE="${HOST_PREFIX}" \ @@ -28,4 +28,4 @@ do_install () { } PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" +COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro.inc b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro.inc index 61feb53d4..2e90ebcbc 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro.inc +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro.inc @@ -10,9 +10,9 @@ inherit fsl-eula-unpack use-imx-headers PARALLEL_MAKE="-j 1" -PLATFORM_mx8mm = "IMX8MM" -PLATFORM_mx8mq = "IMX8MQ" -PLATFORM_mx8mp = "IMX8MP" +PLATFORM:mx8mm-nxp-bsp = "IMX8MM" +PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" +PLATFORM:mx8mp-nxp-bsp = "IMX8MP" EXTRA_OEMAKE = " \ CROSS_COMPILE="${HOST_PREFIX}" \ @@ -24,8 +24,8 @@ do_install () { oe_runmake install DEST_DIR="${D}" } -FILES_${PN} += "/unit_tests" +FILES:${PN} += "/unit_tests" -RDEPENDS_${PN} += "imx-vpu-hantro-daemon" +RDEPENDS:${PN} += "imx-vpu-hantro-daemon" -COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" +COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb index 15147cede..d22122ab9 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb @@ -7,7 +7,7 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" PROVIDES = "virtual/imxvpu" -RPROVIDES_${PN} = "virtual/imxvpu" +RPROVIDES:${PN} = "virtual/imxvpu" PE = "1" @@ -28,4 +28,4 @@ do_install() { oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install } -COMPATIBLE_MACHINE = "(mx6q|mx6dl)" +COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb index 13d0cf318..5b53068cf 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb @@ -21,7 +21,7 @@ do_install() { SYSTEMD_AUTO_ENABLE = "enable" -FILES_${PN} = "${libdir} /opt" -INSANE_SKIP_${PN} = "file-rdeps already-stripped" +FILES:${PN} = "${libdir} /opt" +INSANE_SKIP:${PN} = "file-rdeps already-stripped" -COMPATIBLE_MACHINE = "(mx8mp)" +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb index f09607cbe..0d9f1dfd9 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb @@ -18,7 +18,7 @@ OECMAKE_SOURCEPATH = "${S}/appshell" # Use make instead of ninja OECMAKE_GENERATOR = "Unix Makefiles" -SYSTEMD_SERVICE_${PN} = "imx8-isp.service" +SYSTEMD_SERVICE:${PN} = "imx8-isp.service" EXTRA_OECMAKE += " \ -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ @@ -66,15 +66,15 @@ do_install() { # The build contains a mix of versioned and unversioned libraries, so # the default packaging configuration needs some modifications FILES_SOLIBSDEV = "" -FILES_${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-dev += " \ +FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" +FILES:${PN}-dev += " \ ${libdir}/libjsoncpp.so \ ${libdir}/libos08a20.so \ ${libdir}/libov2775.so \ " -INSANE_SKIP_${PN} = "rpaths" +INSANE_SKIP:${PN} = "rpaths" -RDEPENDS_${PN} = "libdrm libpython3 bash" +RDEPENDS:${PN} = "libdrm libpython3 bash" -COMPATIBLE_MACHINE = "(mx8mp)" +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-core/udev/udev-rules-imx.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-core/udev/udev-rules-imx.bbappend index 3bfdf8cc4..968213bcc 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-core/udev/udev-rules-imx.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-core/udev/udev-rules-imx.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2013-2021 Digi International. # Update 10-imx.rules -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m33-demos_2.11.0.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m33-demos_2.11.0.bb index 0e24f188b..902f61eea 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m33-demos_2.11.0.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m33-demos_2.11.0.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" SRC_URI[imx8ulp.md5sum] = "de0499fd2de02922c524d4b106d3bc30" SRC_URI[imx8ulp.sha256sum] = "17e239b96dfbb0d05e3f61c93a57bfd8a98bc021bb802a365da34d99040c6cb0" -COMPATIBLE_MACHINE = "(mx8ulp)" +COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb index f1bcd818c..0ba10b5cb 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a" inherit deploy fsl-eula-unpack M4_SOC ?= "INVALID" -M4_SOC_mx7d = "imx7d-sabresd" +M4_SOC:mx7d-nxp-bsp = "imx7d-sabresd" SRC_URI = "${FSL_MIRROR}/${M4_SOC}-m4-freertos-${PV}.bin;fsl-eula=true" S = "${WORKDIR}/${M4_SOC}-m4-freertos-${PV}" @@ -24,5 +24,5 @@ do_deploy () { addtask deploy before do_build after do_compile PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx7d)" +COMPATIBLE_MACHINE = "(mx7d-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_2.10.0.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_2.10.0.bb index eb70e5ad4..7706b1395 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_2.10.0.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_2.10.0.bb @@ -14,4 +14,4 @@ SRC_URI[imx8mm.sha256sum] = "c14f6d2f41d2a16eb9f948c6182ef3fbb9dfccdd5399b78e2fe SRC_URI[imx8mq.md5sum] = "b5034e35dca3c2b6c1b4d38b16cddaa7" SRC_URI[imx8mq.sha256sum] = "ec44b737630c088dd23c1f855ce8478bae531d75a9c7021eb25e9268a8b9a425" -COMPATIBLE_MACHINE = "(mx7ulp|mx8mm|mx8mq)" +COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mm-nxp-bsp|mx8mq-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb index 3b8259450..d97ca8f46 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb @@ -3,7 +3,7 @@ require imx-mcore-demos.inc -LIC_FILES_CHKSUM_mx8dxl = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" +LIC_FILES_CHKSUM:mx8dxl-nxp-bsp = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" LIC_FILES_CHKSUM = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" SRC_URI[imx8dxl.md5sum] = "8850c04a8af91e2bd822cecd5ec56e12" @@ -15,4 +15,4 @@ SRC_URI[imx8qm.sha256sum] = "c695e72b0c7f609132f5990469cf950c03e137de887bd7e24d0 SRC_URI[imx8qx.md5sum] = "5bc15014f59b2b11c71299fac608be5d" SRC_URI[imx8qx.sha256sum] = "bbb268a30a58a86e38966122191c8aa69f427c6c1d56b0ce81e518f4d652782a" -COMPATIBLE_MACHINE = "(mx7ulp|mx8dxl|mx8mq|mx8qm|mx8qxp)" +COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8dxl-nxp-bsp|mx8mq-nxp-bsp|mx8qm-nxp-bsp|mx8qxp-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m7-demos_2.10.0.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m7-demos_2.10.0.bb index 642a48d97..4c0914dc2 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m7-demos_2.10.0.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-m7-demos_2.10.0.bb @@ -14,4 +14,4 @@ SRC_URI[imx8mn.sha256sum] = "aa4a57ed2ddbf6e27a14269be38f5ab3803889d71e8dcca76f8 SRC_URI[imx8mp.md5sum] = "5167520c8493e8e2d54d1d60e22ff5d4" SRC_URI[imx8mp.sha256sum] = "cdb9478d1b7fb74f21d15bee56a8f6d48fe3e4f97dd17a5e4499c72040988ed2" -COMPATIBLE_MACHINE = "(mx8mnul|mx8mn|mx8mp|mx8mpul)" +COMPATIBLE_MACHINE = "(mx8mnul-nxp-bsp|mx8mn-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-mcore-demos-2.10.inc b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-mcore-demos-2.10.inc index 235aa8372..a754e085a 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-mcore-demos-2.10.inc +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-mcore-demos-2.10.inc @@ -8,13 +8,13 @@ LICENSE = "Proprietary" inherit deploy fsl-eula2-unpack2 SOC ?= "INVALID" -SOC_mx8ulp = "imx8ulp" +SOC:mx8ulp-nxp-bsp = "imx8ulp" MCORE_TYPE ?= "m33" -MCORE_TYPE_mx8ulp = "m33" +MCORE_TYPE:mx8ulp-nxp-bsp = "m33" IMX_PACKAGE_NAME = "${SOC}-${MCORE_TYPE}-demo-${PV}" -SRC_URI_append = ";name=${SOC}" +SRC_URI:append = ";name=${SOC}" SCR = "SCR-${SOC}-${MCORE_TYPE}-demo.txt" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-mcore-demos.inc b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-mcore-demos.inc index de770a9d2..8181dbbfc 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-mcore-demos.inc +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-fsl/mcore-demos/imx-mcore-demos.inc @@ -8,27 +8,27 @@ LICENSE = "Proprietary" inherit deploy fsl-eula2-unpack2 SOC ?= "INVALID" -SOC_mx7ulp = "imx7ulp" -SOC_mx8dxl = "imx8dxl" -SOC_mx8mm = "imx8mm" -SOC_mx8mn = "imx8mn" -SOC_mx8mnul = "imx8mnddr3l" -SOC_mx8mp = "imx8mp" -SOC_mx8mpul = "imx8mp" -SOC_mx8mq = "imx8mq" -SOC_mx8qm = "imx8qm" -SOC_mx8qxp = "imx8qx" -SOC_mx8ulp = "imx8ulp" +SOC:mx7ulp-nxp-bsp = "imx7ulp" +SOC:mx8dxl-nxp-bsp = "imx8dxl" +SOC:mx8mm-nxp-bsp = "imx8mm" +SOC:mx8mn-nxp-bsp = "imx8mn" +SOC:mx8mnul-nxp-bsp = "imx8mnddr3l" +SOC:mx8mp-nxp-bsp = "imx8mp" +SOC:mx8mpul-nxp-bsp = "imx8mp" +SOC:mx8mq-nxp-bsp = "imx8mq" +SOC:mx8qm-nxp-bsp = "imx8qm" +SOC:mx8qxp-nxp-bsp = "imx8qx" +SOC:mx8ulp-nxp-bsp = "imx8ulp" MCORE_TYPE ?= "m4" -MCORE_TYPE_mx8mn = "m7" -MCORE_TYPE_mx8mnul = "m7" -MCORE_TYPE_mx8mp = "m7" -MCORE_TYPE_mx8mpul = "m7" -MCORE_TYPE_mx8ulp = "m33" +MCORE_TYPE:mx8mn-nxp-bsp = "m7" +MCORE_TYPE:mx8mnul-nxp-bsp = "m7" +MCORE_TYPE:mx8mp-nxp-bsp = "m7" +MCORE_TYPE:mx8mpul-nxp-bsp = "m7" +MCORE_TYPE:mx8ulp-nxp-bsp = "m33" IMX_PACKAGE_NAME = "${SOC}-${MCORE_TYPE}-demo-${PV}" -SRC_URI_append = ";name=${SOC}" +SRC_URI:append = ";name=${SOC}" SCR = "SCR-${SOC}-${MCORE_TYPE}-demo.txt" @@ -39,7 +39,7 @@ do_install () { } DEPLOY_FILE_EXT ?= "bin" -DEPLOY_FILE_EXT_mx7ulp = "img" +DEPLOY_FILE_EXT:mx7ulp-nxp-bsp = "img" do_deploy () { # Install the demo binaries diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend index 6eb422b06..3d4f02b0c 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_ccimx6ul_use-mainline-bsp = " \ +SRC_URI:append:ccimx6ul:use-mainline-bsp = " \ file://0001-ARM-Add-support-for-the-ConnectCore-6UL-System-On-Mo.patch \ file://0002-mach-imx-pm-imx6-Add-hooks-for-board-specific-implem.patch \ file://0003-imx6ul-Add-MCA-core-I2C-driver-support.patch \ @@ -14,7 +14,7 @@ SRC_URI_append_ccimx6ul_use-mainline-bsp = " \ file://0011-imx6ul-Add-MCA-power-key-support-for-ConnectCore-6UL.patch \ " -SRC_URI_append_ccimx6ulsbc_use-mainline-bsp = " \ +SRC_URI:append:ccimx6ulsbc:use-mainline-bsp = " \ file://0001-ccimx6ulsbcpro-Add-IOEXP-core-I2C-support.patch \ file://0002-ccimx6ulsbcpro-Add-IOEXP-GPIO-support.patch \ file://0003-ccimx6ulsbcpro-Add-IOEXP-ADC-support.patch \ diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.15.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.15.0.imx.bb index 37f7882ae..2ab2571bb 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.15.0.imx.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.15.0.imx.bb @@ -20,11 +20,11 @@ inherit python3native systemd features_check REQUIRED_MACHINE_FEATURES = "optee" -SYSTEMD_SERVICE_${PN} = "tee-supplicant.service" +SYSTEMD_SERVICE:${PN} = "tee-supplicant.service" OPTEE_ARCH ?= "arm32" -OPTEE_ARCH_armv7a = "arm32" -OPTEE_ARCH_aarch64 = "arm64" +OPTEE_ARCH:armv7a = "arm32" +OPTEE_ARCH:aarch64 = "arm64" EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} -C ${S} O=${B}" @@ -48,11 +48,11 @@ do_install () { } PACKAGES += "tee-supplicant" -FILES_${PN} += "${libdir}/* ${includedir}/*" -FILES_tee-supplicant += "${bindir}/tee-supplicant" +FILES:${PN} += "${libdir}/* ${includedir}/*" +FILES:tee-supplicant += "${bindir}/tee-supplicant" -INSANE_SKIP_${PN} = "ldflags dev-elf" -INSANE_SKIP_${PN}-dev = "ldflags dev-elf" -INSANE_SKIP_tee-supplicant = "ldflags" +INSANE_SKIP:${PN} = "ldflags dev-elf" +INSANE_SKIP:${PN}-dev = "ldflags dev-elf" +INSANE_SKIP:tee-supplicant = "ldflags" COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.15.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.15.0.imx.bb index 12a09244d..9b20202a0 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.15.0.imx.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.15.0.imx.bb @@ -39,8 +39,8 @@ PLATFORM_FLAVOR_mx8mnul = "mx8mnevk" PLATFORM_FLAVOR_mx8ulp = "mx8ulpevk" OPTEE_ARCH ?= "arm32" -OPTEE_ARCH_armv7a = "arm32" -OPTEE_ARCH_aarch64 = "arm64" +OPTEE_ARCH:armv7a = "arm32" +OPTEE_ARCH:aarch64 = "arm64" # Optee-os can be built for 32 bits and 64 bits at the same time # as long as the compilers are correctly defined. @@ -94,9 +94,9 @@ do_install () { addtask deploy after do_compile before do_install -FILES_${PN} = "${nonarch_base_libdir}/firmware/ /lib*/optee_armtz/" -FILES_${PN}-staticdev = "/usr/include/optee/" -RDEPENDS_${PN}-dev += "${PN}-staticdev" +FILES:${PN} = "${nonarch_base_libdir}/firmware/ /lib*/optee_armtz/" +FILES:${PN}-staticdev = "/usr/include/optee/" +RDEPENDS:${PN}-dev += "${PN}-staticdev" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(imx|imx-boot-container)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.15.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.15.0.imx.bb index ebd855d71..d6df0b99c 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.15.0.imx.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.15.0.imx.bb @@ -21,11 +21,11 @@ SRCREV = "4d81b964a72e89a62d04187b3f055d8346b383c9" inherit python3native OPTEE_ARCH ?= "arm32" -OPTEE_ARCH_armv7a = "arm32" -OPTEE_ARCH_aarch64 = "arm64" +OPTEE_ARCH:armv7a = "arm32" +OPTEE_ARCH:aarch64 = "arm64" -TA_DEV_KIT_DIR_arm = "${STAGING_INCDIR}/optee/export-user_ta_arm32/" -TA_DEV_KIT_DIR_aarch64 = "${STAGING_INCDIR}/optee/export-user_ta_arm64/" +TA_DEV_KIT_DIR:arm = "${STAGING_INCDIR}/optee/export-user_ta:arm32/" +TA_DEV_KIT_DIR:aarch64 = "${STAGING_INCDIR}/optee/export-user_ta:arm64/" CFLAGS += "--sysroot=${STAGING_DIR_HOST}" CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}" @@ -59,6 +59,6 @@ do_install () { install ${B}/supp_plugin/*plugin ${D}/usr/lib/tee-supplicant/plugins/ } -FILES_${PN} = "/usr/bin/ /lib*/optee_armtz/ /usr/lib/tee-supplicant/plugins/" +FILES:${PN} = "/usr/bin/ /lib*/optee_armtz/ /usr/lib/tee-supplicant/plugins/" COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend index 5f499507f..843f5359b 100644 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,8 +1,8 @@ # Copyright (C) 2013-2022 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_ccimx6 = " \ +SRC_URI:append:ccimx6 = " \ file://asound.inline_play.state \ file://asound.inline.state \ file://asound.micro_play.state \ @@ -10,11 +10,11 @@ SRC_URI_append_ccimx6 = " \ file://asound.play.state \ " -SRC_URI_append_ccimx6ul = " file://asound.state" -SRC_URI_append_ccimx8x = " file://asound.state" -SRC_URI_append_ccimx8m = " file://asound.state" -SRC_URI_append_ccmp15 = " file://asound.state" +SRC_URI:append:ccimx6ul = " file://asound.state" +SRC_URI:append:ccimx8x = " file://asound.state" +SRC_URI:append:ccimx8m = " file://asound.state" +SRC_URI:append:ccmp15 = " file://asound.state" -do_install_append_ccimx6() { +do_install:append:ccimx6() { ln -sf asound.micro_play.state ${D}${localstatedir}/lib/alsa/asound.state } diff --git a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb index 20692dd37..58b8967e4 100644 --- a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb +++ b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb @@ -4,7 +4,7 @@ SUMMARY = "Atheros' proprietary tools" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" -RDEPENDS_${PN} = "libnl libnl-genl libnl-nf libnl-route" +RDEPENDS:${PN} = "libnl libnl-genl libnl-nf libnl-route" inherit bin_package @@ -12,7 +12,7 @@ SRC_URI = " \ file://athtestcmd \ " -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" do_install() { install -d ${D}${sbindir} diff --git a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb index 9cf23ced8..64875ed1d 100644 --- a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb +++ b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb @@ -47,6 +47,6 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "/boot" +FILES:${PN} = "/boot" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb index aba5c07cd..a9a837e3e 100644 --- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb +++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb @@ -70,8 +70,8 @@ do_install() { # Do not create empty debug and development packages (PN-dbg PN-dev PN-staticdev) PACKAGES = "${PN}-ar3k ${PN}-ath6kl" -FILES_${PN}-ar3k = "/lib/firmware/ar3k" -FILES_${PN}-ath6kl = "/lib/firmware/ath6k" +FILES:${PN}-ar3k = "/lib/firmware/ar3k" +FILES:${PN}-ath6kl = "/lib/firmware/ath6k" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(ccimx6sbc)" diff --git a/meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata.bb b/meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata.bb index ab28e5548..1110b6436 100644 --- a/meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata.bb +++ b/meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata.bb @@ -54,16 +54,16 @@ do_install () { PACKAGES =+ "${PN}-mfgtest" -FILES_${PN} = " \ +FILES:${PN} = " \ ${base_libdir}/firmware \ " -FILES_${PN}-mfgtest = " \ +FILES:${PN}-mfgtest = " \ ${sbindir} \ " -INSANE_SKIP_${PN} += "build-deps" -INSANE_SKIP_${PN} += "file-rdeps" +INSANE_SKIP:${PN} += "build-deps" +INSANE_SKIP:${PN} += "file-rdeps" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(ccimx8mp|ccmp1)" diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb index aa1203d7d..be7ecbec3 100644 --- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb +++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb @@ -10,8 +10,8 @@ QUALCOMM_WIFI_DRIVER ?= "proprietary" # Selects whether to apply the "Deep Sleep + Internal Clock" workaround BT_INTCLOCK_WORKAROUND ?= "0" -BT_INTCLOCK_WORKAROUND_ccimx6ul = "1" -BT_INTCLOCK_WORKAROUND_ccimx6 = "1" +BT_INTCLOCK_WORKAROUND:ccimx6ul = "1" +BT_INTCLOCK_WORKAROUND:ccimx6 = "1" # Bluetooth 5.0 firmware files FW_QUALCOMM_BT_5 = " \ @@ -58,7 +58,7 @@ FW_QCA6574_WIFI_COMMUNITY = " \ " FW_QUALCOMM_WIFI ?= "${FW_QCA65X4_SDIO_PROPRIETARY}" -FW_QUALCOMM_WIFI_ccimx8x = "${@oe.utils.conditional('QUALCOMM_WIFI_DRIVER', 'community', '${FW_QCA6574_WIFI_COMMUNITY}', '${FW_QCA65X4_PCIE_PROPRIETARY}', d)}" +FW_QUALCOMM_WIFI:ccimx8x = "${@oe.utils.conditional('QUALCOMM_WIFI_DRIVER', 'community', '${FW_QCA6574_WIFI_COMMUNITY}', '${FW_QCA65X4_PCIE_PROPRIETARY}', d)}" SRC_URI = " \ ${FW_QUALCOMM_BT} \ @@ -117,13 +117,13 @@ do_install() { } QCA_MODEL ?= "qca6564" -QCA_MODEL_ccimx8x = "qca6574" +QCA_MODEL:ccimx8x = "qca6574" # Do not create empty debug and development packages (PN-dbg PN-dev PN-staticdev) PACKAGES = "${PN}-${QCA_MODEL}-bt ${PN}-${QCA_MODEL}-wifi" -FILES_${PN}-${QCA_MODEL}-bt = "/lib/firmware/qca" -FILES_${PN}-${QCA_MODEL}-wifi = "/lib/firmware" +FILES:${PN}-${QCA_MODEL}-bt = "/lib/firmware/qca" +FILES:${PN}-${QCA_MODEL}-wifi = "/lib/firmware" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-digi-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend index 67ee15d20..4a0a2d0b6 100644 --- a/meta-digi-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-digi-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2014 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-bodypix_git.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-bodypix_git.bb index 7e5599657..9fd65ad13 100644 --- a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-bodypix_git.bb +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-bodypix_git.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/google-coral/project-bodypix.git;protocol=https" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "python3-pycoral \ +RDEPENDS:${PN} = "python3-pycoral \ python3-svgwrite \ python3-scipy \ libusb1 \ @@ -30,7 +30,7 @@ do_install() { install -m 0555 ${S}/posenet_lib/aarch64/posenet_decoder.so ${D}/opt/libedgetpu/bodypix/posenet_lib/aarch64 } -FILES_${PN} += "/opt/libedgetpu/bodypix/* \ +FILES:${PN} += "/opt/libedgetpu/bodypix/* \ " -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-camera_git.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-camera_git.bb index eb5ce2ab5..7076f13c5 100644 --- a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-camera_git.bb +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-camera_git.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" inherit gobject-introspection -RDEPENDS_${PN} = "python3-pycoral \ +RDEPENDS:${PN} = "python3-pycoral \ gstreamer1.0-plugins-base \ " @@ -31,5 +31,5 @@ do_install() { install -m 0555 ${S}/gstreamer/* ${D}/opt/libedgetpu/camera/gstreamer/ } -FILES_${PN} += "/opt/libedgetpu/camera/* \ +FILES:${PN} += "/opt/libedgetpu/camera/* \ " diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-keyword_git.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-keyword_git.bb index 7915f82d9..870520dfc 100644 --- a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-keyword_git.bb +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-keyword_git.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/google-coral/project-keyword-spotter.git;protocol=ht S = "${WORKDIR}/git" -RDEPENDS_${PN} = "python3-pycoral \ +RDEPENDS:${PN} = "python3-pycoral \ python3-pyaudio \ " @@ -29,5 +29,5 @@ do_install() { install -m 0555 ${S}/config/commands_v2.txt ${D}/opt/libedgetpu/keyword/config } -FILES_${PN} += "/opt/libedgetpu/keyword/* \ +FILES:${PN} += "/opt/libedgetpu/keyword/* \ " diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu_13.0.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu_13.0.bb index aebd42ece..be6e2fa84 100644 --- a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu_13.0.bb +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu_13.0.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "b23b2c5a227d7f0e65dcc91585028d27c12e764f8ce4c4db3f114be4a4 S = "${WORKDIR}/edgetpu_runtime" -RDEPENDS_${PN} = "libusb1" +RDEPENDS:${PN} = "libusb1" # The library files in direct correspond to max frequency, those in throttled correspond to reduced frequency. LIBEDGETPU_TYPE = "direct" @@ -30,8 +30,8 @@ do_install() { install -m 755 ${S}/libedgetpu/edgetpu.h ${D}/${includedir}/edgetpu.h } -FILES_${PN} += "${libdir}/libedgetpu.so \ +FILES:${PN} += "${libdir}/libedgetpu.so \ ${includedir}/edgetpu.h \ " -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" diff --git a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend index a19985d6e..e3db95d3e 100644 --- a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend +++ b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2021, Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # Chose a between a default hard-coded config file (for read-only rootfs) # or a dynamically generated one (with a postinst script) @@ -18,12 +18,12 @@ SRC_URI += " \ file://0003-tools-env-add-support-to-set-dynamic-location-of-env.patch \ " -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/${FW_CONFIG_FILE} ${D}${sysconfdir}/fw_env.config } -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget:${PN}() { CONFIG_FILE="/etc/fw_env.config" MMCDEV="$(sed -ne 's,.*root=/dev/mmcblk\([0-9]\)p.*,\1,g;T;p' /proc/cmdline)" if [ -n "${MMCDEV}" ]; then diff --git a/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite-coral_2.5.0.bb b/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite-coral_2.5.0.bb index 491972e4b..a5ac81dfc 100644 --- a/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite-coral_2.5.0.bb +++ b/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite-coral_2.5.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://www.tensorflow.org/lite/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/tflite_runtime-2.5.0.dist-info/METADATA;md5=8c4b9e107a64b0121980a8705094014b" -PYTHON_PACKAGE = "tflite_runtime-2.5.0-cp38-cp38-linux_aarch64.whl" +PYTHON_PACKAGE = "tflite_runtime-2.5.0-cp38-cp38-linux:aarch64.whl" SRC_URI = "https://github.com/google-coral/pycoral/releases/download/v1.0.1/${PYTHON_PACKAGE};downloadfilename=${PYTHON_PACKAGE};subdir=${BP}" SRC_URI[md5sum] = "9c47617e1fa0bdca673a78b8b6688d64" @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "b87a4c152be05d3585521a1d5418f7645a4fb82965772489b983e93aae DEPENDS = "python3 python3-pip-native python3-wheel-native" -RDEPENDS_${PN} = "${PYTHON_PN} \ +RDEPENDS:${PN} = "${PYTHON_PN} \ ${PYTHON_PN}-numpy \ " @@ -36,14 +36,14 @@ do_install() { ${WORKDIR}/${BP}/tflite_runtime-*.whl } -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/${PYTHON_DIR}/site-packages/* \ " -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" # This package provides the same python files as NXP's tensorflow-lite -RCONFLICTS_${PN} = "tensorflow-lite" +RCONFLICTS:${PN} = "tensorflow-lite" COMPATIBLE_MACHINE = "(-)" -COMPATIBLE_MACHINE_aarch64 = "(.*)" +COMPATIBLE_MACHINE:aarch64 = "(.*)" diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb index 1bd4f1c76..4a5f896ef 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb @@ -13,7 +13,7 @@ DEPENDS = "openssl byacc flex" # error. # Explicitly add openssl-native for the SDK build to correctly link to the # openssl libraries in the native dependencies folder. -DEPENDS_append_class-nativesdk = " byacc-native openssl-native" +DEPENDS:append:class-nativesdk = " byacc-native openssl-native" SRC_URI = " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', '${DIGI_PKG_SRC}/cst-${PV}.tgz', '', d)} \ @@ -56,7 +56,7 @@ do_install() { install -m 0755 ca/v3_usr.cnf ${D}${bindir}/v3_usr.cnf } -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" -FILES_${PN} = "${bindir}" +FILES:${PN} = "${bindir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index c9f0b2851..9a5b81e36 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -26,7 +26,7 @@ SRC_URI = " \ ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " -SRC_URI_append = " \ +SRC_URI:append = " \ file://boot.txt \ file://install_linux_fw_sd.txt \ file://install_linux_fw_usb.txt \ @@ -37,7 +37,7 @@ BOOTLOADER_IMAGE_RECIPE ?= "u-boot" LOCALVERSION ?= "" -EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline" +EXTRA_OEMAKE:append = " KCFLAGS=-fgnu89-inline" UBOOT_EXTRA_CONF ?= "" @@ -128,7 +128,7 @@ def tf_bootscript_sedfilter(d): tf_initramfs = d.getVar('TRUSTFENCE_INITRAMFS_IMAGE',True) or "" return "s,\(^[[:blank:]]*\)true.*,\\1setenv boot_initrd true\\n\\1setenv initrd_file %s-${MACHINE}.cpio.gz.u-boot.tf,g" % tf_initramfs if tf_initramfs else "" -do_deploy_append() { +do_deploy:append() { # Remove canonical U-Boot symlinks for ${UBOOT_CONFIG} currently in the form: # u-boot-.- # u-boot- @@ -206,7 +206,7 @@ do_deploy_append() { BOOT_TOOLS = "imx-boot-tools" -do_deploy_append_ccimx8x() { +do_deploy:append:ccimx8x() { # Move all U-Boot artifacts to the imx-boot-tools folder # U-Boot images are not bootable on the i.MX8X install -d ${DEPLOYDIR}/${BOOT_TOOLS} @@ -214,7 +214,7 @@ do_deploy_append_ccimx8x() { mv ${DEPLOYDIR}/${UBOOT_SYMLINK}-* ${DEPLOYDIR}/${BOOT_TOOLS}/ } -do_deploy_append_ccimx8m() { +do_deploy:append:ccimx8m() { # Deploy u-boot-nodtb.bin and ccimx8m[m|n]-dvk.dtb, to be packaged in boot binary by imx-boot if [ -n "${UBOOT_CONFIG}" ] then diff --git a/meta-digi-arm/recipes-bsp/usbutils/usbutils_%.bbappend b/meta-digi-arm/recipes-bsp/usbutils/usbutils_%.bbappend index dff46e15a..88dc03f0c 100644 --- a/meta-digi-arm/recipes-bsp/usbutils/usbutils_%.bbappend +++ b/meta-digi-arm/recipes-bsp/usbutils/usbutils_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2018 Digi International. -RRECOMMENDS_${PN}_remove = "udev-hwdb" +RRECOMMENDS:${PN}:remove = "udev-hwdb" diff --git a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend index 0d55d1c4c..b2a97d54b 100644 --- a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend +++ b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend @@ -6,7 +6,7 @@ TRUSTFENCE_SDK_TOOLS ?= "\ nativesdk-trustfence-cst \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', \ oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', '${TRUSTFENCE_SDK_TOOLS} nativesdk-imx-mkimage', '${TRUSTFENCE_SDK_TOOLS}', d), '', d)} \ " diff --git a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend index 55d58faf2..8c27c1325 100644 --- a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend +++ b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2013-2022 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://mount_digiparts.sh \ @@ -8,7 +8,7 @@ SRC_URI += " \ file://blacklist.conf \ " -do_install_append() { +do_install:append() { install -d ${D}/mnt install -d ${D}/mnt/linux @@ -43,8 +43,8 @@ do_install_append() { fi } -FILES_${PN}_append = " ${sysconfdir}/modprobe.d" -FILES_${PN}_append += " /mnt" +FILES:${PN}:append = " ${sysconfdir}/modprobe.d" +FILES:${PN}:append += " /mnt" # BT_TTY is machine specific (defined in machine config file) PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb index 42d590faa..a555fd9a7 100644 --- a/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb +++ b/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb @@ -23,19 +23,19 @@ SRC_URI = " \ S = "${WORKDIR}/git" I2C_BUS = "" -I2C_BUS_ccimx6qpsbc = "1" -I2C_BUS_ccimx6ul = "0" -I2C_BUS_ccimx8x = "0" -I2C_BUS_ccimx8m = "0" +I2C_BUS:ccimx6qpsbc = "1" +I2C_BUS:ccimx6ul = "0" +I2C_BUS:ccimx8x = "0" +I2C_BUS:ccimx8m = "0" I2C_SPEED ?= "400000" -I2C_SPEED_ccimx6qpsbc = "100000" +I2C_SPEED:ccimx6qpsbc = "100000" EXTRA_OECMAKE += "-DATCA_HAL_I2C_BUS=${I2C_BUS} -DATCA_HAL_I2C_SPEED=${I2C_SPEED} -DBUILD_TESTS=on" inherit cmake -do_install_append() { +do_install:append() { # Rename the folder containing the header files to be more package-specific mv ${D}${includedir}/lib ${D}${includedir}/cryptoauthlib @@ -46,11 +46,11 @@ do_install_append() { PACKAGES =+ "${PN}-test" -FILES_${PN}-test = "${bindir}/cryptoauth_test" +FILES:${PN}-test = "${bindir}/cryptoauth_test" -RDEPENDS_${PN} = "libp11" -RDEPENDS_${PN}-test = "${PN}" -RRECOMMENDS_${PN} = "${PN}-test" +RDEPENDS:${PN} = "libp11" +RDEPENDS:${PN}-test = "${PN}" +RRECOMMENDS:${PN} = "${PN}-test" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul|ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb index 8ee897066..8297c9bb2 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb @@ -7,12 +7,12 @@ LICENSE = "CLOSED" PKGNAME = "mca_tool" # ARM tarball -SRC_URI_arm = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=arm" +SRC_URI:arm = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=arm" SRC_URI[arm.md5sum] = "ffa8967cb9b684f3846b641a5d57b8f6" SRC_URI[arm.sha256sum] = "057c289990d79f0b749e9d0d7af2570332e9215e697de75dc6851d89bdd61dff" # AARCH64 tarball -SRC_URI_aarch64 = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=aarch64" +SRC_URI:aarch64 = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=aarch64" SRC_URI[aarch64.md5sum] = "12033830965f2861628461c612a7604e" SRC_URI[aarch64.sha256sum] = "2467e426c6a4e6b89f4aaced846c1f52787e130f16ffb62e6f046bea7bc4f21f" @@ -20,6 +20,6 @@ S = "${WORKDIR}/${PKGNAME}-${PV}" inherit bin_package -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m|ccmp15)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index f3e3df500..80551024d 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -54,5 +54,5 @@ do_install() { fi } -FILES_${PN} = "${bindir}" +FILES:${PN} = "${bindir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-digi-arm/recipes-kernel/dtc/dtc.inc b/meta-digi-arm/recipes-kernel/dtc/dtc.inc index 9a90d4404..c7844225b 100644 --- a/meta-digi-arm/recipes-kernel/dtc/dtc.inc +++ b/meta-digi-arm/recipes-kernel/dtc/dtc.inc @@ -20,6 +20,6 @@ do_install () { } PACKAGES =+ "${PN}-misc" -FILES_${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff" +FILES:${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff" -RDEPENDS_${PN}-misc += "bash diffutils" +RDEPENDS:${PN}-misc += "bash diffutils" diff --git a/meta-digi-arm/recipes-kernel/dtc/dtc_1.4.5.bb b/meta-digi-arm/recipes-kernel/dtc/dtc_1.4.5.bb index 399a73287..32d160586 100644 --- a/meta-digi-arm/recipes-kernel/dtc/dtc_1.4.5.bb +++ b/meta-digi-arm/recipes-kernel/dtc/dtc_1.4.5.bb @@ -1,13 +1,13 @@ require dtc.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" SRCREV = "22a65c5331c22979d416738eb756b9541672e00d" -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-Remove-redundant-YYLOC-global-declaration.patch \ " diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 380079d10..335f01ed6 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -36,13 +36,13 @@ DEPENDS = "virtual/kernel" # Selects whether the interface is SDIO or PCI QUALCOMM_WIFI_INTERFACE ?= "sdio" -QUALCOMM_WIFI_INTERFACE_ccimx8x = "pci" +QUALCOMM_WIFI_INTERFACE:ccimx8x = "pci" WLAN_CONFIG_INI = "${@oe.utils.conditional('QUALCOMM_WIFI_INTERFACE', 'sdio' , \ 'QCA6574AU.LE.2.2.1_Rome_SDIO_qcacld-3.0.ini', \ 'QCA6574AU.LE.2.2.1_Rome_PCIe_qcacld-3.0.ini', d)}" -SRC_URI_append = " \ +SRC_URI:append = " \ file://81-qcom-wifi.rules \ file://qualcomm.sh \ " @@ -51,7 +51,7 @@ FILES_SDIO = " \ file://modprobe-qualcomm.conf \ " -SRC_URI_append = "${@oe.utils.conditional('QUALCOMM_WIFI_INTERFACE', 'sdio' , '${FILES_SDIO}', '', d)}" +SRC_URI:append = "${@oe.utils.conditional('QUALCOMM_WIFI_INTERFACE', 'sdio' , '${FILES_SDIO}', '', d)}" S = "${WORKDIR}/git" @@ -78,11 +78,11 @@ EXTRA_OEMAKE += "BUILD_DEBUG_VERSION=n" # Flag to define the maximum vdevs interfaces EXTRA_OEMAKE += "CONFIG_WLAN_MAX_VDEVS=4" -do_compile_prepend() { +do_compile:prepend() { export BUILD_VER=${PV} } -do_install_append() { +do_install:append() { if [ "${QUALCOMM_WIFI_INTERFACE}" = "sdio" ]; then install -d ${D}${sysconfdir}/modprobe.d install -m 0644 ${WORKDIR}/modprobe-qualcomm.conf ${D}${sysconfdir}/modprobe.d/qualcomm.conf @@ -106,12 +106,12 @@ do_install_append() { install -m 0644 ${WORKDIR}/81-qcom-wifi.rules ${D}${sysconfdir}/udev/rules.d/ } -do_install_append_ccimx6ul() { +do_install:append:ccimx6ul() { # Set MCS value to MCS0-7 sed -i -e "s/gVhtTxMCS=2/gVhtTxMCS=0/g" ${D}${base_libdir}/firmware/wlan/qcom_cfg.ini } -FILES_${PN} += " \ +FILES:${PN} += " \ ${@oe.utils.conditional('QUALCOMM_WIFI_INTERFACE', 'sdio' , '${sysconfdir}/modprobe.d/qualcomm.conf', '', d)} \ ${sysconfdir}/udev/ \ ${base_libdir}/firmware/wlan/qcom_cfg.ini \ diff --git a/meta-digi-arm/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-digi-arm/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 6e4721ecf..d48561cab 100644 --- a/meta-digi-arm/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/meta-digi-arm/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -5,4 +5,4 @@ # firmware-imx recipe instead of this one # Use the latest version of sdma firmware in firmware-imx -PACKAGES_remove = "${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d" +PACKAGES:remove = "${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d" diff --git a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb index 787e74908..c4213dfd7 100644 --- a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb @@ -1,8 +1,8 @@ require recipes-kernel/linux-libc-headers/linux-libc-headers.inc -FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-kernel/linux-libc-headers/linux-libc-headers:" +FILESEXTRAPATHS:prepend := "${COREBASE}/meta/recipes-kernel/linux-libc-headers/linux-libc-headers:" -SRC_URI_append_libc-musl = "\ +SRC_URI:append:libc-musl = "\ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ @@ -10,7 +10,7 @@ SRC_URI_append_libc-musl = "\ file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " -SRC_URI_append = "\ +SRC_URI:append = "\ file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ " diff --git a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bbappend b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bbappend index eee135aed..0cff545f7 100644 --- a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bbappend +++ b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bbappend @@ -1,8 +1,8 @@ # Copyright (C) 2020 Digi International, Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-gpio-uapi-add-userspace-support-for-setting-debounce.patch \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb index 8ac277527..0391d545c 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.10.bb @@ -11,7 +11,7 @@ inherit kernel inherit ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'NXP', 'fsl-kernel-localversion', '', d)} SRCBRANCH = "v5.10/nxp/master" -SRCBRANCH_stm32mpcommon = "v5.10/stm/master" +SRCBRANCH:stm32mpcommon = "v5.10/stm/master" require ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)} # Don't create custom folder for kernel artifacts @@ -24,12 +24,12 @@ require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/li # Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared SRC_URI +="${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}" -FILES_${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}" +FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}" # Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" -do_install_append_stm32mpcommon() { +do_install:append:stm32mpcommon() { if ${@bb.utils.contains('MACHINE_FEATURES','gpu','true','false',d)}; then # append evbug tool to blacklist echo "blacklist evbug" >> ${D}/${sysconfdir}/modprobe.d/blacklist.conf @@ -39,6 +39,6 @@ do_install_append_stm32mpcommon() { # ------------------------------------------------------------- # Kernel Args # -KERNEL_EXTRA_ARGS_stm32mpcommon += "LOADADDR=${ST_KERNEL_LOADADDR}" +KERNEL_EXTRA_ARGS:stm32mpcommon += "LOADADDR=${ST_KERNEL_LOADADDR}" COMPATIBLE_MACHINE = "(ccimx8mp|ccmp15-dvk)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb index 6ffae9061..0949f4052 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb @@ -17,13 +17,13 @@ require recipes-kernel/linux/linux-trustfence.inc # Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared SRC_URI += "${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}" -FILES_${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}" +FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}" # Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" # Apply configuration fragments -do_configure_append() { +do_configure:append() { # Only accept fragments ending in .cfg. If the fragments contain # something other than kernel configs, it will be filtered out # automatically. diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb index 997a2f6e0..40d481a30 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb @@ -56,7 +56,7 @@ DEPENDS += "rsync-native" # Without this setting the RDEPENDS in other recipes fails to find this # package, therefore causing the -dev package also to be skipped effectively not # populating it into SDK -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native bison-native rsync-native" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-virtualization.inc b/meta-digi-arm/recipes-kernel/linux/linux-virtualization.inc index 86deba7d4..00a00fdda 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-virtualization.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-virtualization.inc @@ -1,7 +1,7 @@ # Copyright (C) 2019 Digi International # Apply kernel configuration required for Docker -do_configure_prepend() { +do_configure:prepend() { mkdir -p ${B} kernel_conf_variable NAMESPACES y diff --git a/meta-digi-arm/recipes-kernel/perf/perf.bbappend b/meta-digi-arm/recipes-kernel/perf/perf.bbappend index b0f161bd7..edc6ce10e 100644 --- a/meta-digi-arm/recipes-kernel/perf/perf.bbappend +++ b/meta-digi-arm/recipes-kernel/perf/perf.bbappend @@ -1,7 +1,7 @@ # Drop the poky hardknott commit 6bb1621815f41fd09c971a0e26fb4bcd0963ab8a # As the script cannot handle the element MetricName -base_do_configure_prepend () { +base_do_configure:prepend () { # Drop the feature for sort pmu-event if [ -e "${S}/tools/perf/pmu-events/Build" ]; then replacement1='$(srctree)/sort-pmuevents.py $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/pmu-events.c.new' diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index e68bbc41a..96e61defc 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -22,8 +22,8 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" # Removed DISTRO_FEATURES # 'wayland' -> only supported on the i.MX8 QXP # 'ptest' -> fails to build QT5 toolchain -DISTRO_FEATURES_DEFAULT_remove = "3g nfc nfs zeroconf" -POKY_DEFAULT_DISTRO_FEATURES_remove = "ptest wayland" +DISTRO_FEATURES_DEFAULT:remove = "3g nfc nfs zeroconf" +POKY_DEFAULT_DISTRO_FEATURES:remove = "ptest wayland" GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d), d)}" @@ -52,7 +52,7 @@ PREFERRED_VERSION_bluez5 ?= "5.56" # architecture. For armv7a devices libjpeg-turbo should be used to take # advantage of the SIMD instructions. PREFERRED_PROVIDER_jpeg ?= "jpeg" -PREFERRED_PROVIDER_jpeg_armv7a ?= "libjpeg-turbo" +PREFERRED_PROVIDER_jpeg:armv7a ?= "libjpeg-turbo" PREFERRED_VERSION_linux-yocto ?= "5.10%" PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" @@ -112,8 +112,8 @@ INHERIT += "poky-sanity" # QA check settings - a little stricter than the OE-Core defaults # (none currently necessary as we now match OE-Core) #WARN_TO_ERROR_QA = "X" -#WARN_QA_remove = "${WARN_TO_ERROR_QA}" -#ERROR_QA_append = " ${WARN_TO_ERROR_QA}" +#WARN_QA:remove = "${WARN_TO_ERROR_QA}" +#ERROR_QA:append = " ${WARN_TO_ERROR_QA}" require conf/distro/include/poky-world-exclude.inc require conf/distro/include/no-static-libs.inc diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/drm/libdrm_2.4.107.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/drm/libdrm_2.4.107.imx.bb index 8b908c92a..cf5dadd40 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/drm/libdrm_2.4.107.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/drm/libdrm_2.4.107.imx.bb @@ -42,32 +42,32 @@ PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native python3-docutils-native" -ALLOW_EMPTY_${PN}-drivers = "1" +ALLOW_EMPTY:${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \ ${PN}-etnaviv" -RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ +RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ ${PN}-etnaviv" -FILES_${PN}-tests = "${bindir}/*" -FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" -FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" -FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" -FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" -FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" -FILES_${PN}-kms = "${libdir}/libkms*.so.*" -FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" -FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" -FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" +FILES:${PN}-tests = "${bindir}/*" +FILES:${PN}-radeon = "${libdir}/libdrm_radeon.so.*" +FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" +FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" +FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" +FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" +FILES:${PN}-kms = "${libdir}/libkms*.so.*" +FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" +FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" +FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" BBCLASSEXTEND = "native nativesdk" -PACKAGES_prepend_imxgpu = "${PN}-vivante " -RRECOMMENDS_${PN}-drivers_append_imxgpu = " ${PN}-vivante" -FILES_${PN}-vivante = "${libdir}/libdrm_vivante.so.*" -PACKAGECONFIG_append_imxgpu = " vivante" +PACKAGES:prepend:imxgpu = "${PN}-vivante " +RRECOMMENDS:${PN}-drivers:append:imxgpu = " ${PN}-vivante" +FILES:${PN}-vivante = "${libdir}/libdrm_vivante.so.*" +PACKAGECONFIG:append:imxgpu = " vivante" PACKAGECONFIG[vivante] = "-Dvivante=true,-Dvivante=false" PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb index 7b5a9e24a..83a7df2bb 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb @@ -21,14 +21,14 @@ do_install () { cp -r -d --no-preserve=ownership ${S}/gpu-demos/opt ${D} } -FILES_${PN} += "/opt" -INSANE_SKIP_${PN} += "ldflags" +FILES:${PN} += "/opt" +INSANE_SKIP:${PN} += "ldflags" -RDEPENDS_${PN} = "libgal-imx libdrm" +RDEPENDS:${PN} = "libgal-imx libdrm" # This is required to provide support for VPU Amphion HEVC tile format # From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99): # VPU Amphion HEVC tile support was added using OpenCL, so add a dependency on libopencl-imx. -RDEPENDS_${PN} += "libopencl-imx" +RDEPENDS:${PN} += "libopencl-imx" COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb index 4fb5ac4de..e62e43e37 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb @@ -18,4 +18,4 @@ do_install() { oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} } -FILES_${PN} += "/opt" +FILES:${PN} += "/opt" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb index 98256dd8b..15283bdbe 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb @@ -25,6 +25,6 @@ do_install () { cp -r -d --no-preserve=ownership ${S}/g2d/* ${D} } -INSANE_SKIP_${PN} += "ldflags" +INSANE_SKIP:${PN} += "ldflags" COMPATIBLE_MACHINE = "(imxgpu2d)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc index ccca9fc89..6c382e592 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc @@ -5,14 +5,14 @@ PACKAGECONFIG ?= "valgrind" INHIBIT_SYSROOT_STRIP = "1" IMX_SOC = "IMX_SOC_NOT_SET" -IMX_SOC_mx8qm = "mx8qm" -IMX_SOC_mx8mp = "mx8mp" -IMX_SOC_mx8mq = "mx8mq" -IMX_SOC_mx8qxp = "mx8qxp" -IMX_SOC_mx8mn = "mx8mn" -IMX_SOC_mx8ulp = "mx8ulp" +IMX_SOC:mx8qm-nxp-bsp = "mx8qm" +IMX_SOC:mx8mp-nxp-bsp = "mx8mp" +IMX_SOC:mx8mq-nxp-bsp = "mx8mq" +IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp" +IMX_SOC:mx8mn-nxp-bsp = "mx8mn" +IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" -do_install_append() { +do_install:append() { if [ -d ${S}/gpu-core/usr/lib/${IMX_SOC} ]; then cp -r ${S}/gpu-core/usr/lib/${IMX_SOC}/* ${D}${libdir} fi @@ -23,27 +23,27 @@ do_install_append() { } # dri and libVDK.so are removed, make a workaround so base install is not broken -do_install_prepend() { +do_install:prepend() { mkdir -p ${S}/gpu-core/usr/lib/dri mkdir -p ${S}/gpu-core/usr/lib/fb touch ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 } -do_install_append() { +do_install:append() { rm -rf ${D}${libdir}/dri rm -f ${D}${libdir}/libVDK-fb.so.1.2.0 } -RDEPENDS_libopenvg-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-gpuconfig', '', d)}" +RDEPENDS:libopenvg-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-gpuconfig', '', d)}" -FILES_libnn-imx_remove = "${libdir}/libnn*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}" +FILES:libnn-imx:remove = "${libdir}/libnn*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}" -FILES_libvulkan-imx += "${libdir}/libvulkan_VSI${SOLIBS}" -INSANE_SKIP_libvulkan-imx += "dev-so" -FILES_libopenvx-imx += "${libdir}/libOpenVX${SOLIBS}" -INSANE_SKIP_libopenvx-imx += "dev-so dev-deps" -FILES_libopencl-imx += "${libdir}/libOpenCL${SOLIBS}" -INSANE_SKIP_libopencl-imx += "dev-so dev-deps" -FILES_libopenvg-imx += "${libdir}/libOpenVG*${SOLIBS}" -INSANE_SKIP_libopenvg-imx += "dev-so" -FILES_libvdk-imx += "${libdir}/libVDK*${SOLIBS}" -INSANE_SKIP_libvdk-imx += "dev-so" +FILES:libvulkan-imx += "${libdir}/libvulkan_VSI${SOLIBS}" +INSANE_SKIP:libvulkan-imx += "dev-so" +FILES:libopenvx-imx += "${libdir}/libOpenVX${SOLIBS}" +INSANE_SKIP:libopenvx-imx += "dev-so dev-deps" +FILES:libopencl-imx += "${libdir}/libOpenCL${SOLIBS}" +INSANE_SKIP:libopencl-imx += "dev-so dev-deps" +FILES:libopenvg-imx += "${libdir}/libOpenVG*${SOLIBS}" +INSANE_SKIP:libopenvg-imx += "dev-so" +FILES:libvdk-imx += "${libdir}/libVDK*${SOLIBS}" +INSANE_SKIP:libvdk-imx += "dev-so" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb index e029d9278..8b2f53a12 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" SRC_URI[md5sum] = "d577c4e34df73855ebf1c3b3be206f40" SRC_URI[sha256sum] = "a0266612e8c9ca64b417047274941c867de1058db6709170d0bb5c8b8a38eab1" -COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" +COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb index ce61a0895..970d636df 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" SRC_URI[md5sum] = "d53371c1a9a504ff15f747e725164dcb" SRC_URI[sha256sum] = "6106133afed40327b65d3eec0c197d214ff8f28f8ce3cad94653be4bffb9f9d4" -COMPATIBLE_MACHINE = "(mx8)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb index 651750cdf..5ce64c801 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb @@ -15,20 +15,20 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig -do_compile_append () { +do_compile:append () { oe_runmake -C ${S} man } -do_install_append() { +do_install:append() { install -d ${D}/${mandir} install -m 0444 ${S}/man/* ${D}/${mandir} } PACKAGE_ARCH = "${MACHINE_SOCARCH}" PACKAGES = "${PN}" -FILES_${PN} += "${mandir}/*" -INSANE_SKIP_${PN} += "installed-vs-shipped dev-so rpaths dev-deps" +FILES:${PN} += "${mandir}/*" +INSANE_SKIP:${PN} += "installed-vs-shipped dev-so rpaths dev-deps" # Compatible only with i.MX with GPU COMPATIBLE_MACHINE = "(^$)" -COMPATIBLE_MACHINE_imxgpu = "${MACHINE}" +COMPATIBLE_MACHINE:imxgpu = "${MACHINE}" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.3.p2.4.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.3.p2.4.bb index 17cfe674e..23ed4200c 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.3.p2.4.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.3.p2.4.bb @@ -24,8 +24,8 @@ inherit fsl-eula-unpack2 fsl-eula-graphics PACKAGE_ARCH = "${MACHINE_SOCARCH}" -RDEPENDS_${PN} = "imx-gpu-viv" +RDEPENDS:${PN} = "imx-gpu-viv" # Compatible only with i.MX with GPU COMPATIBLE_MACHINE = "(^$)" -COMPATIBLE_MACHINE_imxgpu = "${MACHINE}" +COMPATIBLE_MACHINE:imxgpu = "${MACHINE}" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb index 29c94c4fa..4ee5ecc6b 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" +FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_%.bbappend index f29d84a47..4d6544398 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_%.bbappend @@ -1,4 +1,4 @@ -FILES_${PN}_class-nativesdk = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ +FILES:${PN}:class-nativesdk = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ ${base_bindir}/* ${base_sbindir}/* \ ${base_libdir}/*${SOLIBS} \ @@ -8,4 +8,4 @@ FILES_${PN}_class-nativesdk = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" -FILES_${PN}-dev_remove_class-nativesdk = "${bindir} ${datadir}/wayland" +FILES:${PN}-dev:remove:class-nativesdk = "${bindir} ${datadir}/wayland" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend index 33b8984ee..798876fb1 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2019-2021 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://digi_background.png \ @@ -9,14 +9,14 @@ SRC_URI += " \ # Remove duplicate entries for the ccimx6 platform # and uncomment with an individual append -INI_UNCOMMENT_ASSIGNMENTS_remove_ccimx6 = "use-g2d=1" +INI_UNCOMMENT_ASSIGNMENTS:remove:ccimx6 = "use-g2d=1" -INI_UNCOMMENT_ASSIGNMENTS_append_mx8ulp = " \ +INI_UNCOMMENT_ASSIGNMENTS:append:mx8ulp-nxp-bsp = " \ use-g2d=1 \ " WATCHDOG_SEC = "40" -WATCHDOG_SEC_mx8ulp = "240" +WATCHDOG_SEC:mx8ulp-nxp-bsp = "240" update_file() { if ! grep -q "$1" $3; then @@ -25,11 +25,11 @@ update_file() { sed -i -e "s,$1,$2," $3 } -do_install_append_ccimx6() { +do_install:append:ccimx6() { uncomment "use-g2d=1" ${D}${sysconfdir}/xdg/weston/weston.ini } -do_install_append() { +do_install:append() { install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh # Add weston.log back, used by NXP for testing @@ -49,4 +49,4 @@ do_install_append() { install ${WORKDIR}/digi_background.png ${D}${datadir}/weston } -FILES_${PN} += "${datadir}/weston/digi_background.png" +FILES:${PN} += "${datadir}/weston/digi_background.png" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx/weston.ini b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx/weston.ini rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_9.0.0.imx.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_9.0.0.imx.bbappend index de340338d..8ef23ee2f 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_9.0.0.imx.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_9.0.0.imx.bbappend @@ -1,7 +1,7 @@ # Copyright (C) 2020-2021 Digi International. # Digi: include patches/files from this layer -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" WESTON_SRC ?= "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https" SRC_URI = " \ @@ -13,9 +13,9 @@ SRC_URI = " \ " SRCREV = "26da63a46b926c8301d8c271f6869c893cc35afa" -EXTRA_OEMESON_remove = "-Dbackend-rdp=false" -PACKAGECONFIG_append = " rdp" +EXTRA_OEMESON:remove = "-Dbackend-rdp=false" +PACKAGECONFIG:append = " rdp" PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" # Digi: fix ccimx6 suspend/resume issue -SRC_URI_append_ccimx6 = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch" +SRC_URI:append:ccimx6 = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bb index 12d867f30..92e59ec38 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bb @@ -9,9 +9,9 @@ DEPENDS = "alsa-lib" # For backwards compatibility PROVIDES += "fsl-alsa-plugins" -RREPLACES_${PN} = "fsl-alsa-plugins" -RPROVIDES_${PN} = "fsl-alsa-plugins" -RCONFLICTS_${PN} = "fsl-alsa-plugins" +RREPLACES:${PN} = "fsl-alsa-plugins" +RPROVIDES:${PN} = "fsl-alsa-plugins" +RCONFLICTS:${PN} = "fsl-alsa-plugins" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f" @@ -28,10 +28,10 @@ INCLUDE_DIR = "-I${STAGING_INCDIR_IMX}" EXTRA_OECONF = "CFLAGS="${INCLUDE_DIR}"" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" -FILES_${PN} += "${libdir}/alsa-lib/libasound_*.so" -FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" -FILES_${PN}-dev += "${libdir}/alsa-lib/*.la" +FILES:${PN} += "${libdir}/alsa-lib/libasound_*.so" +FILES:${PN}-dbg += "${libdir}/alsa-lib/.debug" +FILES:${PN}-dev += "${libdir}/alsa-lib/*.la" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gst-examples_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gst-examples_%.bbappend index eef92fe94..540d1a532 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gst-examples_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gst-examples_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2021 Digi International Inc. -RRECOMMENDS_${PN}_ccimx6ul = "" +RRECOMMENDS:${PN}:ccimx6ul = "" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb index bf1401975..a77ec6275 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb @@ -20,5 +20,5 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg" inherit meson pkgconfig upstream-version-is-even -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.imx.bb index 730cde226..177791a01 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.imx.bb @@ -148,13 +148,13 @@ EXTRA_OEMESON += " \ export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" -FILES_${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs" -FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*" -FILES_${PN}-transcode += "${datadir}/gstreamer-1.0/encoding-profiles" -FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" +FILES:${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs" +FILES:${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*" +FILES:${PN}-transcode += "${datadir}/gstreamer-1.0/encoding-profiles" +FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" ########### End of OE-core copy ########### @@ -162,27 +162,27 @@ FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" DEFAULT_PREFERENCE = "-1" -DEPENDS_append_imxgpu2d = " virtual/libg2d" +DEPENDS:append:imxgpu2d = " virtual/libg2d" -SRC_URI_remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz" +SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz" GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" SRCBRANCH = "MM_04.06.03_2110_L5.10.y" -SRC_URI_prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " +SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " SRCREV = "64ea74a49cc06da92126cc680968497df679da8c" S = "${WORKDIR}/git" inherit use-imx-headers -PACKAGE_ARCH_imxpxp = "${MACHINE_SOCARCH}" -PACKAGE_ARCH_mx8 = "${MACHINE_SOCARCH}" +PACKAGE_ARCH:imxpxp = "${MACHINE_SOCARCH}" +PACKAGE_ARCH:mx8 = "${MACHINE_SOCARCH}" PACKAGECONFIG_REMOVE ?= " \ dtls vulkan \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'gl', d)} \ " -PACKAGECONFIG_remove = "${PACKAGECONFIG_REMOVE}" -PACKAGECONFIG_append_mx8 = " kms tinycompress" +PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" +PACKAGECONFIG:append:mx8 = " kms tinycompress" PACKAGECONFIG[tinycompress] = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.imx.bb index fe3579173..42393bca2 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.imx.bb @@ -73,11 +73,11 @@ PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm" PACKAGECONFIG[wayland] = ",,wayland-native wayland wayland-protocols libdrm" PACKAGECONFIG[dispmanx] = ",,virtual/libomxil" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', ' x11', '', d)}" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gbm', ' gbm', '', d)}" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', ' wayland', '', d)}" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' egl', '', d)}" +OPENGL_WINSYS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', ' x11', '', d)}" +OPENGL_WINSYS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gbm', ' gbm', '', d)}" +OPENGL_WINSYS:append = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', ' wayland', '', d)}" +OPENGL_WINSYS:append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}" +OPENGL_WINSYS:append = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' egl', '', d)}" EXTRA_OEMESON += " \ -Ddoc=disabled \ @@ -87,8 +87,8 @@ EXTRA_OEMESON += " \ ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \ " -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h" -FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" +FILES:${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h" +FILES:${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" def get_opengl_cmdline_list(switch_name, options, d): selected_options = [] @@ -109,9 +109,9 @@ CVE_PRODUCT += "gst-plugins-base" DEFAULT_PREFERENCE = "-1" -DEPENDS_append_imxgpu2d = " virtual/libg2d" +DEPENDS:append:imxgpu2d = " virtual/libg2d" -SRC_URI_remove = " \ +SRC_URI:remove = " \ https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ @@ -119,7 +119,7 @@ SRC_URI_remove = " \ " GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" SRCBRANCH = "MM_04.06.03_2110_L5.10.y" -SRC_URI_prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " +SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " SRCREV = "5fe4c49ad969d0bc5e104212ad261911b15a0b83" S = "${WORKDIR}/git" @@ -127,10 +127,10 @@ S = "${WORKDIR}/git" inherit use-imx-headers PACKAGECONFIG_REMOVE ?= "jpeg" -PACKAGECONFIG_remove = "${PACKAGECONFIG_REMOVE}" -PACKAGECONFIG_GL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' viv-fb', '', d)}" +PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" +PACKAGECONFIG_GL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' viv-fb', '', d)}" PACKAGECONFIG[viv-fb] = ",,virtual/libgles2" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'viv-fb', ' viv-fb', '', d)}" +OPENGL_WINSYS:append = "${@bb.utils.contains('PACKAGECONFIG', 'viv-fb', ' viv-fb', '', d)}" EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}"" COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend index c61d1aa79..e8020d7bd 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2021 Digi International Inc. -PACKAGECONFIG_append_ccimx6ul = " vpx" +PACKAGECONFIG:append:ccimx6ul = " vpx" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.imx.bb index f71f635d7..3516f31d3 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.imx.bb @@ -25,8 +25,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" DEPENDS += "gstreamer1.0-plugins-base libcap zlib" -RPROVIDES_${PN}-pulseaudio += "${PN}-pulse" -RPROVIDES_${PN}-soup += "${PN}-souphttpsrc" +RPROVIDES:${PN}-pulseaudio += "${PN}-pulse" +RPROVIDES:${PN}-soup += "${PN}-souphttpsrc" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ @@ -81,7 +81,7 @@ EXTRA_OEMESON += " \ -Dwaveform=disabled \ " -FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" +FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" ########### End of OE-core copy ########### @@ -93,13 +93,13 @@ DEFAULT_PREFERENCE = "-1" DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'libdrm', d)}" DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" -SRC_URI_remove = " \ +SRC_URI:remove = " \ https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ file://0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch \ " GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" SRCBRANCH = "MM_04.06.03_2110_L5.10.y" -SRC_URI_prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " +SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " SRCREV = "7113baa4dd681cf028b04ef4ebe70b06db4b0f08" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb index 42611a50d..e4ae0344c 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb @@ -39,5 +39,5 @@ EXTRA_OEMESON += " \ -Dsidplay=disabled \ " -FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" -FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" +FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" +FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.imx.bb index d70da3664..e647d6f81 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.imx.bb @@ -68,10 +68,10 @@ GIR_MESON_DISABLE_FLAG = "disabled" PACKAGES += "${PN}-bash-completion" # Add the core element plugins to the main package -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" -FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" -FILES_${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" +FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" +FILES:${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" CVE_PRODUCT = "gstreamer" @@ -84,10 +84,10 @@ require recipes-multimedia/gstreamer/gstreamer1.0-ptest.inc DEFAULT_PREFERENCE = "-1" # Use i.MX fork of GST for customizations -SRC_URI_remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" +SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" SRCBRANCH = "MM_04.06.03_2110_L5.10.y" -SRC_URI_prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " +SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " SRCREV = "a55998c70940bd183d25d29e1b82fd3bc9f43df3" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend index d4213ce64..91009dfd9 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2016-2020 Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch \ diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.3.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.3.bb index 61b3cd809..d93f12e11 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.3.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.3.bb @@ -8,15 +8,15 @@ LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" SECTION = "multimedia" DEPENDS = "imx-codec imx-parser libdrm gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -DEPENDS_append_mx6 = " imx-lib" -DEPENDS_append_mx7 = " imx-lib" -DEPENDS_append_mx8ulp = " imx-lib" -DEPENDS_append_imxvpu = " imx-vpuwrap" +DEPENDS:append:mx6 = " imx-lib" +DEPENDS:append:mx7 = " imx-lib" +DEPENDS:append:mx8ulp = " imx-lib" +DEPENDS:append:imxvpu = " imx-vpuwrap" # For backwards compatibility -RREPLACES_${PN} = "gst1.0-fsl-plugin" -RPROVIDES_${PN} = "gst1.0-fsl-plugin" -RCONFLICTS_${PN} = "gst1.0-fsl-plugin" +RREPLACES:${PN} = "gst1.0-fsl-plugin" +RPROVIDES:${PN} = "gst1.0-fsl-plugin" +RCONFLICTS:${PN} = "gst1.0-fsl-plugin" LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" @@ -50,11 +50,11 @@ PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN # Add codec list that the beep plugin run-time depended BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis" -RDEPENDS_${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux " -RDEPENDS_${PN}_append_mx8qm = " imx-dsp" -RDEPENDS_${PN}_append_mx8qxp = " imx-dsp" -RDEPENDS_${PN}_append_mx8mp = " imx-dsp" -RDEPENDS_${PN}_append_mx8ulp = " imx-dsp" +RDEPENDS:${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux " +RDEPENDS:${PN}:append:mx8qm = " imx-dsp" +RDEPENDS:${PN}:append:mx8qxp = " imx-dsp" +RDEPENDS:${PN}:append:mx8mp = " imx-dsp" +RDEPENDS:${PN}:append:mx8ulp = " imx-dsp" PACKAGECONFIG ?= "" @@ -67,16 +67,16 @@ MSDEPENDS = "imx-msparser imx-mscodec" PACKAGECONFIG[wma10dec] += ",,${MSDEPENDS},${MSDEPENDS}" PACKAGECONFIG[wma8enc] += ",,${MSDEPENDS},${MSDEPENDS}" -FILES_${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}" +FILES:${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/pkgconfig/*.pc" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -FILES_${PN}-gplay = "${bindir}/gplay-1.0" -FILES_${PN}-libgplaycore = "${libdir}/libgplaycore-1.0${SOLIBS}" -FILES_${PN}-libgstfsl = "${libdir}/libgstfsl-1.0${SOLIBS}" -FILES_${PN}-grecorder = "${bindir}/grecorder-1.0" -FILES_${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}" -FILES_${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}" +FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" +FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/pkgconfig/*.pc" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" +FILES:${PN}-gplay = "${bindir}/gplay-1.0" +FILES:${PN}-libgplaycore = "${libdir}/libgplaycore-1.0${SOLIBS}" +FILES:${PN}-libgstfsl = "${libdir}/libgstfsl-1.0${SOLIBS}" +FILES:${PN}-grecorder = "${bindir}/grecorder-1.0" +FILES:${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}" +FILES:${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}" COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec.inc b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec.inc index ec39530e5..80f7df1e9 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec.inc +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec.inc @@ -19,12 +19,12 @@ EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8 PACKAGECONFIG ?= "" # Enable vpu PACKAGECONFIG for aarch32 vpu platforms only -PACKAGECONFIG_mx6q = "vpu" -PACKAGECONFIG_mx6dl = "vpu" +PACKAGECONFIG:mx6q-nxp-bsp = "vpu" +PACKAGECONFIG:mx6dl-nxp-bsp = "vpu" PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,virtual/imxvpu" -do_install_append() { +do_install:append() { # FIXME: This link points to nowhere if [ -e ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so ]; then rm ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so @@ -45,15 +45,15 @@ python __set_insane_skip() { for p in d.getVar('PACKAGES', True).split(): # Even though we are packaging libraries those are plugins so we # shouldn't rename the packages to follow its sonames. - d.setVar("DEBIAN_NOAUTONAME_%s" % p, "1") + d.setVar("DEBIAN_NOAUTONAME:%s" % p, "1") # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have # the source we cannot fix it. Disable the insane check for now. if p == 'imx-codec-test-bin': # FIXME: includes the DUT .so files so we need to deploy those - d.setVar("INSANE_SKIP_%s" % p, "ldflags textrel libdir") + d.setVar("INSANE_SKIP:%s" % p, "ldflags textrel libdir") else: - d.setVar("INSANE_SKIP_%s" % p, "ldflags textrel") + d.setVar("INSANE_SKIP:%s" % p, "ldflags textrel") } do_package_qa[prefuncs] += "__set_insane_skip" @@ -69,13 +69,13 @@ python __split_libfslcodec_plugins() { for pkg in pkgs: meta = pkg[10:] if meta != '': - d.setVar('RREPLACES_%s' % pkg, ' libfslcodec-%s' % meta) - d.setVar('RPROVIDES_%s' % pkg, ' libfslcodec-%s' % meta) - d.setVar('RCONFLICTS_%s' % pkg, ' libfslcodec-%s' % meta) + d.setVar('RREPLACES:%s' % pkg, ' libfslcodec-%s' % meta) + d.setVar('RPROVIDES:%s' % pkg, ' libfslcodec-%s' % meta) + d.setVar('RCONFLICTS:%s' % pkg, ' libfslcodec-%s' % meta) else : - d.setVar('RREPLACES_%s' % pkg, ' libfslcodec') - d.setVar('RPROVIDES_%s' % pkg, ' libfslcodec') - d.setVar('RCONFLICTS_%s' % pkg, ' libfslcodec') + d.setVar('RREPLACES:%s' % pkg, ' libfslcodec') + d.setVar('RPROVIDES:%s' % pkg, ' libfslcodec') + d.setVar('RCONFLICTS:%s' % pkg, ' libfslcodec') } python __set_metapkg_rdepends() { @@ -84,7 +84,7 @@ python __set_metapkg_rdepends() { codec_pkgs = oe.utils.packages_filter_out_system(d) codec_pkgs = filter(lambda x: x not in ['imx-codec-test-bin', 'imx-codec-test-source'], codec_pkgs) - d.appendVar('RDEPENDS_imx-codec-meta', ' ' + ' '.join(codec_pkgs)) + d.appendVar('RDEPENDS:imx-codec-meta', ' ' + ' '.join(codec_pkgs)) } PACKAGESPLITFUNCS =+ "__split_libfslcodec_plugins __set_metapkg_rdepends" @@ -95,25 +95,25 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" PACKAGES += "${PN}-meta ${PN}-test-bin ${PN}-test-source lib-src-ppp-arm11-elinux1" -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-meta = "1" +ALLOW_EMPTY:${PN} = "1" +ALLOW_EMPTY:${PN}-meta = "1" # Ensure we get warnings if we miss something -FILES_${PN} = "" +FILES:${PN} = "" -FILES_${PN}-dev += "${libdir}/imx-mm/*/*${SOLIBSDEV} \ +FILES:${PN}-dev += "${libdir}/imx-mm/*/*${SOLIBSDEV} \ ${libdir}/imx-mm/*/*/*${SOLIBSDEV} \ ${libdir}/pkgconfig/*.pc ${includedir}/imx-mm/*" -FILES_${PN}-test-bin += "${datadir}/imx-mm/*/examples/*/bin" +FILES:${PN}-test-bin += "${datadir}/imx-mm/*/examples/*/bin" -FILES_${PN}-test-source += "${datadir}/imx-mm/*" +FILES:${PN}-test-source += "${datadir}/imx-mm/*" # FIXME: The wrap and lib names does not match -FILES_${PN}-oggvorbis += "${libdir}/imx-mm/audio-codec/wrap/lib_vorbisd_wrap_arm*_elinux.so.*" -FILES_${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux.so.*" -FILES_${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*" -FILES_lib-src-ppp-arm11-elinux1 += "${libdir}/lib_src_ppp_arm11_elinux.so.1" +FILES:${PN}-oggvorbis += "${libdir}/imx-mm/audio-codec/wrap/lib_vorbisd_wrap_arm*_elinux.so.*" +FILES:${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux.so.*" +FILES:${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*" +FILES:lib-src-ppp-arm11-elinux1 += "${libdir}/lib_src_ppp_arm11_elinux.so.1" -PACKAGE_ARCH_mx6q = "${MACHINE_SOCARCH}" -PACKAGE_ARCH_mx6dl = "${MACHINE_SOCARCH}" +PACKAGE_ARCH:mx6q-nxp-bsp = "${MACHINE_SOCARCH}" +PACKAGE_ARCH:mx6dl-nxp-bsp = "${MACHINE_SOCARCH}" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_%.bbappend index 2e5247bce..0bf5ec55c 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_%.bbappend @@ -2,7 +2,7 @@ # Empirically detected binaries that are not needed for a given platform REDUNDANT_BINS ?= "" -REDUNDANT_BINS_ccimx6ul ?= " \ +REDUNDANT_BINS:ccimx6ul ?= " \ usr/lib/imx-mm/audio-codec/wrap/lib_aacd_wrap_arm11_elinux.so* \ usr/lib/imx-mm/audio-codec/wrap/lib_aacd_wrap_arm9_elinux.so* \ usr/lib/imx-mm/audio-codec/wrap/lib_mp3d_wrap_arm11_elinux.so* \ @@ -24,7 +24,7 @@ REDUNDANT_BINS_ccimx6ul ?= " \ usr/share/imx-mm/audio-codec/examples/mp3-enc/bin/test_mp3_enc_arm9_elinux* \ " -do_install_append() { +do_install:append() { for i in ${REDUNDANT_BINS}; do rm -f ${D}/${i} done diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.6.3.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.6.3.bb index 1e6910527..21834885c 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.6.3.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.6.3.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" SRC_URI[md5sum] = "f4b85212470daa797c91d2142faa493b" SRC_URI[sha256sum] = "8203956cddb3cac560efafcc60e8cab07dded8fea53bd144576d1ae6f3269826" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb index 031b412c4..19e998051 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb @@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "2703a9dc619a2ac32352d65cfa58f8217e65abcabd33b77b0be02425dc INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INSANE_SKIP_${PN} = "arch dev-so" +INSANE_SKIP:${PN} = "arch dev-so" -FILES_${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm" -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8mp|mx8ulp)" +FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm" +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb index 45d4ec76e..dd8467454 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb @@ -13,22 +13,22 @@ SRC_URI[sha256sum] = "13f67f267d6d33e8be2a6c258a46cde3667258ac86435776cbf1a370de EXTRA_OECONF = "-datadir=${base_libdir}/firmware --bindir=/unit_tests ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', ' ', d)}" -RDEPENDS_${PN} += " imx-dsp-codec-ext" +RDEPENDS:${PN} += " imx-dsp-codec-ext" -FILES_${PN} = "${libdir}/imx-mm/audio-codec/dsp \ +FILES:${PN} = "${libdir}/imx-mm/audio-codec/dsp \ ${libdir}/imx-mm/audio-codec/wrap \ ${base_libdir}/firmware/imx/dsp \ /unit_tests \ " HIFI4_BIN ?= "hifi4_imx8qmqxp.bin" -HIFI4_BIN_mx8qm = "hifi4_imx8qmqxp.bin" -HIFI4_BIN_mx8qxp = "hifi4_imx8qmqxp.bin" -HIFI4_BIN_mx8mp = "hifi4_imx8mp.bin" -HIFI4_BIN_mx8ulp = "hifi4_imx8ulp.bin" +HIFI4_BIN:mx8qm-nxp-bsp = "hifi4_imx8qmqxp.bin" +HIFI4_BIN:mx8qxp-nxp-bsp = "hifi4_imx8qmqxp.bin" +HIFI4_BIN:mx8mp-nxp-bsp = "hifi4_imx8mp.bin" +HIFI4_BIN:mx8ulp-nxp-bsp = "hifi4_imx8ulp.bin" # No need to do install about fsl_unia.h & fsl_types.h, which are duplicate with the ones' in imx-codec -do_install_append () { +do_install:append () { if [ -d ${D}/usr/include/imx-mm/audio-codec ]; then rm -rf ${D}/usr/include/imx-mm/audio-codec fi @@ -46,7 +46,7 @@ do_install_append () { fi } -INSANE_SKIP_${PN} = "already-stripped arch ldflags dev-so" +INSANE_SKIP:${PN} = "already-stripped arch ldflags dev-so" # Fix strip command failed: 'Unable to recognise the format of the input file' INHIBIT_PACKAGE_STRIP = "1" @@ -54,4 +54,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8mp|mx8ulp)" +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb index 34f486402..48be837a9 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb @@ -17,6 +17,6 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -FILES_${PN} += "/unit_tests ${datadir}/imx-mm" +FILES:${PN} += "/unit_tests ${datadir}/imx-mm" -COMPATIBLE_MACHINE = "(mx8)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser.inc b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser.inc index 9daed2dd2..75d23c28a 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser.inc +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser.inc @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6b552f505eedab4a11ab538cf3db743a" # For backwards compatibility PROVIDES += "libfslparser" -RREPLACES_${PN} = "libfslparser" -RPROVIDES_${PN} = "libfslparser" -RCONFLICTS_${PN} = "libfslparser" +RREPLACES:${PN} = "libfslparser" +RPROVIDES:${PN} = "libfslparser" +RCONFLICTS:${PN} = "libfslparser" inherit fsl-eula-unpack autotools pkgconfig @@ -28,13 +28,13 @@ python __set_insane_skip() { # the source we cannot fix it. Disable the insane check for now. # FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those for p in d.getVar('PACKAGES', True).split(): - d.setVar("INSANE_SKIP_%s" % p, "ldflags dev-so textrel") + d.setVar("INSANE_SKIP:%s" % p, "ldflags dev-so textrel") } do_package_qa[prefuncs] += "__set_insane_skip" # FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those -FILES_${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}" +FILES:${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}" INHIBIT_SYSROOT_STRIP = "1" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_%.bbappend index 63258969c..6e0bcb7a0 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_%.bbappend @@ -2,7 +2,7 @@ # Empirically detected binaries that are not needed for a given platform REDUNDANT_BINS ?= "" -REDUNDANT_BINS_ccimx6ul ?= " \ +REDUNDANT_BINS:ccimx6ul ?= " \ usr/lib/imx-mm/parser/lib_avi_parser_arm9_elinux* \ usr/lib/imx-mm/parser/lib_flv_parser_arm9_elinux* \ usr/lib/imx-mm/parser/lib_mkv_parser_arm9_elinux* \ @@ -11,7 +11,7 @@ REDUNDANT_BINS_ccimx6ul ?= " \ usr/lib/imx-mm/parser/lib_ogg_parser_arm9_elinux* \ " -do_install_append() { +do_install:append() { for i in ${REDUNDANT_BINS}; do rm -f ${D}/${i} done diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.6.3.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.6.3.bb index f1d5a6ad7..22e5e007f 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.6.3.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.6.3.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" SRC_URI[md5sum] = "7e6cf19ac1c5f7227bceac794fd72651" SRC_URI[sha256sum] = "780b211b26b15f1a0fc29b4e9c662d075f9478ca8a67d653a5d263086dd34eef" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.2.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.2.bb index c383af286..3d5572076 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.2.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.2.bb @@ -11,8 +11,8 @@ SRC_URI[sha256sum] = "d310ef581f9e6e6d726c5dc8998178b7993680b5552c45561e56ac0e92 inherit fsl-eula-unpack autotools pkgconfig -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" -FILES_${PN} += "${datadir}/imx-mm" +FILES:${PN} += "${datadir}/imx-mm" -COMPATIBLE_MACHINE = "(mx8)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.3.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.3.bb index e8d59d906..00880e14b 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.3.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.3.bb @@ -8,7 +8,7 @@ SECTION = "multimedia" LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" DEPENDS = "virtual/imxvpu" -DEPENDS_append_mx8mp = " imx-vpu-hantro-vc" +DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" IMX_VPUWRAP_SRC ?= "git://github.com/NXP/imx-vpuwrap.git;protocol=https" SRC_URI = "${IMX_VPUWRAP_SRC};branch=${SRCBRANCH}" @@ -20,7 +20,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig -do_install_append() { +do_install:append() { # FIXME: Drop examples for now rm -r ${D}${datadir} } diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb index 56ea192e3..bafdb7fb3 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb @@ -35,5 +35,5 @@ do_install() { install -m 0644 ${WORKDIR}/deploy_afe/TODO.md ${D}/unit_tests/nxp-afe } -FILES_${PN} += "/unit_tests" -INSANE_SKIP_${PN} += "dev-so" +FILES:${PN} += "/unit_tests" +INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb index c81ba15b9..d879c7208 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb @@ -14,7 +14,7 @@ MACHINE_GSTREAMER_1_0_PKGS = " \ gstreamer1.0-plugins-good-meta \ " # Minimal set of gstreamer elements to play a local WEBM video -MACHINE_GSTREAMER_1_0_PKGS_ccimx6ul = " \ +MACHINE_GSTREAMER_1_0_PKGS:ccimx6ul = " \ gstreamer1.0-plugins-base-alsa \ gstreamer1.0-plugins-base-audioconvert \ gstreamer1.0-plugins-base-audioresample \ @@ -32,14 +32,14 @@ MACHINE_GSTREAMER_1_0_PKGS_ccimx6ul = " \ " MACHINE_GSTREAMER_1_0_EXTRA_INSTALL ?= "" -MACHINE_GSTREAMER_1_0_EXTRA_INSTALL_imxgpu ?= " \ +MACHINE_GSTREAMER_1_0_EXTRA_INSTALL:imxgpu ?= " \ gstreamer1.0-plugins-bad-meta \ gstreamer1.0-plugins-ugly-meta \ gstreamer1.0-rtsp-server-meta \ gstreamer1.0-libav \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ${MACHINE_GSTREAMER_1_0_PKGS} \ ${MACHINE_GSTREAMER_1_0_EXTRA_INSTALL} \ ${MACHINE_GSTREAMER_1_0_PLUGIN} \ diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb index de580dfb6..ccfa94cd6 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" inherit autotools pkgconfig LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0" -DEPENDS_append = " alsa-lib" +DEPENDS:append = " alsa-lib" SRC_URI = "git://git.alsa-project.org/tinycompress.git;protocol=git;branch=master \ file://0001-tinycompress-Add-id3-decoding.patch \ diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/cinematicexperience_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/cinematicexperience_%.bbappend index 199100e8e..fb527c9f4 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/cinematicexperience_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/cinematicexperience_%.bbappend @@ -1,4 +1,4 @@ # Remove dependency on qtgraphicaleffects for sololite -DEPENDS_remove_mx6sl = "qtgraphicaleffects" -RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" +DEPENDS:remove:mx6sl-nxp-bsp = "qtgraphicaleffects" +RDEPENDS:${PN}:remove:mx6sl-nxp-bsp = "qtgraphicaleffects-qmlplugins" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb index 489531af5..7af18393f 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb @@ -28,7 +28,7 @@ PACKAGECONFIG[qt5] = '-Dqt5=enabled \ ,-Dqt5=disabled,qtbase qtdeclarative qtbase-native qtx11extras' # remove the duplicate libs except qtsink -do_install_append() { +do_install:append() { rm -rf ${D}/usr if [ -e ${WORKDIR}/build/ext/qt/libgstqmlgl.so ]; then mkdir -p ${D}${libdir}/gstreamer-1.0/ @@ -37,6 +37,6 @@ do_install_append() { } -FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" +FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb index 77081ed48..bbc62db4b 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "fa44c036766f8c4e1c277edd76960c58130a3b46a4dc0d87edb849360e USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" PLATFORM_HAS_VPU = " " -PLATFORM_HAS_VPU_imxvpu = "yes" +PLATFORM_HAS_VPU:imxvpu = "yes" # imx-qtapplications will be enabled on board with GPU 3D # For now, imxcamera & imxplayer can only be supported on x11 backend for SoC with VPU only (including i.MX6Q & i.MX6DL) @@ -45,14 +45,14 @@ do_install () { } -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/qt5/examples/*/* \ ${datadir}/applications/* \ ${datadir}/pixmaps/* \ " -INSANE_SKIP_${PN} += "debug-files" +INSANE_SKIP:${PN} += "debug-files" -COMPATIBLE_MACHINE = "(mx6|mx7ulp)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb index f1180a99f..18ec4dead 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb @@ -20,11 +20,11 @@ do_install () { cp -r ${S}/usr/share/qt5/examples/multimedia/qmlgltest/ ${D}${datadir}/qt5/examples/multimedia/ } -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/qt5/examples/*/* \ " -INSANE_SKIP_${PN} += "debug-files" +INSANE_SKIP:${PN} += "debug-files" -COMPATIBLE_MACHINE = "(mx8)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/nativesdk-qtbase_%.bbappend index 8745c0655..bb03c5b3d 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/nativesdk-qtbase_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/nativesdk-qtbase_%.bbappend @@ -1,6 +1,6 @@ # Move the implementation to do_install # fix environment-setup.d conflict between nativesdk-qtbase and nativesdk-cmake do_generate_qt_environment_file[noexec] = "1" -do_install_append () { +do_install:append () { do_generate_qt_environment_file } diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt3d_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt3d_%.bbappend index aa75bebbb..bdbbf8a81 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt3d_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt3d_%.bbappend @@ -1,6 +1,6 @@ PACKAGECONFIG += "examples" -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5everywheredemo_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5everywheredemo_%.bbappend index 7bb9126df..48c8aa7d5 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5everywheredemo_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5everywheredemo_%.bbappend @@ -1,4 +1,4 @@ # Remove dependency on qtgraphicaleffects for sololite -DEPENDS_remove_mx6sl = "qtgraphicaleffects" -RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file +DEPENDS:remove:mx6sl-nxp-bsp = "qtgraphicaleffects" +RDEPENDS:${PN}:remove:mx6sl-nxp-bsp = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5ledscreen_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5ledscreen_%.bbappend index 7bb9126df..48c8aa7d5 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5ledscreen_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5ledscreen_%.bbappend @@ -1,4 +1,4 @@ # Remove dependency on qtgraphicaleffects for sololite -DEPENDS_remove_mx6sl = "qtgraphicaleffects" -RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file +DEPENDS:remove:mx6sl-nxp-bsp = "qtgraphicaleffects" +RDEPENDS:${PN}:remove:mx6sl-nxp-bsp = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5nmapcarousedemo_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5nmapcarousedemo_%.bbappend index 7bb9126df..48c8aa7d5 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5nmapcarousedemo_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5nmapcarousedemo_%.bbappend @@ -1,4 +1,4 @@ # Remove dependency on qtgraphicaleffects for sololite -DEPENDS_remove_mx6sl = "qtgraphicaleffects" -RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file +DEPENDS:remove:mx6sl-nxp-bsp = "qtgraphicaleffects" +RDEPENDS:${PN}:remove:mx6sl-nxp-bsp = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5nmapper_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5nmapper_%.bbappend index 7bb9126df..48c8aa7d5 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5nmapper_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qt5nmapper_%.bbappend @@ -1,4 +1,4 @@ # Remove dependency on qtgraphicaleffects for sololite -DEPENDS_remove_mx6sl = "qtgraphicaleffects" -RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file +DEPENDS:remove:mx6sl-nxp-bsp = "qtgraphicaleffects" +RDEPENDS:${PN}:remove:mx6sl-nxp-bsp = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtbase_%.bbappend index dfe6a6fb3..b3a0ef644 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -4,34 +4,34 @@ # Copyright 2017-2021 NXP # Copyright (C) 2015-2018, Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # Digi: we use a custom script per platform, not per backend like NXP does -SRC_URI_append = " \ +SRC_URI:append = " \ file://qt5.sh \ " -SRC_URI_append_imxgpu3d = " \ +SRC_URI:append:imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ '', \ 'file://0016-Configure-eglfs-with-egl-pkg-config.patch', d)} \ " -PACKAGECONFIG_DEFAULT_remove_mx8mm = "vulkan" +PACKAGECONFIG_DEFAULT:remove:mx8mm-nxp-bsp = "vulkan" PACKAGECONFIG += "examples" PACKAGECONFIG_PLATFORM_IMX_GPU = "" -PACKAGECONFIG_PLATFORM_IMX_GPU_mx8 = "eglfs" -PACKAGECONFIG_PLATFORM_imxgpu2d += "${PACKAGECONFIG_PLATFORM_IMX_GPU}" -PACKAGECONFIG_PLATFORM_imxgpu3d += "${PACKAGECONFIG_PLATFORM_IMX_GPU}" +PACKAGECONFIG_PLATFORM_IMX_GPU:mx8-nxp-bsp = "eglfs" +PACKAGECONFIG_PLATFORM:imxgpu2d += "${PACKAGECONFIG_PLATFORM_IMX_GPU}" +PACKAGECONFIG_PLATFORM:imxgpu3d += "${PACKAGECONFIG_PLATFORM_IMX_GPU}" -PACKAGECONFIG_append_ccimx6 = " icu" -PACKAGECONFIG_append_ccimx6ul = " linuxfb" +PACKAGECONFIG:append:ccimx6 = " icu" +PACKAGECONFIG:append:ccimx6ul = " linuxfb" PARALLEL_MAKEINST = "" -PARALLEL_MAKE_task-install = "${PARALLEL_MAKEINST}" +PARALLEL_MAKE:task-install = "${PARALLEL_MAKEINST}" -do_install_append () { +do_install:append () { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi @@ -39,4 +39,4 @@ do_install_append () { install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/qt5.sh } -FILES_${PN} += "${sysconfdir}/profile.d/qt5.sh" +FILES:${PN} += "${sysconfdir}/profile.d/qt5.sh" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtdeclarative_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtdeclarative_%.bbappend index e146aec48..5b5a90ea8 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtdeclarative_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtdeclarative_%.bbappend @@ -1,9 +1,9 @@ -PACKAGECONFIG_append_class-target = " examples" +PACKAGECONFIG:append:class-target = " examples" PARALLEL_MAKEINST = "" -PARALLEL_MAKE_task-install = "${PARALLEL_MAKEINST}" +PARALLEL_MAKE:task-install = "${PARALLEL_MAKEINST}" -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtlocation_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtlocation_%.bbappend index 13f91d6df..99d804200 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtlocation_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtlocation_%.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtmultimedia_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtmultimedia_%.bbappend index c136875a4..8cca7bbed 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtmultimedia_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtmultimedia_%.bbappend @@ -1,13 +1,13 @@ # Copyright (C) 2015-2019 Digi International -PACKAGECONFIG_append = " gstreamer" +PACKAGECONFIG:append = " gstreamer" -pkg_postinst_${PN}_ccimx6() { +pkg_postinst:${PN}:ccimx6() { echo '# Use FSL gstreamer plugin video source' >> $D${sysconfdir}/profile.d/qt5.sh echo 'export QT_GSTREAMER_CAMERABIN_VIDEOSRC="imxv4l2src"' >> $D${sysconfdir}/profile.d/qt5.sh } -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtquickcontrols2_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtquickcontrols2_%.bbappend index 13f91d6df..99d804200 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtquickcontrols2_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtquickcontrols2_%.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtscript_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtscript_%.bbappend index 13f91d6df..99d804200 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtscript_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtscript_%.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtsmarthome_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtsmarthome_%.bbappend index 7bb9126df..48c8aa7d5 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtsmarthome_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtsmarthome_%.bbappend @@ -1,4 +1,4 @@ # Remove dependency on qtgraphicaleffects for sololite -DEPENDS_remove_mx6sl = "qtgraphicaleffects" -RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file +DEPENDS:remove:mx6sl-nxp-bsp = "qtgraphicaleffects" +RDEPENDS:${PN}:remove:mx6sl-nxp-bsp = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtsvg_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtsvg_%.bbappend index 13f91d6df..99d804200 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtsvg_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtsvg_%.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qttools_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qttools_%.bbappend index 13f91d6df..99d804200 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qttools_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qttools_%.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend index 3c4461cc8..e123a14b8 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_mx6sl = " file://0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch" +SRC_URI:append:mx6sl-nxp-bsp = " file://0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch" -PACKAGECONFIG_remove_mx6sl = "wayland-egl" +PACKAGECONFIG:remove:mx6sl-nxp-bsp = "wayland-egl" -PACKAGECONFIG_remove_mx8mm = "wayland-vulkan-server-buffer" +PACKAGECONFIG:remove:mx8mm-nxp-bsp = "wayland-vulkan-server-buffer" -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwebengine_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwebengine_%.bbappend index 488b63218..6951675c3 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwebengine_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwebengine_%.bbappend @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append = " file://0001-ui_features.gni-Do-not-enable-use_xkbcommon-for-non-.patch;patchdir=src/3rdparty" +SRC_URI:append = " file://0001-ui_features.gni-Do-not-enable-use_xkbcommon-for-non-.patch;patchdir=src/3rdparty" PACKAGECONFIG += "examples" PACKAGECONFIG[examples] = ",,qtsvg" PARALLEL_MAKEINST = "" -PARALLEL_MAKE_task-install = "${PARALLEL_MAKEINST}" +PARALLEL_MAKE:task-install = "${PARALLEL_MAKEINST}" -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtx11extras_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtx11extras_%.bbappend index 13f91d6df..99d804200 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtx11extras_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtx11extras_%.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/quitbattery_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/quitbattery_%.bbappend index 7bb9126df..48c8aa7d5 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/quitbattery_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/quitbattery_%.bbappend @@ -1,4 +1,4 @@ # Remove dependency on qtgraphicaleffects for sololite -DEPENDS_remove_mx6sl = "qtgraphicaleffects" -RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file +DEPENDS:remove:mx6sl-nxp-bsp = "qtgraphicaleffects" +RDEPENDS:${PN}:remove:mx6sl-nxp-bsp = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/quitindicators_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/quitindicators_%.bbappend index 7bb9126df..48c8aa7d5 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/quitindicators_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/quitindicators_%.bbappend @@ -1,4 +1,4 @@ # Remove dependency on qtgraphicaleffects for sololite -DEPENDS_remove_mx6sl = "qtgraphicaleffects" -RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file +DEPENDS:remove:mx6sl-nxp-bsp = "qtgraphicaleffects" +RDEPENDS:${PN}:remove:mx6sl-nxp-bsp = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-security/ml-security/ml-security_1.0.5.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-security/ml-security/ml-security_1.0.5.bb index a47289bbe..b1b48fa2e 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-security/ml-security/ml-security_1.0.5.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-security/ml-security/ml-security_1.0.5.bb @@ -14,8 +14,8 @@ S = "${WORKDIR}/ml-security" inherit fsl-eula2-unpack2 -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/ml-security/examples/* \ " -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-support/opencv/opencv_4.5.2.imx.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-support/opencv/opencv_4.5.2.imx.bbappend index 397d96aaf..27a652b60 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-support/opencv/opencv_4.5.2.imx.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-support/opencv/opencv_4.5.2.imx.bbappend @@ -1,3 +1,3 @@ SRCREV_opencv = "5423d53ae0d116ee5bbe52f8b5503f0cd8586998" -PACKAGECONFIG_OPENCL_mx8mnul = "" -PACKAGECONFIG_OPENCL_mx8mpul = "" +PACKAGECONFIG_OPENCL:mx8mnul-nxp-bsp = "" +PACKAGECONFIG_OPENCL:mx8mpul-nxp-bsp = "" diff --git a/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/selinux_dey.inc b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/selinux_dey.inc index 0bcf93ea6..87f9dd369 100644 --- a/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/selinux_dey.inc +++ b/meta-digi-dey/dynamic-layers/selinux/recipes-core/images/selinux_dey.inc @@ -1 +1 @@ -IMAGE_INSTALL_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'packagegroup-core-selinux', '', d)}" +IMAGE_INSTALL:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'packagegroup-core-selinux', '', d)}" diff --git a/meta-digi-dey/dynamic-layers/selinux/recipes-kernel/linux/linux-dey_5.4.bbappend b/meta-digi-dey/dynamic-layers/selinux/recipes-kernel/linux/linux-dey_5.4.bbappend index 04f72532e..a5dd277ea 100644 --- a/meta-digi-dey/dynamic-layers/selinux/recipes-kernel/linux/linux-dey_5.4.bbappend +++ b/meta-digi-dey/dynamic-layers/selinux/recipes-kernel/linux/linux-dey_5.4.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'file://selinux.cfg', '', d)}" diff --git a/meta-digi-dey/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy_dey.inc b/meta-digi-dey/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy_dey.inc index 53bf0be51..d99b70bc1 100644 --- a/meta-digi-dey/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy_dey.inc +++ b/meta-digi-dey/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy_dey.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" DEY_POLICY_PATCHES = " \ file://0001-Apply-rules-for-DEY-prebuilt-images.patch \ diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend index c9e06f88e..a7ed9b8b6 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend @@ -1,8 +1,8 @@ # Copyright 2020-2022 Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-cog-platform-fdo-always-use-fullscreen-mode.patch \ " @@ -14,4 +14,4 @@ PACKAGECONFIG += "wl" # drm PACKAGECONFIG pulls in libgbm dependency, which isn't available # on the i.MX6 -PACKAGECONFIG_remove_ccimx6 = "drm" +PACKAGECONFIG:remove:ccimx6 = "drm" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/digi-webkit-examples.inc b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/digi-webkit-examples.inc index f007fb189..8a6a7b9b9 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/digi-webkit-examples.inc +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/digi-webkit-examples.inc @@ -46,7 +46,7 @@ VIDEO_NAME_UPPERCASE = "Big Buck Bunny" # All packages involved in the webkit examples install their files in the # webserver directory -FILES_${PN} = "/${WEBSERVER_ROOT}/*" +FILES:${PN} = "/${WEBSERVER_ROOT}/*" # Don't generate dbg or dev packages PACKAGES = "${PN}" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/digi-webkit-examples_0.1.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/digi-webkit-examples_0.1.bb index 41ed08e73..8207626bd 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/digi-webkit-examples_0.1.bb +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/digi-webkit-examples_0.1.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/${PN}-${PV}" require digi-webkit-examples.inc -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ cog \ video-examples \ webglsamples \ diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/packagegroups/packagegroup-dey-webkit.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/packagegroups/packagegroup-dey-webkit.bb index 3376ddf22..43a43e49e 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/packagegroups/packagegroup-dey-webkit.bb +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/packagegroups/packagegroup-dey-webkit.bb @@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup # Include WPE WebKit, launcher (cog) and examples -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ cog \ digi-webkit-examples \ wpewebkit \ diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/swu-images/dey-image-webkit-swu.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/swu-images/dey-image-webkit-swu.bb index 0d5933099..6ca0a3e03 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/swu-images/dey-image-webkit-swu.bb +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/swu-images/dey-image-webkit-swu.bb @@ -3,6 +3,6 @@ require recipes-digi/swu-images/swu.inc # Point to the SRC_URI files in the original swu-images directory -FILESEXTRAPATHS_prepend := "${THISDIR}/../../../../recipes-digi/swu-images/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/../../../../recipes-digi/swu-images/files:" IMG_NAME = "${@get_baseimg_pn(d)}-${GRAPHICAL_BACKEND}" diff --git a/meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb b/meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb index a76e64115..bdd46f747 100644 --- a/meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb +++ b/meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb @@ -67,7 +67,7 @@ do_install() { PACKAGES =+ "${PN}-cert" -FILES_${PN}-cert = "${sysconfdir}/ssl/certs/" +FILES:${PN}-cert = "${sysconfdir}/ssl/certs/" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-digi-dey/recipes-aws/greengrass/greengrass.inc b/meta-digi-dey/recipes-aws/greengrass/greengrass.inc index a02c288c4..453a8aaaa 100644 --- a/meta-digi-dey/recipes-aws/greengrass/greengrass.inc +++ b/meta-digi-dey/recipes-aws/greengrass/greengrass.inc @@ -7,13 +7,13 @@ CONFIGURATION_DIRECTORY = "config" LICENSE = "Apache-2.0 | BSD-2-Clause | BSD-3-Clause | MIT | PD | Proprietary" -SRC_URI_arm = " \ +SRC_URI:arm = " \ http:///not/exist/greengrass-linux-armv7l-${PV}.tar.gz;name=arm \ file://greengrass.service \ file://greengrass-init \ " -SRC_URI_aarch64 = " \ +SRC_URI:aarch64 = " \ http:///not/exist/greengrass-linux-aarch64-${PV}.tar.gz;name=aarch64 \ file://greengrass.service \ file://greengrass-init \ @@ -83,7 +83,7 @@ do_install() { sed -i -e "/useSystemd/{s,\[yes|no],${GG_USESYSTEMD},g}" ${D}/${BPN}/config/config.json } -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget:${PN}() { # Enable protection for hardlinks and symlinks if ! grep -qs 'protected_.*links' $D${sysconfdir}/sysctl.conf; then cat >> $D${sysconfdir}/sysctl.conf <<-_EOF_ @@ -117,18 +117,18 @@ pkg_postinst_ontarget_${PN}() { fi } -FILES_${PN} = "/${BPN} ${sysconfdir} ${systemd_unitdir}" +FILES:${PN} = "/${BPN} ${sysconfdir} ${systemd_unitdir}" -CONFFILES_${PN} += "/${BPN}/config/config.json" +CONFFILES:${PN} += "/${BPN}/config/config.json" INITSCRIPT_NAME = "greengrass" INITSCRIPT_PARAMS = "defaults 80 20" -SYSTEMD_SERVICE_${PN} = "greengrass.service" +SYSTEMD_SERVICE:${PN} = "greengrass.service" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r ggc_group" -USERADD_PARAM_${PN} = "-r -M -N -g ggc_group -s /bin/false ggc_user" +GROUPADD_PARAM:${PN} = "-r ggc_group" +USERADD_PARAM:${PN} = "-r -M -N -g ggc_group -s /bin/false ggc_user" # # Disable failing QA checks: @@ -136,6 +136,6 @@ USERADD_PARAM_${PN} = "-r -M -N -g ggc_group -s /bin/false ggc_user" # Binary was already stripped # No GNU_HASH in the elf binary # -INSANE_SKIP_${PN} += "already-stripped ldflags file-rdeps" +INSANE_SKIP:${PN} += "already-stripped ldflags file-rdeps" -RDEPENDS_${PN} += "ca-certificates python-argparse python-json python-numbers sqlite3" +RDEPENDS:${PN} += "ca-certificates python-argparse python-json python-numbers sqlite3" diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb index 5dc9367f4..952f144d4 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb @@ -9,7 +9,7 @@ SRC_URI = " \ file://bluetooth-init.service \ " -SRC_URI_append_ccimx6sbc = " \ +SRC_URI:append:ccimx6sbc = " \ file://bluetooth-init_atheros \ " @@ -25,11 +25,11 @@ do_install() { install -m 0644 ${WORKDIR}/bluetooth-init.service ${D}${systemd_unitdir}/system/bluetooth-init.service } -do_install_append_ccimx6sbc() { +do_install:append:ccimx6sbc() { install -m 0755 ${WORKDIR}/bluetooth-init_atheros ${D}${sysconfdir}/bluetooth-init_atheros } -pkg_postinst_ontarget_${PN}_ccimx6sbc() { +pkg_postinst_ontarget:${PN}:ccimx6sbc() { # Only execute the script on wireless ccimx6 platforms if [ -e "/proc/device-tree/bluetooth/mac-address" ]; then for id in $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio); do @@ -44,16 +44,16 @@ pkg_postinst_ontarget_${PN}_ccimx6sbc() { fi } -FILES_${PN} = " ${sysconfdir}/bluetooth-init* \ +FILES:${PN} = " ${sysconfdir}/bluetooth-init* \ ${sysconfdir}/init.d/bluetooth-init \ ${systemd_unitdir}/system/bluetooth-init.service \ " INITSCRIPT_PACKAGES += "${PN}" -INITSCRIPT_NAME_${PN} = "bluetooth-init" -INITSCRIPT_PARAMS_${PN} = "start 19 2 3 4 5 . stop 21 0 1 6 ." +INITSCRIPT_NAME:${PN} = "bluetooth-init" +INITSCRIPT_PARAMS:${PN} = "start 19 2 3 4 5 . stop 21 0 1 6 ." -SYSTEMD_SERVICE_${PN} = "bluetooth-init.service" +SYSTEMD_SERVICE:${PN} = "bluetooth-init.service" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x|ccimx8mn|ccimx8mm)" diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5.inc b/meta-digi-dey/recipes-connectivity/bluez/bluez5.inc index 19c228f52..34692b233 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5.inc +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5.inc @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline" PROVIDES += "bluez-hcidump" -RPROVIDES_${PN} += "bluez-hcidump" +RPROVIDES:${PN} += "bluez-hcidump" -RCONFLICTS_${PN} = "bluez4" +RCONFLICTS:${PN} = "bluez4" PACKAGECONFIG ??= "obex-profiles" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" @@ -48,7 +48,7 @@ NOINST_TOOLS = " \ ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ " -do_install_append() { +do_install:append() { install -d ${D}${INIT_D_DIR} install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth @@ -77,23 +77,23 @@ do_install_append() { sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } -ALLOW_EMPTY_libasound-module-bluez = "1" +ALLOW_EMPTY:libasound-module-bluez = "1" PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools" -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" -FILES_${PN}-dev += "\ +FILES:libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" +FILES:${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" +FILES:${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ ${libdir}/alsa-lib/*.la \ " -FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ +FILES:${PN}-obex = "${libexecdir}/bluetooth/obexd \ ${exec_prefix}/lib/systemd/user/obex.service \ ${datadir}/dbus-1/services/org.bluez.obex.service \ " -SYSTEMD_SERVICE_${PN}-obex = "obex.service" +SYSTEMD_SERVICE:${PN}-obex = "obex.service" -FILES_${PN}-testtools = "${libdir}/bluez/test/*" +FILES:${PN}-testtools = "${libdir}/bluez/test/*" def get_noinst_tools_paths (d, bb, tools): s = list() @@ -103,13 +103,13 @@ def get_noinst_tools_paths (d, bb, tools): s.append("%s/%s" % (bindir, f)) return "\n".join(s) -FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}" +FILES:${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}" -RDEPENDS_${PN}-testtools += "python3-core python3-dbus python3-pygobject" +RDEPENDS:${PN}-testtools += "python3-core python3-dbus python3-pygobject" -SYSTEMD_SERVICE_${PN} = "bluetooth.service" +SYSTEMD_SERVICE:${PN} = "bluetooth.service" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "bluetooth" +INITSCRIPT_NAME:${PN} = "bluetooth" EXCLUDE_FROM_WORLD = "1" diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend index 40aa39b19..cfbf207a6 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend @@ -24,16 +24,16 @@ QCA65XX_COMMON_PATCHES = " \ file://0016-bluetooth-Disable-bluetooth-low-power-mode-functionality.patch \ " -SRC_URI_append_ccimx6ul = " ${QCA65XX_COMMON_PATCHES}" -SRC_URI_append_ccimx6 = " ${QCA65XX_COMMON_PATCHES}" +SRC_URI:append:ccimx6ul = " ${QCA65XX_COMMON_PATCHES}" +SRC_URI:append:ccimx6 = " ${QCA65XX_COMMON_PATCHES}" -SRC_URI_append_ccimx6sbc = " \ +SRC_URI:append:ccimx6sbc = " \ file://main.conf_atheros \ " -PACKAGECONFIG_append = " experimental" +PACKAGECONFIG:append = " experimental" -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/ sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \ ${D}${sysconfdir}/bluetooth/main.conf @@ -42,13 +42,13 @@ do_install_append() { fi } -do_install_append_ccimx6sbc() { +do_install:append:ccimx6sbc() { install -m 0644 ${WORKDIR}/main.conf_atheros ${D}${sysconfdir}/bluetooth/ sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \ ${D}${sysconfdir}/bluetooth/main.conf_atheros } -pkg_postinst_ontarget_${PN}_ccimx6sbc() { +pkg_postinst_ontarget:${PN}:ccimx6sbc() { # Only execute the script on wireless ccimx6 platforms if [ -e "/proc/device-tree/bluetooth/mac-address" ]; then for id in $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio); do @@ -63,6 +63,6 @@ pkg_postinst_ontarget_${PN}_ccimx6sbc() { fi } -FILES_${PN} += " ${sysconfdir}/bluetooth/main.conf*" +FILES:${PN} += " ${sysconfdir}/bluetooth/main.conf*" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.56.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.56.bbappend index 8ac41c3bc..fe470f94e 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.56.bbappend +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.56.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2015-2022 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:${THISDIR}/${BP}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:${THISDIR}/${BP}:" SRC_URI += " \ file://bluetooth.service-add-customizations.patch \ @@ -17,16 +17,16 @@ QCA65XX_COMMON_PATCHES = " \ file://0007-hciattach-Add-verbosity-option.patch \ " -SRC_URI_append_ccimx6ul = " ${QCA65XX_COMMON_PATCHES}" -SRC_URI_append_ccimx6 = " ${QCA65XX_COMMON_PATCHES}" -SRC_URI_append_ccimx8x = " ${QCA65XX_COMMON_PATCHES}" -SRC_URI_append_ccimx8m = " ${QCA65XX_COMMON_PATCHES}" +SRC_URI:append:ccimx6ul = " ${QCA65XX_COMMON_PATCHES}" +SRC_URI:append:ccimx6 = " ${QCA65XX_COMMON_PATCHES}" +SRC_URI:append:ccimx8x = " ${QCA65XX_COMMON_PATCHES}" +SRC_URI:append:ccimx8m = " ${QCA65XX_COMMON_PATCHES}" -SRC_URI_append_ccimx6sbc = " \ +SRC_URI:append:ccimx6sbc = " \ file://main.conf_atheros \ " -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/ sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \ ${D}${sysconfdir}/bluetooth/main.conf @@ -42,13 +42,13 @@ do_install_append() { sed -i -e '/#include/{s,src/shared/,,g}' ${D}${includedir}/bluetooth-internal/att.h } -do_install_append_ccimx6sbc() { +do_install:append:ccimx6sbc() { install -m 0644 ${WORKDIR}/main.conf_atheros ${D}${sysconfdir}/bluetooth/ sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \ ${D}${sysconfdir}/bluetooth/main.conf_atheros } -pkg_postinst_ontarget_${PN}_ccimx6sbc() { +pkg_postinst_ontarget:${PN}:ccimx6sbc() { # Only execute the script on wireless ccimx6 platforms if [ -e "/proc/device-tree/bluetooth/mac-address" ]; then for id in $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio); do @@ -63,11 +63,11 @@ pkg_postinst_ontarget_${PN}_ccimx6sbc() { fi } -PACKAGECONFIG_append = " health-profiles \ +PACKAGECONFIG:append = " health-profiles \ mesh \ btpclient \ " -FILES_${PN} += " ${sysconfdir}/bluetooth/main.conf*" +FILES:${PN} += " ${sysconfdir}/bluetooth/main.conf*" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_git.bbappend b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_git.bbappend index adb2e3bcd..4e8c8e8b4 100644 --- a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_git.bbappend +++ b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_git.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2013-2018 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://cherokee.conf \ @@ -9,7 +9,7 @@ SRC_URI += " \ file://index.html \ " -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/cherokee/ssl ${D}/srv/www install -m 0644 ${WORKDIR}/cherokee.conf ${D}${sysconfdir}/cherokee/ install -m 0644 ${WORKDIR}/cherokee.pem ${D}${sysconfdir}/cherokee/ssl/ @@ -17,4 +17,4 @@ do_install_append() { install -m 0644 ${WORKDIR}/digi-logo.png ${D}/srv/www/ } -FILES_${PN} += "/srv/www" +FILES:${PN} += "/srv/www" diff --git a/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend b/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend index 765fcdbec..92c8796d7 100644 --- a/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend @@ -1,16 +1,16 @@ # Copyright (C) 2016-2021 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://hostapd_wlan0.conf \ file://hostapd@.service \ ${@oe.utils.conditional('HAS_WIFI_VIRTWLANS', 'true', 'file://hostapd_wlan1.conf', '', d)} \ " -SYSTEMD_SERVICE_${PN}_append = " hostapd@.service" +SYSTEMD_SERVICE:${PN}:append = " hostapd@.service" -do_install_append() { +do_install:append() { # Remove the default hostapd.conf rm -f ${WORKDIR}/hostapd.conf # Install custom hostapd_IFACE.conf file @@ -31,7 +31,7 @@ do_install_append() { fi } -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget:${PN}() { # Exit if there is no wireless hardware available if [ ! -e /proc/device-tree/wireless/mac-address ]; then exit 0 diff --git a/meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend b/meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend index a177bc4a7..1dac02428 100644 --- a/meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2017 Digi International Inc. -RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" +RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" diff --git a/meta-digi-dey/recipes-connectivity/mbedtls/mbedtls_2.1.1.bb b/meta-digi-dey/recipes-connectivity/mbedtls/mbedtls_2.1.1.bb index bd43b5656..f111f75bd 100644 --- a/meta-digi-dey/recipes-connectivity/mbedtls/mbedtls_2.1.1.bb +++ b/meta-digi-dey/recipes-connectivity/mbedtls/mbedtls_2.1.1.bb @@ -44,4 +44,4 @@ EXTRA_OECMAKE = " \ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend index cae977902..4c89fadf0 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend @@ -1,6 +1,6 @@ # Copyright 2017, Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://80-mm-net-device-blacklist.rules \ @@ -11,9 +11,9 @@ SRC_URI += " \ # 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So # remove 'polkit' support to be able to build ModemManager on a framebuffer # only image (without X11) -PACKAGECONFIG_remove_dey = " polkit" +PACKAGECONFIG:remove:dey = " polkit" -do_install_append() { +do_install:append() { # Install udev rules for ModemManager blacklist devices install -d ${D}${nonarch_base_libdir}/udev/rules.d install -m 0644 ${WORKDIR}/80-mm-net-device-blacklist.rules ${D}${nonarch_base_libdir}/udev/rules.d/ @@ -24,7 +24,7 @@ do_install_append() { install -m 0644 ${WORKDIR}/late-modems-scan.timer ${D}${systemd_unitdir}/system/ } -SYSTEMD_SERVICE_${PN}_append = " late-modems-scan.timer" -FILES_${PN}_append = " late-modems-scan.timer" +SYSTEMD_SERVICE:${PN}:append = " late-modems-scan.timer" +FILES:${PN}:append = " late-modems-scan.timer" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend index 9f1f4a79d..b9c2445d2 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2017-2019, Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://0001-networkmanager-trigger-dispatcher-on-per-device-conn.patch \ @@ -22,15 +22,15 @@ SRC_URI += " \ # 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So # disable those compile time options to be able to build for framebuffer # based images. -DEPENDS_remove = "polkit" +DEPENDS:remove = "polkit" EXTRA_OECONF += "--enable-polkit=disabled" -PACKAGECONFIG_remove_dey = "consolekit" +PACKAGECONFIG:remove:dey = "consolekit" # Adjust other compile time options to save space -PACKAGECONFIG_remove_dey = "netconfig nss" -PACKAGECONFIG_append = " gnutls modemmanager ppp" +PACKAGECONFIG:remove:dey = "netconfig nss" +PACKAGECONFIG:append = " gnutls modemmanager ppp" -EXTRA_OECONF_append = " --disable-introspection --enable-concheck" +EXTRA_OECONF:append = " --disable-introspection --enable-concheck" # # NetworkManager only accepts IP addresses in CIDR format @@ -49,7 +49,7 @@ WLAN0_STATIC_CIDR = "${@ipaddr_to_cidr('wlan0', d)}" inherit update-rc.d -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/NetworkManager install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/ install -m 0755 ${WORKDIR}/networkmanager-init ${D}${sysconfdir}/init.d/networkmanager diff --git a/meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend b/meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend index 80d5ebada..f2fc9ac0c 100644 --- a/meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend @@ -1,12 +1,12 @@ # Copyright (C) 2016-2019 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" CRYPTOCHIP_COMMON_PATCHES = " \ file://0001-Modify-openssl.cnf-to-automatically-load-the-pkcs11-.patch \ " -SRC_URI_remove = " \ +SRC_URI:remove = " \ file://debian1.0.2/version-script.patch \ file://debian1.0.2/soname.patch \ " @@ -16,6 +16,6 @@ SRC_URI += " \ " # Add the openssl binary whenever the base package is pulled in via a dependency -RRECOMMENDS_libcrypto += "openssl-bin" +RRECOMMENDS:libcrypto += "openssl-bin" PACKAGECONFIG += "cryptodev-linux" diff --git a/meta-digi-dey/recipes-connectivity/openssl/openssl_1.1.1n.bb b/meta-digi-dey/recipes-connectivity/openssl/openssl_1.1.1n.bb index 8538bd5a1..7c042295b 100644 --- a/meta-digi-dey/recipes-connectivity/openssl/openssl_1.1.1n.bb +++ b/meta-digi-dey/recipes-connectivity/openssl/openssl_1.1.1n.bb @@ -20,7 +20,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://reproducibility.patch \ " -SRC_URI_append_class-nativesdk = " \ +SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " @@ -30,8 +30,8 @@ inherit lib_package multilib_header multilib_script ptest MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" PACKAGECONFIG ?= "" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG:class-native = "" +PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" @@ -41,17 +41,17 @@ do_configure[cleandirs] = "${B}" #| ./libcrypto.so: undefined reference to `getcontext' #| ./libcrypto.so: undefined reference to `setcontext' #| ./libcrypto.so: undefined reference to `makecontext' -EXTRA_OECONF_append_libc-musl = " no-async" -EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm" +EXTRA_OECONF:append:libc-musl = " no-async" +EXTRA_OECONF:append:libc-musl:powerpc64 = " no-asm" # adding devrandom prevents openssl from using getrandom() which is not available on older glibc versions # (native versions can be built with newer glibc, but then relocated onto a system with older glibc) -EXTRA_OECONF_class-native = "--with-rand-seed=os,devrandom" -EXTRA_OECONF_class-nativesdk = "--with-rand-seed=os,devrandom" +EXTRA_OECONF:class-native = "--with-rand-seed=os,devrandom" +EXTRA_OECONF:class-nativesdk = "--with-rand-seed=os,devrandom" # Relying on hardcoded built-in paths causes openssl-native to not be relocateable from sstate. -CFLAGS_append_class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" -CFLAGS_append_class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" +CFLAGS:append:class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" +CFLAGS:append:class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" do_configure () { os=${HOST_OS} @@ -147,7 +147,7 @@ do_install () { ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf } -do_install_append_class-native () { +do_install:append:class-native () { create_wrapper ${D}${bindir}/openssl \ OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \ SSL_CERT_DIR=${libdir}/ssl-1.1/certs \ @@ -155,7 +155,7 @@ do_install_append_class-native () { OPENSSL_ENGINES=${libdir}/engines-1.1 } -do_install_append_class-nativesdk () { +do_install:append:class-nativesdk () { mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh @@ -191,22 +191,22 @@ do_install_ptest () { PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc" -FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" -FILES_libssl = "${libdir}/libssl${SOLIBS}" -FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf \ +FILES:libcrypto = "${libdir}/libcrypto${SOLIBS}" +FILES:libssl = "${libdir}/libssl${SOLIBS}" +FILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf \ ${libdir}/ssl-1.1/openssl.cnf* \ " -FILES_${PN}-engines = "${libdir}/engines-1.1" -FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" -FILES_${PN} =+ "${libdir}/ssl-1.1/*" -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" +FILES:${PN}-engines = "${libdir}/engines-1.1" +FILES:${PN}-misc = "${libdir}/ssl-1.1/misc" +FILES:${PN} =+ "${libdir}/ssl-1.1/*" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" -CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" +CONFFILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf" -RRECOMMENDS_libcrypto += "openssl-conf" -RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" +RRECOMMENDS:libcrypto += "openssl-conf" +RDEPENDS:${PN}-ptest += "openssl-bin perl perl-modules bash" -RDEPENDS_${PN}-bin += "openssl-conf" +RDEPENDS:${PN}-bin += "openssl-conf" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb index c2c551455..ed4ce7a48 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb @@ -9,7 +9,7 @@ inherit packagegroup MACHINE_BLUETOOTH_EXTRA_INSTALL ?= "bluez5-init" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ bluez5 \ bluez5-noinst-tools \ bluez5-obex \ diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb index 4b91b837d..2936d8aa1 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb @@ -26,7 +26,7 @@ CELLULAR_PKGS = "\ ppp \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ iproute2 \ batctl \ ${@bb.utils.contains('DISTRO_FEATURES', 'cellular', '${CELLULAR_PKGS}', '', d)} \ diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index 5b53bf943..f6e8662d6 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -6,7 +6,7 @@ SUMMARY = "Wireless packagegroup for DEY image" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ hostapd \ iw \ wireless-regdb-static \ @@ -15,4 +15,4 @@ RDEPENDS_${PN} = "\ wpa-supplicant-passphrase \ " -RDEPENDS_${PN}_append_ccimx6sbc = " ath-prop-tools" +RDEPENDS:${PN}:append:ccimx6sbc = " ath-prop-tools" diff --git a/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.9.bbappend b/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.9.bbappend index 2e65f3da4..a4d3c49df 100644 --- a/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.9.bbappend +++ b/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.9.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2017 Digi International Inc. -do_install_append() { +do_install:append() { # NetworkManager manages the 'resolv.conf' file globally, so # remove the 'pppd' specific scripts for DNS. rm -f ${D}${sysconfdir}/ppp/ip-up.d/08setupdns diff --git a/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_%.bbappend b/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_%.bbappend index 03e75d3f3..3624df93d 100644 --- a/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_%.bbappend @@ -1,8 +1,8 @@ # Copyright (C) 2013-2019 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -do_install_append() { +do_install:append() { if ! test -z "${PAMLIB}" ; then # Access through Pluggable Authentication Modules (PAM) echo "pam_service_name=vsftpd" >> ${D}${sysconfdir}/vsftpd.conf diff --git a/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend b/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend index 3df746486..58a27945e 100644 --- a/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2013-2022 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" PACKAGECONFIG ?= "openssl" @@ -32,24 +32,24 @@ MURATA_COMMON_PATCHES = " \ file://murata/0019-wpa-supplicant-defconfig-Set-to-Cypress-default-configuration.patch;apply=yes \ " -SRC_URI_append_ccimx6sbc = " file://wpa_supplicant_p2p.conf_atheros" -SRC_URI_append_ccmp1 = " ${MURATA_COMMON_PATCHES}" -SRC_URI_append_ccimx8mp = " ${MURATA_COMMON_PATCHES}" +SRC_URI:append:ccimx6sbc = " file://wpa_supplicant_p2p.conf_atheros" +SRC_URI:append:ccmp1 = " ${MURATA_COMMON_PATCHES}" +SRC_URI:append:ccimx8mp = " ${MURATA_COMMON_PATCHES}" -do_install_append() { +do_install:append() { install -m 600 ${WORKDIR}/wpa_supplicant_p2p.conf ${D}${sysconfdir}/wpa_supplicant_p2p.conf sed -i -e "s,##WLAN_P2P_DEVICE_NAME##,${WLAN_P2P_DEVICE_NAME},g" \ ${D}${sysconfdir}/wpa_supplicant_p2p.conf } -do_install_append_ccimx6sbc() { +do_install:append:ccimx6sbc() { # Install atheros variant of the p2p .conf file install -m 600 ${WORKDIR}/wpa_supplicant_p2p.conf_atheros ${D}${sysconfdir}/wpa_supplicant_p2p.conf_atheros sed -i -e "s,##WLAN_P2P_DEVICE_NAME##,${WLAN_P2P_DEVICE_NAME},g" \ ${D}${sysconfdir}/wpa_supplicant_p2p.conf_atheros } -pkg_postinst_ontarget_${PN}_ccimx6sbc() { +pkg_postinst_ontarget:${PN}:ccimx6sbc() { # Only execute the script on wireless ccimx6 platforms if [ -e "/proc/device-tree/wireless/mac-address" ]; then for id in $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio); do diff --git a/meta-digi-dey/recipes-connectivity/xbee/xbee.bb b/meta-digi-dey/recipes-connectivity/xbee/xbee.bb index cd6c72349..000e5b681 100644 --- a/meta-digi-dey/recipes-connectivity/xbee/xbee.bb +++ b/meta-digi-dey/recipes-connectivity/xbee/xbee.bb @@ -27,17 +27,17 @@ do_install() { } PACKAGES =+ "${PN}-init" -FILES_${PN}-init = " \ +FILES:${PN}-init = " \ ${sysconfdir}/xbee-init \ ${sysconfdir}/init.d/xbee-init \ ${systemd_unitdir}/system/xbee-init.service \ " INITSCRIPT_PACKAGES += "${PN}-init" -INITSCRIPT_NAME_${PN}-init = "xbee-init" -INITSCRIPT_PARAMS_${PN}-init = "start 19 2 3 4 5 . stop 21 0 1 6 ." +INITSCRIPT_NAME:${PN}-init = "xbee-init" +INITSCRIPT_PARAMS:${PN}-init = "start 19 2 3 4 5 . stop 21 0 1 6 ." SYSTEMD_PACKAGES = "${PN}-init" -SYSTEMD_SERVICE_${PN}-init = "xbee-init.service" +SYSTEMD_SERVICE:${PN}-init = "xbee-init.service" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend index ff135697a..856d290fa 100644 --- a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,16 +1,16 @@ # Copyright (C) 2013-2021 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://sysctl.conf \ " -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/ } -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget:${PN}() { get_emmc_block_device() { for emmc_number in $(seq 0 9); do if [ -b "/dev/mmcblk${emmc_number}" ] && @@ -56,4 +56,4 @@ pkg_postinst_ontarget_${PN}() { inherit ${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "remove-pkg-postinst-ontarget", "", d)} -CONFFILES_${PN} += "${sysconfdir}/sysctl.conf" +CONFFILES:${PN} += "${sysconfdir}/sysctl.conf" diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.34.%.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.34.%.bbappend index 2a48c7282..30aad6657 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.34.%.bbappend +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.34.%.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2013-2022 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://standby \ file://standby-actions \ @@ -18,7 +18,7 @@ SRC_URI += "file://standby \ ", "", d)} \ " -SRC_URI_append_ccimx6ul = " file://index.html \ +SRC_URI:append:ccimx6ul = " file://index.html \ file://digi-logo.png \ " @@ -26,35 +26,35 @@ HAS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false HAS_MCA = "${@bb.utils.contains('MACHINE_FEATURES', 'mca', 'true', 'false', d)}" # hwclock bootscript init parameters -INITSCRIPT_PARAMS_${PN}-hwclock = "start 20 S . stop 20 0 6 ." +INITSCRIPT_PARAMS:${PN}-hwclock = "start 20 S . stop 20 0 6 ." -FILES_${PN}_append = " ${systemd_unitdir}/system-sleep/" +FILES:${PN}:append = " ${systemd_unitdir}/system-sleep/" # HTTPD package -FILES_${PN}-httpd_append = " ${systemd_unitdir}/system/busybox-httpd.service" +FILES:${PN}-httpd:append = " ${systemd_unitdir}/system/busybox-httpd.service" SYSTEMD_PACKAGES += "${PN}-httpd" -SYSTEMD_SERVICE_${PN}-httpd = "busybox-httpd.service" +SYSTEMD_SERVICE:${PN}-httpd = "busybox-httpd.service" # NTPD package PACKAGES =+ "${PN}-ntpd" -FILES_${PN}-ntpd = "${sysconfdir}/init.d/busybox-ntpd" +FILES:${PN}-ntpd = "${sysconfdir}/init.d/busybox-ntpd" INITSCRIPT_PACKAGES =+ "${PN}-ntpd" -INITSCRIPT_NAME_${PN}-ntpd = "busybox-ntpd" +INITSCRIPT_NAME:${PN}-ntpd = "busybox-ntpd" # ACPID package PACKAGES =+ "${PN}-acpid" -FILES_${PN}-acpid = " ${sysconfdir}/init.d/busybox-acpid \ +FILES:${PN}-acpid = " ${sysconfdir}/init.d/busybox-acpid \ ${sysconfdir}/acpi/acpid.map \ ${sysconfdir}/acpi/pswitch-standby \ ${sysconfdir}/acpi/pswitch-poweroff \ " INITSCRIPT_PACKAGES =+ "${PN}-acpid" -INITSCRIPT_NAME_${PN}-acpid = "busybox-acpid" +INITSCRIPT_NAME:${PN}-acpid = "busybox-acpid" # Start busybox-syslog at a very early state -INITSCRIPT_PARAMS_${PN}-syslog = "defaults 02" +INITSCRIPT_PARAMS:${PN}-syslog = "defaults 02" -do_install_append() { +do_install:append() { if grep "CONFIG_NTPD=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/busybox-ntpd ${D}${sysconfdir}/init.d/ fi @@ -103,7 +103,7 @@ do_install_append() { fi } -do_install_append_ccimx6ul() { +do_install:append:ccimx6ul() { install -d ${D}/srv/www if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then install -m 0644 ${WORKDIR}/index.html ${D}/srv/www/ diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.34.1.bb b/meta-digi-dey/recipes-core/busybox/busybox_1.34.1.bb index f1e739bc6..75bdc2fd2 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.34.1.bb +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.34.1.bb @@ -4,9 +4,9 @@ require recipes-core/busybox/busybox.inc # hardknott with a few minor differences. Re-use most of the files from poky # to avoid duplicity, while giving priority to our version of the files so that we can # replace the hardknott versions with their respective honister ones. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" -FILESEXTRAPATHS_append := ":${COREBASE}/meta/recipes-core/busybox/${PN}" -FILESEXTRAPATHS_append := ":${COREBASE}/meta/recipes-core/busybox/files" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:" +FILESEXTRAPATHS:append := ":${COREBASE}/meta/recipes-core/busybox/${PN}" +FILESEXTRAPATHS:append := ":${COREBASE}/meta/recipes-core/busybox/files" SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-udhcpc-no_deconfig.patch \ @@ -57,6 +57,6 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ file://0001-mktemp-add-tmpdir-option.patch \ " -SRC_URI_append_libc-musl = " file://musl.cfg " +SRC_URI:append:libc-musl = " file://musl.cfg " SRC_URI[tarball.sha256sum] = "415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549" diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc index 6b3afb103..0a448aed3 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc +++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc @@ -7,7 +7,7 @@ LICENSE = "MIT" GRAPHICAL_CORE ??= "qt" SOC_PACKAGES = "" -SOC_PACKAGES_ccimx6 = "imx-gpu-viv-demos imx-gpu-viv-tools" +SOC_PACKAGES:ccimx6 = "imx-gpu-viv-demos imx-gpu-viv-tools" IMAGE_INSTALL = " \ packagegroup-dey-core \ @@ -33,10 +33,10 @@ IMAGE_FEATURES += " \ # Separately add 'dey-gstreamer' to ccimx6ulsbc platform. # This platform does not have 'accel-video' but we want gstreamer for using # it with video/camera -IMAGE_FEATURES_append_ccimx6ulsbc = " dey-gstreamer" +IMAGE_FEATURES:append:ccimx6ulsbc = " dey-gstreamer" # Remove some features to reduce the rootfs size to fit in the internal storage. -IMAGE_FEATURES_remove_ccimx6ul = "package-management" +IMAGE_FEATURES:remove:ccimx6ul = "package-management" # SDK features (for toolchains generated from an image with populate_sdk) SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs" diff --git a/meta-digi-dey/recipes-core/images/dey-image-tiny.bb b/meta-digi-dey/recipes-core/images/dey-image-tiny.bb index 0d81808b2..31658e4bf 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-tiny.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-tiny.bb @@ -21,5 +21,5 @@ inherit dey-image IMAGE_ROOTFS_SIZE ?= "8192" -IMAGE_FSTYPES_remove = "ext4" -IMAGE_FSTYPES_append = " ext2" +IMAGE_FSTYPES:remove = "ext4" +IMAGE_FSTYPES:append = " ext2" diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index 31139edbf..c32ce9f4a 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2013-2021 Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:" INITSCRIPT_NAME = "networking" INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 80 0 6 1 ." @@ -13,7 +13,7 @@ WIFI_VIRTWLANS_FILES = " \ file://virtwlans \ " -SRC_URI_append = " \ +SRC_URI:append = " \ file://ifupdown.service \ file://interfaces.br0.example \ file://interfaces.p2p \ @@ -22,17 +22,17 @@ SRC_URI_append = " \ ${@oe.utils.conditional('HAS_WIFI_VIRTWLANS', 'true', '${WIFI_VIRTWLANS_FILES}', '', d)} \ " -SRC_URI_append_ccimx6sbc = " \ +SRC_URI:append:ccimx6sbc = " \ file://interfaces.wlan1.atheros.static \ file://interfaces.wlan1.atheros.dhcp \ file://interfaces.br0.atheros.example \ " -SYSTEMD_SERVICE_${PN} = "ifupdown.service" +SYSTEMD_SERVICE:${PN} = "ifupdown.service" WPA_DRIVER ?= "nl80211" -do_install_append() { +do_install:append() { # Install 'ifupdown' scripts install -m 0755 ${WORKDIR}/p2plink ${D}${sysconfdir}/network/if-up.d/ install -m 0755 ${WORKDIR}/resolv ${D}${sysconfdir}/network/if-up.d/ diff --git a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend index fcf006540..8fa7c1a96 100644 --- a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend +++ b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend @@ -1,17 +1,17 @@ # Copyright (C) 2013-2017 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:" SRC_URI += "file://devtmpfs.sh" -SRC_URI_append_ccimx6ul = " file://caam_jr0_wakeup.sh" +SRC_URI:append:ccimx6ul = " file://caam_jr0_wakeup.sh" -do_install_append() { +do_install:append() { install -m 755 ${WORKDIR}/devtmpfs.sh ${D}${sysconfdir}/init.d/devtmpfs.sh update-rc.d -r ${D} devtmpfs.sh start 03 S . } -do_install_append_ccimx6ul() { +do_install:append:ccimx6ul() { install -m 0755 ${WORKDIR}/caam_jr0_wakeup.sh ${D}${sysconfdir}/init.d/caam_jr0_wakeup.sh update-rc.d -r ${D} caam_jr0_wakeup.sh start 20 S . } diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index ecae70201..19ecbc2a3 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -29,7 +29,7 @@ VIRTUAL-RUNTIME_passwd_manager ?= "shadow" # Set virtual runtimes depending on X11 feature VIRTUAL-RUNTIME_touchscreen ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'tslib-calibrate tslib-tests', d)}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ awsiotsdk-c \ base-files \ base-passwd \ @@ -66,7 +66,7 @@ RDEPENDS_${PN} = "\ ${MACHINE_EXTRA_RDEPENDS} \ " -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ ${VIRTUAL-RUNTIME_base-utils-syslog} \ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ ${MACHINE_EXTRA_RRECOMMENDS} \ diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb index 2f47f8bc1..adf673bd8 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb @@ -6,7 +6,7 @@ SUMMARY = "Debug applications packagegroup for DEY image" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ evtest \ fbtest \ i2c-tools \ diff --git a/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend b/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend index 84e701e6b..faec597c5 100644 --- a/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend +++ b/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2016 Digi International -FILESEXTRAPATHS_prepend_dey := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:dey := "${THISDIR}/files:" SRC_URI += " \ file://0001-colors-modify-psplash-colors-to-match-Digi-scheme.patch \ diff --git a/meta-digi-dey/recipes-core/readline/readline_%.bbappend b/meta-digi-dey/recipes-core/readline/readline_%.bbappend index 06c6268bb..6e5acb9a5 100644 --- a/meta-digi-dey/recipes-core/readline/readline_%.bbappend +++ b/meta-digi-dey/recipes-core/readline/readline_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2018 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb index 1b7259fa6..de072f09d 100644 --- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb +++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb @@ -62,6 +62,6 @@ do_install() { # Do not create debug/devel packages PACKAGES = "${PN}" -FILES_${PN} = "/" +FILES:${PN} = "/" -RDEPENDS_${PN}_append = "${@bb.utils.contains('STORAGE_MEDIA', 'mmc', ' cryptsetup', '', d)}" +RDEPENDS:${PN}:append = "${@bb.utils.contains('STORAGE_MEDIA', 'mmc', ' cryptsetup', '', d)}" diff --git a/meta-digi-dey/recipes-core/system-monitor/system-monitor_0.1.bb b/meta-digi-dey/recipes-core/system-monitor/system-monitor_0.1.bb index f6be088cd..9cf17cb1f 100644 --- a/meta-digi-dey/recipes-core/system-monitor/system-monitor_0.1.bb +++ b/meta-digi-dey/recipes-core/system-monitor/system-monitor_0.1.bb @@ -15,7 +15,7 @@ inherit systemd features_check REQUIRED_DISTRO_FEATURES= "systemd" -SYSTEMD_SERVICE_${PN} = "system-monitor.service" +SYSTEMD_SERVICE:${PN} = "system-monitor.service" # The system-monitor.sh script is an example that needs to be customized. # This service also needs to be manually enabled. @@ -33,4 +33,4 @@ do_install() { install -m 0755 ${WORKDIR}/recover-bridge-action ${D}${sysconfdir}/system-monitor/recover-action.d } -FILES_${PN} += "${systemd_unitdir}/system/system-monitor.service" +FILES:${PN} += "${systemd_unitdir}/system/system-monitor.service" diff --git a/meta-digi-dey/recipes-core/systemd/systemd-conf_%.bbappend b/meta-digi-dey/recipes-core/systemd/systemd-conf_%.bbappend index 0554e4655..1e0083a50 100644 --- a/meta-digi-dey/recipes-core/systemd/systemd-conf_%.bbappend +++ b/meta-digi-dey/recipes-core/systemd/systemd-conf_%.bbappend @@ -1,11 +1,11 @@ # Copyright (C) 2019,2020 by Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://system.conf-imx \ " -do_install_append() { +do_install:append() { install -D -m0644 ${WORKDIR}/system.conf-imx ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf } diff --git a/meta-digi-dey/recipes-core/systemd/systemd-gpuconfig_1.0.bb b/meta-digi-dey/recipes-core/systemd/systemd-gpuconfig_1.0.bb index 459ddccb9..5f9ac2283 100644 --- a/meta-digi-dey/recipes-core/systemd/systemd-gpuconfig_1.0.bb +++ b/meta-digi-dey/recipes-core/systemd/systemd-gpuconfig_1.0.bb @@ -8,7 +8,7 @@ SRC_URI = " file://gpuconfig \ " S = "${WORKDIR}" -RDEPENDS_${PN} = "systemd" +RDEPENDS:${PN} = "systemd" do_install () { install -d ${D}${sysconfdir} @@ -23,7 +23,7 @@ do_install () { ${D}${sysconfdir}/systemd/system/multi-user.target.wants/gpuconfig.service } -FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" +FILES:${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" # As this package is tied to systemd, only build it when we're also building systemd. python () { diff --git a/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend b/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend index 95140a179..55a98777e 100644 --- a/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend +++ b/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://0001-sysv-generator-reduce-message-level-for-packages-tha.patch \ @@ -6,9 +6,9 @@ SRC_URI += " \ " # Remove systemd-networkd from our images, since we already use NetworkManager -PACKAGECONFIG_remove_dey = "networkd" +PACKAGECONFIG:remove:dey = "networkd" -do_install_append () { +do_install:append () { # Disable the assignment of the fixed network interface name install -d ${D}${sysconfdir}/systemd/network ln -s /dev/null ${D}${sysconfdir}/systemd/network/99-default.link diff --git a/meta-digi-dey/recipes-core/sysvinit/sysvinit_2.99.bbappend b/meta-digi-dey/recipes-core/sysvinit/sysvinit_2.99.bbappend index 8edb38c98..40c3e7dea 100644 --- a/meta-digi-dey/recipes-core/sysvinit/sysvinit_2.99.bbappend +++ b/meta-digi-dey/recipes-core/sysvinit/sysvinit_2.99.bbappend @@ -1,10 +1,10 @@ # Copyright (C) 2013-2014 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:" -SRC_URI_append_ccimx6 = " file://0001-sysvinit-disable-all-cpus-but-cpu0-for-halt-reboot.patch" +SRC_URI:append:ccimx6 = " file://0001-sysvinit-disable-all-cpus-but-cpu0-for-halt-reboot.patch" -do_install_append() { +do_install:append() { # Remove 'bootlogd' bootscript symlinks update-rc.d -f -r ${D} stop-bootlogd remove update-rc.d -f -r ${D} bootlogd remove diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb index 6384a5d06..b7f6ecf5d 100644 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb @@ -15,10 +15,10 @@ do_install() { # Do not create debug/devel packages PACKAGES = "${PN}" -FILES_${PN} = "/" +FILES:${PN} = "/" # Runtime packages used in 'trustfence-initramfs-init' -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ libubootenv-bin \ cryptsetup \ trustfence-tool \ diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.5.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.5.bb index 5f4790852..ebe4408e7 100644 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.5.bb +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.5.bb @@ -4,12 +4,12 @@ SUMMARY = "Trustfence command line tool" SECTION = "console/tools" LICENSE = "CLOSED" -SRC_URI_arm = "${DIGI_PKG_SRC}/${BP}-${TUNE_ARCH}.tar.gz;name=arm" +SRC_URI:arm = "${DIGI_PKG_SRC}/${BP}-${TUNE_ARCH}.tar.gz;name=arm" SRC_URI[arm.md5sum] = "2afde78b6c84aac1fbec2dbce9e49aab" SRC_URI[arm.sha256sum] = "94a0158aa9e09f8d13be8630e1426fe9a1fdb4b4a2bb133be2f7726a3a27f9d7" -SRC_URI_aarch64 = "${DIGI_PKG_SRC}/${BP}-${TUNE_ARCH}.tar.gz;name=aarch64" +SRC_URI:aarch64 = "${DIGI_PKG_SRC}/${BP}-${TUNE_ARCH}.tar.gz;name=aarch64" SRC_URI[aarch64.md5sum] = "a9b4a53eaf493a6cd03090fead217b38" SRC_URI[aarch64.sha256sum] = "a134e65e305e19bf5a3734b1e095f4bb8fbe80482cbad02f3ce05f936a9c3801" diff --git a/meta-digi-dey/recipes-devtools/python-numpy/python3-numpy_%.bbappend b/meta-digi-dey/recipes-devtools/python-numpy/python3-numpy_%.bbappend index a7a260a70..3ff0e4c57 100644 --- a/meta-digi-dey/recipes-devtools/python-numpy/python3-numpy_%.bbappend +++ b/meta-digi-dey/recipes-devtools/python-numpy/python3-numpy_%.bbappend @@ -2,7 +2,7 @@ # Re-add the base RDEPENDS to class-target since they are being overwritten in the # original recipe -RDEPENDS_${PN}_class-target_append = " \ +RDEPENDS:${PN}:class-target:append = " \ ${PYTHON_PN}-unittest \ ${PYTHON_PN}-difflib \ ${PYTHON_PN}-pprint \ diff --git a/meta-digi-dey/recipes-devtools/python/python-erpc_git.bb b/meta-digi-dey/recipes-devtools/python/python-erpc_git.bb index f8672bbc1..11eb36c67 100644 --- a/meta-digi-dey/recipes-devtools/python/python-erpc_git.bb +++ b/meta-digi-dey/recipes-devtools/python/python-erpc_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "eRPC (Embedded RPC) is an open source Remote Procedure Call (RPC) LICENSE = "BSD-3-Clause" AUTHOR = "Jun Zhu " -RDEPENDS_${PN} = "python-pyserial python-enum34 python-argparse python-threading python-shell" +RDEPENDS:${PN} = "python-pyserial python-enum34 python-argparse python-threading python-shell" LIC_FILES_CHKSUM = "file://readme.md;md5=d3d754f8e1f07a15e65da588118bf793" @@ -18,10 +18,10 @@ inherit setuptools do_configure[noexec] = "1" -do_compile_prepend () { +do_compile:prepend () { export IS_YOCTO="1" } -do_install_prepend () { +do_install:prepend () { export IS_YOCTO="1" } diff --git a/meta-digi-dey/recipes-devtools/python/python3-matplotlib_%.bbappend b/meta-digi-dey/recipes-devtools/python/python3-matplotlib_%.bbappend index 67033d7be..c5673b448 100644 --- a/meta-digi-dey/recipes-devtools/python/python3-matplotlib_%.bbappend +++ b/meta-digi-dey/recipes-devtools/python/python3-matplotlib_%.bbappend @@ -1,4 +1,4 @@ -do_compile_prepend() { +do_compile:prepend() { # Packages are downloaded during the build so the proxy is needed export http_proxy=${http_proxy} export https_proxy=${https_proxy} diff --git a/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb b/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb index a089a3331..0e28b1362 100644 --- a/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb +++ b/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://coral.ai/software/#pycoral-api" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/pycoral-1.0.1.dist-info/LICENSE;md5=d8927f3331d2b3e321b7dd1925166d25" -PYTHON_PACKAGE = "pycoral-1.0.1-cp38-cp38-linux_aarch64.whl" +PYTHON_PACKAGE = "pycoral-1.0.1-cp38-cp38-linux:aarch64.whl" SRC_URI = "git://github.com/google-coral/pycoral.git;protocol=https" SRCREV = "d4b9f572fa3baef9d854483a171e02a6b3f9dbd0" @@ -16,7 +16,7 @@ SRC_URI[python-wheel.sha256sum] = "894468447192fbcf946157db0f3b6424ece6d70bcec12 DEPENDS = "python3 python3-pip-native python3-wheel-native curl-native ca-certificates-native" -RDEPENDS_${PN} = "${PYTHON_PN} \ +RDEPENDS:${PN} = "${PYTHON_PN} \ ${PYTHON_PN}-numpy \ ${PYTHON_PN}-pycairo \ ${PYTHON_PN}-pygobject \ @@ -57,12 +57,12 @@ do_install() { ${WORKDIR}/${BP}/pycoral-*.whl } -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/${PYTHON_DIR}/site-packages/* \ /opt/pycoral/* \ " -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" COMPATIBLE_MACHINE = "(-)" -COMPATIBLE_MACHINE_aarch64 = "(.*)" +COMPATIBLE_MACHINE:aarch64 = "(.*)" diff --git a/meta-digi-dey/recipes-devtools/python3-scipy/python3-scipy_1.7.0.bb b/meta-digi-dey/recipes-devtools/python3-scipy/python3-scipy_1.7.0.bb index 74fb1c86b..7253ab6ff 100644 --- a/meta-digi-dey/recipes-devtools/python3-scipy/python3-scipy_1.7.0.bb +++ b/meta-digi-dey/recipes-devtools/python3-scipy/python3-scipy_1.7.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.scipy.org" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/scipy-1.7.0.dist-info/LICENSE.txt;md5=caecddab96f03de0092b62333ea77f91" -PYTHON_PACKAGE = "scipy-1.7.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" +PYTHON_PACKAGE = "scipy-1.7.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014:aarch64.whl" SRC_URI = "https://files.pythonhosted.org/packages/d0/8d/3dbb59d78218b6a76f1ddb55db60ea5459fa7968655acb21252a59a10bc3/${PYTHON_PACKAGE};subdir=${BP}" SRC_URI[md5sum] = "e2e369078c6b7ca29c952cb9971bc154" @@ -12,10 +12,10 @@ SRC_URI[sha256sum] = "bd4399d4388ca0239a4825e312b3e61b60f743dd6daf49e58708377165 DEPENDS = "python3 python3-pip-native python3-wheel-native" -RDEPENDS_${PN} = "${PYTHON_PN} \ +RDEPENDS:${PN} = "${PYTHON_PN} \ ${PYTHON_PN}-numpy \ " -RPROVIDES_${PN} += "\ +RPROVIDES:${PN} += "\ libgfortran-daac5196.so.5.0.0(GFORTRAN_8)(64bit) \ " @@ -38,11 +38,11 @@ do_install() { ${WORKDIR}/${BP}/scipy-*.whl } -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/${PYTHON_DIR}/site-packages/* \ " -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" COMPATIBLE_MACHINE = "(-)" -COMPATIBLE_MACHINE_aarch64 = "(.*)" +COMPATIBLE_MACHINE:aarch64 = "(.*)" diff --git a/meta-digi-dey/recipes-devtools/python3-xbee/python3-xbee.inc b/meta-digi-dey/recipes-devtools/python3-xbee/python3-xbee.inc index 9ab2020b6..5a199753b 100644 --- a/meta-digi-dey/recipes-devtools/python3-xbee/python3-xbee.inc +++ b/meta-digi-dey/recipes-devtools/python3-xbee/python3-xbee.inc @@ -7,6 +7,6 @@ LICENSE = "MPL-2.0" PYPI_PACKAGE = "digi-xbee" -RDEPENDS_${PN} = "python3-pyserial" +RDEPENDS:${PN} = "python3-pyserial" inherit pypi setuptools3 diff --git a/meta-digi-dey/recipes-devtools/stb/stb_git.bb b/meta-digi-dey/recipes-devtools/stb/stb_git.bb index 17da929b3..327328fa9 100644 --- a/meta-digi-dey/recipes-devtools/stb/stb_git.bb +++ b/meta-digi-dey/recipes-devtools/stb/stb_git.bb @@ -17,4 +17,4 @@ do_install() { } # This is a header-only library, so the main package will be empty. -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-digi-dey/recipes-devtools/tcf-agent/tcf-agent_git.bbappend b/meta-digi-dey/recipes-devtools/tcf-agent/tcf-agent_git.bbappend index 822d2337a..2bd6fb6a4 100644 --- a/meta-digi-dey/recipes-devtools/tcf-agent/tcf-agent_git.bbappend +++ b/meta-digi-dey/recipes-devtools/tcf-agent/tcf-agent_git.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2017 Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRCREV = "5ec928ddf62b0ad936efacf2b2d8fb87cca112ac" PV = "1.5+git${SRCPV}" @@ -16,4 +16,4 @@ SRC_URI = " \ # tcf-agent falls back to '/bin/sh' if 'bash' is not available, so don't # depend on bash at runtime. -RDEPENDS_${PN}_remove = "bash" +RDEPENDS:${PN}:remove = "bash" diff --git a/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb index 836862568..8f97b6509 100644 --- a/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb +++ b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb @@ -22,7 +22,7 @@ inherit systemd update-rc.d INITSCRIPT_NAME = "auto-serial-console" INITSCRIPT_PARAMS = "start 99 5 ." -SYSTEMD_SERVICE_${PN} = "auto-getty.service" +SYSTEMD_SERVICE:${PN} = "auto-getty.service" do_install () { install -m 0755 -d ${D}${sysconfdir}/default diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index 7d24989ec..2bb792812 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -27,11 +27,11 @@ do_install() { PACKAGES =+ "${PN}-cert" -FILES_${PN}-cert = "${sysconfdir}/ssl/certs/Digi_Int-ca-cert-public.crt" +FILES:${PN}-cert = "${sysconfdir}/ssl/certs/Digi_Int-ca-cert-public.crt" -CONFFILES_${PN} += "${sysconfdir}/cc.conf" +CONFFILES:${PN} += "${sysconfdir}/cc.conf" -RDEPENDS_${PN} = "${PN}-cert" +RDEPENDS:${PN} = "${PN}-cert" # Disable extra compilation checks from SECURITY_CFLAGS to avoid build errors -lcl_maybe_fortify_pn-cloudconnector = "" +lcl_maybe_fortify:pn-cloudconnector = "" diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 1c3ee5f33..e3518bb28 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -11,10 +11,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "awsiotsdk-c confuse" AWS_USER_LED ?= "" -AWS_USER_LED_ccimx6ulstarter ?= "75" -AWS_USER_LED_ccimx6ulsbc ?= "488" -AWS_USER_LED_ccimx6sbc ?= "34" -AWS_USER_LED_ccimx6qpsbc ?= "34" +AWS_USER_LED:ccimx6ulstarter ?= "75" +AWS_USER_LED:ccimx6ulsbc ?= "488" +AWS_USER_LED:ccimx6sbc ?= "34" +AWS_USER_LED:ccimx6qpsbc ?= "34" S = "${WORKDIR}/git/awsiot-sample" @@ -38,6 +38,6 @@ do_install() { oe_runmake DESTDIR=${D} install } -RRECOMMENDS_${PN} += "awsiotsdk-c-cert" +RRECOMMENDS:${PN} += "awsiotsdk-c-cert" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cloudconnector.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cloudconnector.bb index 3076fa5bd..919f33792 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cloudconnector.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cloudconnector.bb @@ -17,4 +17,4 @@ do_install() { oe_runmake DESTDIR=${D} install } -RDEPENDS_${PN} = "cloudconnector-cert" +RDEPENDS:${PN} = "cloudconnector-cert" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-hdp.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-hdp.bb index 30ad4919c..c095b9d9a 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-hdp.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-hdp.bb @@ -14,4 +14,4 @@ do_install() { install -m 0755 hdp-test.py ${D}${bindir} } -RDEPENDS_${PN} = "python3 python3-crypt python3-dbus python3-pygobject" +RDEPENDS:${PN} = "python3 python3-crypt python3-dbus python3-pygobject" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb index d2a913243..522279e12 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb @@ -17,10 +17,10 @@ do_install () { oe_runmake DEST_DIR="${D}" install } -FILES_${PN} = "/opt/${PN}" -FILES_${PN}-dbg += "/opt/${PN}/.debug" +FILES:${PN} = "/opt/${PN}" +FILES:${PN}-dbg += "/opt/${PN}/.debug" -RDEPENDS_${PN}_ccimx6 = "libopenvg-imx" +RDEPENDS:${PN}:ccimx6 = "libopenvg-imx" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index ec957dd93..5843474e1 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -40,6 +40,6 @@ do_install() { } USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r digiapix" +GROUPADD_PARAM:${PN} = "-r digiapix" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb index 125e3aabc..a9bb35ab9 100644 --- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb +++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb @@ -7,7 +7,7 @@ DEPENDS = "virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "dey-examples-alsa", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \ @@ -22,7 +22,7 @@ RDEPENDS_${PN} = "\ dey-examples-digiapix \ dey-examples-rtc \ " -RDEPENDS_${PN}_append_ccimx6 = "\ +RDEPENDS:${PN}:append:ccimx6 = "\ ${@bb.utils.contains("MACHINE_FEATURES", "accel-graphics", "dey-examples-opengles", "", d)} \ dey-examples-v4l2 \ " diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb index 41e5b60e7..372c65a2c 100644 --- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb +++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb @@ -4,7 +4,7 @@ SUMMARY = "DEY trustfence packagegroup" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${@oe.utils.conditional('TRUSTFENCE_CONSOLE_DISABLE', '1', 'auto-serial-console', '', d)} \ " do_package[vardeps] += "TRUSTFENCE_CONSOLE_DISABLE" diff --git a/meta-digi-dey/recipes-digi/swu-images/swu.inc b/meta-digi-dey/recipes-digi/swu-images/swu.inc index 03fedaf43..7eec6bd45 100644 --- a/meta-digi-dey/recipes-digi/swu-images/swu.inc +++ b/meta-digi-dey/recipes-digi/swu-images/swu.inc @@ -18,21 +18,21 @@ SOFTWARE_VERSION ?= "0.0.1" DESCRIPTION = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', 'Encrypted rootfs ${IMG_NAME} update', '${IMG_NAME} update')}" BOOTFS_EXT ?= ".boot.vfat" -BOOTFS_EXT_ccimx6ul ?= ".boot.ubifs" -BOOTFS_EXT_ccmp1 ?= ".boot.ubifs" +BOOTFS_EXT:ccimx6ul ?= ".boot.ubifs" +BOOTFS_EXT:ccmp1 ?= ".boot.ubifs" ROOTFS_EXT ?= ".ext4.gz" -ROOTFS_EXT_ccimx6ul ?= ".ubifs" -ROOTFS_EXT_ccmp1 ?= ".ubifs" +ROOTFS_EXT:ccimx6ul ?= ".ubifs" +ROOTFS_EXT:ccmp1 ?= ".ubifs" BOOT_DEV_NAME ?= "/dev/mmcblk0p1" -BOOT_DEV_NAME_ccimx6ul ?= "linux" -BOOT_DEV_NAME_ccmp1 ?= "linux" +BOOT_DEV_NAME:ccimx6ul ?= "linux" +BOOT_DEV_NAME:ccmp1 ?= "linux" ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3" -ROOTFS_DEV_NAME_ccimx6ul ?= "rootfs" -ROOTFS_DEV_NAME_ccmp1 ?= "rootfs" +ROOTFS_DEV_NAME:ccimx6ul ?= "rootfs" +ROOTFS_DEV_NAME:ccmp1 ?= "rootfs" ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs" -ROOTFS_ENC_DEV_ccimx6ul = "${ROOTFS_DEV_NAME}" -ROOTFS_ENC_DEV_ccmp1 = "${ROOTFS_DEV_NAME}" +ROOTFS_ENC_DEV:ccimx6ul = "${ROOTFS_DEV_NAME}" +ROOTFS_ENC_DEV:ccmp1 = "${ROOTFS_DEV_NAME}" ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}" python () { @@ -40,7 +40,7 @@ python () { d.setVarFlag("SWUPDATE_IMAGES_FSTYPES", d.getVar('IMG_NAME', True), img_fstypes) } -python do_swuimage_prepend() { +python do_swuimage:prepend() { import glob if (d.getVar('TRUSTFENCE_SIGN', True) == "1"): diff --git a/meta-digi-dey/recipes-extended/byacc/byacc_%.bbappend b/meta-digi-dey/recipes-extended/byacc/byacc_%.bbappend index dc04827f9..19537d689 100644 --- a/meta-digi-dey/recipes-extended/byacc/byacc_%.bbappend +++ b/meta-digi-dey/recipes-extended/byacc/byacc_%.bbappend @@ -1,3 +1,3 @@ # Copyright 2020, Digi International Inc. -BBCLASSEXTEND_append = " nativesdk" +BBCLASSEXTEND:append = " nativesdk" diff --git a/meta-digi-dey/recipes-extended/socketcan/libsocketcan_%.bbappend b/meta-digi-dey/recipes-extended/socketcan/libsocketcan_%.bbappend index 03b53c77f..0c5befe4e 100644 --- a/meta-digi-dey/recipes-extended/socketcan/libsocketcan_%.bbappend +++ b/meta-digi-dey/recipes-extended/socketcan/libsocketcan_%.bbappend @@ -1,6 +1,6 @@ # Copyright 2019, Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRCREV = "df01f01354d7c44a07370ae27a3d20b52255830b" diff --git a/meta-digi-dey/recipes-gnome/gconf/gconf_%.bbappend b/meta-digi-dey/recipes-gnome/gconf/gconf_%.bbappend index b33c715e5..e840a6d85 100644 --- a/meta-digi-dey/recipes-gnome/gconf/gconf_%.bbappend +++ b/meta-digi-dey/recipes-gnome/gconf/gconf_%.bbappend @@ -2,4 +2,4 @@ # We don't use python3 and they take up over # 8 MiB in the filesystem, so remove them. -RDEPENDS_${PN}_remove_ccimx6ul = "python3-xml" +RDEPENDS:${PN}:remove:ccimx6ul = "python3-xml" diff --git a/meta-digi-dey/recipes-gnome/gnome/adwaita-icon-theme_%.bbappend b/meta-digi-dey/recipes-gnome/gnome/adwaita-icon-theme_%.bbappend index 519e4cedc..3e2290992 100644 --- a/meta-digi-dey/recipes-gnome/gnome/adwaita-icon-theme_%.bbappend +++ b/meta-digi-dey/recipes-gnome/gnome/adwaita-icon-theme_%.bbappend @@ -1,9 +1,9 @@ # Copyright (C) 2019 Digi International. -do_install_append() { +do_install:append() { # We don't use the scalable icons anywhere and they take up over # 1 MiB in the filesystem, so remove them. rm -f ${D}${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg } -FILES_${PN}-symbolic_remove = "${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg" +FILES:${PN}-symbolic:remove = "${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg" diff --git a/meta-digi-dey/recipes-graphics/harfbuzz/harfbuzz_%.bbappend b/meta-digi-dey/recipes-graphics/harfbuzz/harfbuzz_%.bbappend index 7428c759f..f6fb4eb88 100644 --- a/meta-digi-dey/recipes-graphics/harfbuzz/harfbuzz_%.bbappend +++ b/meta-digi-dey/recipes-graphics/harfbuzz/harfbuzz_%.bbappend @@ -6,6 +6,6 @@ # Only 'libicudata' could weight up to 25MB: # # 25M /usr/lib/libicudata.so.57.1 -PACKAGECONFIG_remove_ccimx6ul = "icu" +PACKAGECONFIG:remove:ccimx6ul = "icu" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend b/meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend index c913cf77f..6c688cc11 100644 --- a/meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend @@ -1,11 +1,11 @@ # Undo customization in meta-freescale that doesn't apply to 8DXL -PACKAGECONFIG_remove_mx8dxl = "osmesa" -DRIDRIVERS_remove_mx8dxl = "swrast" -PACKAGECONFIG_remove_mx8phantomdxl = "osmesa" -DRIDRIVERS_remove_mx8phantomdxl = "swrast" -PACKAGECONFIG_remove_mx8mnlite = "osmesa" -DRIDRIVERS_remove_mx8mnlite = "swrast" +PACKAGECONFIG:remove:mx8dxl = "osmesa" +DRIDRIVERS:remove:mx8dxl = "swrast" +PACKAGECONFIG:remove:mx8phantomdxl = "osmesa" +DRIDRIVERS:remove:mx8phantomdxl = "swrast" +PACKAGECONFIG:remove:mx8mnlite = "osmesa" +DRIDRIVERS:remove:mx8mnlite = "swrast" -do_install_append_imxgpu3d () { +do_install:append:imxgpu3d () { rm -f ${D}${includedir}/GL/glcorearb.h } diff --git a/meta-digi-dey/recipes-graphics/microwindows/microwindows_0.91.bb b/meta-digi-dey/recipes-graphics/microwindows/microwindows_0.91.bb index 8ac4aacd4..107d89922 100644 --- a/meta-digi-dey/recipes-graphics/microwindows/microwindows_0.91.bb +++ b/meta-digi-dey/recipes-graphics/microwindows/microwindows_0.91.bb @@ -11,7 +11,7 @@ SRC_URI = " \ file://0001-defconfig.patch;striplevel=2 \ " -SRC_URI_append_aarch64 = " file://0002-Arch.rules-remove-mstructure-size-boundary-8-flag.patch; " +SRC_URI:append:aarch64 = " file://0002-Arch.rules-remove-mstructure-size-boundary-8-flag.patch; " SRC_URI[md5sum] = "901e912cf3975f6460a9bb4325557645" SRC_URI[sha256sum] = "c0a8473842fc757ff4c225f82b83d98bba5da0dca0cf843cfc7792064a393435" @@ -32,4 +32,4 @@ do_install() { oe_runmake install } -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-core-x11-base.bbappend b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-core-x11-base.bbappend index cab188f6b..f0583c930 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-core-x11-base.bbappend +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-core-x11-base.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2021 Digi International -RDEPENDS_${PN}_remove_ccimx6ul = "matchbox-terminal" +RDEPENDS:${PN}:remove:ccimx6ul = "matchbox-terminal" diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb index 4a5171676..a649148ba 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb @@ -8,7 +8,7 @@ inherit packagegroup # Install Freescale QT demo applications QT5_APPS = "" -QT5_APPS_imxgpu3d = "${@bb.utils.contains("MACHINE_GSTREAMER_1_0_PLUGIN", "imx-gst1.0-plugin", "imx-qtapplications", "", d)}" +QT5_APPS:imxgpu3d = "${@bb.utils.contains("MACHINE_GSTREAMER_1_0_PLUGIN", "imx-gst1.0-plugin", "imx-qtapplications", "", d)}" # Install fonts QT5_FONTS = "ttf-dejavu-common ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-serif " @@ -24,21 +24,21 @@ QT5_RDEPENDS_common = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland qtwayland-plugins', '', d)}\ " -QT5_RDEPENDS_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','${QT5_RDEPENDS_common}', \ +QT5_RDEPENDS:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','${QT5_RDEPENDS_common}', \ 'qtbase qtbase-plugins', d)}" -QT5_RDEPENDS_imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','${QT5_RDEPENDS_common}', \ +QT5_RDEPENDS:imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','${QT5_RDEPENDS_common}', \ 'qtbase qtbase-examples qtbase-plugins qtquickcontrols2 qtquickcontrols2-qmlplugins', d)}" -QT5_RDEPENDS_imxgpu3d = " \ +QT5_RDEPENDS:imxgpu3d = " \ ${QT5_RDEPENDS_common} \ gstreamer1.0-plugins-good-qt \ " -# Add packagegroup-qt5-webengine to QT5_RDEPENDS_mx6 and comment out the line below to install qtwebengine to the rootfs. -QT5_RDEPENDS_remove = " packagegroup-qt5-webengine" +# Add packagegroup-qt5-webengine to QT5_RDEPENDS and comment out the line below to install qtwebengine to the rootfs. +QT5_RDEPENDS:remove = " packagegroup-qt5-webengine" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ liberation-fonts \ ${QT5_RDEPENDS} \ " diff --git a/meta-digi-dey/recipes-graphics/ttf-fonts/ttf-dejavu_2.%.bbappend b/meta-digi-dey/recipes-graphics/ttf-fonts/ttf-dejavu_2.%.bbappend index 440652e13..72fc6d774 100644 --- a/meta-digi-dey/recipes-graphics/ttf-fonts/ttf-dejavu_2.%.bbappend +++ b/meta-digi-dey/recipes-graphics/ttf-fonts/ttf-dejavu_2.%.bbappend @@ -2,7 +2,7 @@ # Install the ttf files into /usr/lib/fonts directory PATH_TTF_FONTS="${libdir}/fonts" -do_install_append() { +do_install:append() { if [ ! -d ${D}/${PATH_TTF_FONTS} ]; then mkdir -p ${D}/${PATH_TTF_FONTS} cp -d ${S}/* ${D}/${PATH_TTF_FONTS} @@ -10,11 +10,11 @@ do_install_append() { fi } -FILES_${PN}-sans += "${PATH_TTF_FONTS}/DejaVuSans.ttf ${PATH_TTF_FONTS}/DejaVuSans-*.ttf" -FILES_${PN}-sans-mono += "${PATH_TTF_FONTS}/DejaVuSansMono*.ttf" -FILES_${PN}-sans-condensed += "${PATH_TTF_FONTS}/DejaVuSansCondensed*.ttf" -FILES_${PN}-serif += "${PATH_TTF_FONTS}/DejaVuSerif.ttf ${PATH_TTF_FONTS}/DejaVuSerif-*.ttf" -FILES_${PN}-serif-condensed += "${PATH_TTF_FONTS}/DejaVuSerifCondensed*.ttf" -FILES_${PN}-mathtexgyre += "${PATH_TTF_FONTS}/DejaVuMathTeXGyre.ttf" +FILES:${PN}-sans += "${PATH_TTF_FONTS}/DejaVuSans.ttf ${PATH_TTF_FONTS}/DejaVuSans-*.ttf" +FILES:${PN}-sans-mono += "${PATH_TTF_FONTS}/DejaVuSansMono*.ttf" +FILES:${PN}-sans-condensed += "${PATH_TTF_FONTS}/DejaVuSansCondensed*.ttf" +FILES:${PN}-serif += "${PATH_TTF_FONTS}/DejaVuSerif.ttf ${PATH_TTF_FONTS}/DejaVuSerif-*.ttf" +FILES:${PN}-serif-condensed += "${PATH_TTF_FONTS}/DejaVuSerifCondensed*.ttf" +FILES:${PN}-mathtexgyre += "${PATH_TTF_FONTS}/DejaVuMathTeXGyre.ttf" diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bb b/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bb index 757a5361e..1fab6b946 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bb +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bb @@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = 'vulkan' inherit cmake features_check DEPENDS = "vulkan-loader assimp wayland-protocols wayland-native" -do_install_append () { +do_install:append () { mv ${D}${bindir}/screenshot ${D}${bindir}/vulkan-screenshot } diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bbappend b/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bbappend index 652ac30f2..1bcadd34d 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bbappend +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Modify-parameter-in-vulkan-demo-computenbody.patch \ diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bbappend b/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bbappend index b057f2970..0a5b7a045 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bbappend +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-STDIO-844-No-need-to-change-the-App-s-apiVersion-to-.patch" # libvulkan.so is loaded dynamically, so put it in the main package FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}" -INSANE_SKIP_${PN} += "dev-so" +FILES:${PN} += "${libdir}/lib*${SOLIBSDEV}" +INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-samples_%.bbappend b/meta-digi-dey/recipes-graphics/vulkan/vulkan-samples_%.bbappend index cfc36610b..27de9df12 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-samples_%.bbappend +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-samples_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Add-support-for-wayland.patch \ diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.2.170.0.bb b/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.2.170.0.bb index ceb60a9f6..ff888d486 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.2.170.0.bb +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.2.170.0.bb @@ -37,6 +37,6 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU SOLIBS = ".so" FILES_SOLIBSDEV = "" -RRECOMMENDS_${PN} = "mesa-vulkan-drivers" +RRECOMMENDS:${PN} = "mesa-vulkan-drivers" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.2.170.0.bbappend b/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.2.170.0.bbappend index 745a859c5..03b426ee7 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.2.170.0.bbappend +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.2.170.0.bbappend @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://icd_VSI.json \ file://0001-CMakeLists.txt-Change-the-installation-path-of-JSON-.patch \ " -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/vulkan/icd.d cp ${WORKDIR}/icd_VSI.json ${D}${sysconfdir}/vulkan/icd.d sed -i "s,/usr/lib,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/icd_VSI.json diff --git a/meta-digi-dey/recipes-graphics/waffle/waffle_%.bbappend b/meta-digi-dey/recipes-graphics/waffle/waffle_%.bbappend index 5b82b3f46..71baa53d8 100644 --- a/meta-digi-dey/recipes-graphics/waffle/waffle_%.bbappend +++ b/meta-digi-dey/recipes-graphics/waffle/waffle_%.bbappend @@ -1,5 +1,5 @@ # Append EGL_CFLAGS to CFLAGS -CFLAGS_append_imxgpu = " \ +CFLAGS:append:imxgpu = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_API_FB', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DWL_EGL_PLATFORM', '', d)} \ " diff --git a/meta-digi-dey/recipes-graphics/x11-common/xserver-nodm-init_%.bbappend b/meta-digi-dey/recipes-graphics/x11-common/xserver-nodm-init_%.bbappend index 67cae58d3..97b782048 100644 --- a/meta-digi-dey/recipes-graphics/x11-common/xserver-nodm-init_%.bbappend +++ b/meta-digi-dey/recipes-graphics/x11-common/xserver-nodm-init_%.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2018 Digi International -do_install_append() { +do_install:append() { # Redirect output to log file sed -i -e "/^exec/{s,\$\*,\$\* >/var/log/Xsession.log 2>\&1,}" ${D}${sysconfdir}/xserver-nodm/Xserver } diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend index 831546ee2..5cf66ce93 100644 --- a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend +++ b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2013 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/xinput-calibrator_%.bbappend b/meta-digi-dey/recipes-graphics/xinput-calibrator/xinput-calibrator_%.bbappend index e72383313..a3f8081a8 100644 --- a/meta-digi-dey/recipes-graphics/xinput-calibrator/xinput-calibrator_%.bbappend +++ b/meta-digi-dey/recipes-graphics/xinput-calibrator/xinput-calibrator_%.bbappend @@ -1,6 +1,6 @@ # FIXME: Here it can avoid xinput_calibrator run under background # when Desktop shows -do_install_append() { +do_install:append() { # Remove the xinput_calibrator.desktop from xdg/autostart rm -rf ${D}${sysconfdir}/xdg/autostart } diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imx/xorg.conf b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imx-nxp-bsp/xorg.conf similarity index 100% rename from meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imx/xorg.conf rename to meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imx-nxp-bsp/xorg.conf diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull/xorg.conf b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull-nxp-bsp/xorg.conf similarity index 100% rename from meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull/xorg.conf rename to meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull-nxp-bsp/xorg.conf diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend index ceb438e37..3fe677b34 100644 --- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend +++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -1,2 +1,2 @@ # Append path for freescale layer to include bsp xorg.conf -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index 50c0b45c2..e2cc73405 100644 --- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu = " \ +SRC_URI:append:imxgpu = " \ file://0009-glamor-MGS-6375-ximagesink-show-wrong-color.patch \ " diff --git a/meta-digi-dey/recipes-multimedia/alsa/alsa-lib_%.bbappend b/meta-digi-dey/recipes-multimedia/alsa/alsa-lib_%.bbappend index ee10914c9..a696b6d7c 100644 --- a/meta-digi-dey/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/meta-digi-dey/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" IMX_PATCH += " \ file://0001-pcm-plugin-status-fix-the-return-value-regression.patch \ diff --git a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb index cd23509ed..83b8bd915 100644 --- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb +++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb @@ -14,7 +14,7 @@ ALSA_UTILS_PKGS = " \ alsa-utils-speakertest \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ libasound \ alsa-state \ alsa-states \ @@ -23,4 +23,4 @@ RDEPENDS_${PN} = "\ bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server pulseaudio-misc', '', d), '', d)} \ " -RDEPENDS_${PN}_append_ccimx6 = " card-detect" +RDEPENDS:${PN}:append:ccimx6 = " card-detect" diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/imx/daemon.conf b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf similarity index 100% rename from meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/imx/daemon.conf rename to meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index fae502430..ef3ab4cdc 100644 --- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2019-2022 Digi International -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # Configuration files for SGTL500 sound card CFG_SGTL5000 = " \ @@ -21,12 +21,12 @@ CFG_HDMI = " \ file://hdmi/90-pulseaudio-hdmi.rules \ " SOUND_CARD ?= "max98089" -SOUND_CARD_ccimx6 ?= "sgtl5000" +SOUND_CARD:ccimx6 ?= "sgtl5000" AUDIO_HDMI ?= "" -AUDIO_HDMI_ccimx6 = "yes" +AUDIO_HDMI:ccimx6 = "yes" -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch \ file://0002-Revert-bluetooth-Fix-crash-when-disabling-Bluetooth-.patch \ ${@oe.utils.conditional('SOUND_CARD', 'sgtl5000', '${CFG_SGTL5000}', '', d)} \ @@ -36,32 +36,32 @@ SRC_URI_append = " \ file://pulseaudio-system.service \ " -SRC_URI_append_ccimx6ulsbc = " \ +SRC_URI:append:ccimx6ulsbc = " \ file://0001-pulseaudio-keep-headphones-volume-in-platforms-witho.patch \ " -SRC_URI_append_ccmp15 = " \ +SRC_URI:append:ccmp15 = " \ file://0001-pulseaudio-keep-headphones-volume-in-platforms-witho.patch \ " # This default setting should be added on all i.MX SoC, # For now, the setting for mx6(including mx6ul & mx6sll)/mx7 has been upstreamed -SRC_URI_append_mx8 = " \ +SRC_URI:append:mx8-nxp-bsp = " \ file://daemon.conf \ file://default.pa \ " # Enable allow-autospawn-for-root as default -PACKAGECONFIG_append = " autospawn-for-root" +PACKAGECONFIG:append = " autospawn-for-root" -EXTRA_OECONF_append_ccimx6 = " --disable-memfd" +EXTRA_OECONF:append:ccimx6 = " --disable-memfd" -FILES_${PN}-server_append = " ${systemd_unitdir}/* ${sysconfdir}/pulseaudio-init" +FILES:${PN}-server:append = " ${systemd_unitdir}/* ${sysconfdir}/pulseaudio-init" -SYSTEMD_SERVICE_${PN}-server = "pulseaudio-system.service" +SYSTEMD_SERVICE:${PN}-server = "pulseaudio-system.service" SYSTEMD_PACKAGES = "${PN}-server" -do_install_append() { +do_install:append() { install -d ${D}${datadir}/pulseaudio/alsa-mixer/profile-sets install -m 0644 ${WORKDIR}/${SOUND_CARD}/dey-audio-*.conf ${D}${datadir}/pulseaudio/alsa-mixer/profile-sets @@ -88,4 +88,4 @@ do_install_append() { PACKAGE_ARCH = "${MACHINE_ARCH}" # The card-detect binary is only necessary for the HDMI hotplug to work on the ccimx6sbc/ccimx6qpsbc -RDEPENDS_${PN}_append_ccimx6 = " card-detect" +RDEPENDS:${PN}:append:ccimx6 = " card-detect" diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/tinycompress/tinycompress_1.1.6.bb b/meta-digi-dey/recipes-multimedia/pulseaudio/tinycompress/tinycompress_1.1.6.bb index de580dfb6..ccfa94cd6 100644 --- a/meta-digi-dey/recipes-multimedia/pulseaudio/tinycompress/tinycompress_1.1.6.bb +++ b/meta-digi-dey/recipes-multimedia/pulseaudio/tinycompress/tinycompress_1.1.6.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" inherit autotools pkgconfig LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0" -DEPENDS_append = " alsa-lib" +DEPENDS:append = " alsa-lib" SRC_URI = "git://git.alsa-project.org/tinycompress.git;protocol=git;branch=master \ file://0001-tinycompress-Add-id3-decoding.patch \ diff --git a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend index e1d4f63a4..f9945620b 100644 --- a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend +++ b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2015-2021 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://qmlvideo.desktop \ @@ -24,7 +24,7 @@ do_install () { # hellogl_es2.desktop & qt5basket.desktop & qt5nesting.desktop & qt5solarsystem.desktop # as they are not supported -do_install_append_imxgpu2d () { +do_install:append:imxgpu2d () { install -m 0644 ${WORKDIR}/cinematicexperience.png ${D}/${datadir}/pixmaps install -m 0644 ${WORKDIR}/cinematicexperience.desktop ${D}/${datadir}/applications install -m 0644 ${WORKDIR}/qt5everywheredemo.png ${D}/${datadir}/pixmaps diff --git a/meta-digi-dey/recipes-qt/examples/cinematicexperience-rhi_1.0.bb b/meta-digi-dey/recipes-qt/examples/cinematicexperience-rhi_1.0.bb index 1bd9c2f37..354a33259 100644 --- a/meta-digi-dey/recipes-qt/examples/cinematicexperience-rhi_1.0.bb +++ b/meta-digi-dey/recipes-qt/examples/cinematicexperience-rhi_1.0.bb @@ -11,7 +11,7 @@ SRCREV = "5d44dd7d4fd563b33570a14c2274e7fa9cc7d84f" S = "${WORKDIR}/git" DEPENDS = "qtdeclarative qtgraphicaleffects" -RDEPENDS_${PN} = "liberation-fonts qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" +RDEPENDS:${PN} = "liberation-fonts qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" require recipes-qt/qt5/qt5.inc @@ -31,4 +31,4 @@ do_install() { chmod +x ${D}${bindir}/qt5-cinematic-experience } -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" diff --git a/meta-digi-dey/recipes-qt/examples/qt5everywheredemo_1.0.bbappend b/meta-digi-dey/recipes-qt/examples/qt5everywheredemo_1.0.bbappend index 3099ea6a0..a76d04275 100644 --- a/meta-digi-dey/recipes-qt/examples/qt5everywheredemo_1.0.bbappend +++ b/meta-digi-dey/recipes-qt/examples/qt5everywheredemo_1.0.bbappend @@ -6,10 +6,10 @@ DEPENDS += "qtmultimedia qtsvg" SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac" -do_install_append() { +do_install:append() { # New version of the example application embed all the files in the # binary itself using QRC rm -rf ${D}${datadir}/${P}/qml } -RDEPENDS_${PN} += "qtmultimedia-qmlplugins" +RDEPENDS:${PN} += "qtmultimedia-qmlplugins" diff --git a/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend b/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend index 88cee0661..4d6b0e34e 100644 --- a/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend +++ b/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2017, Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:" SRC_URI += " \ file://qtsmarthome.desktop \ @@ -8,10 +8,10 @@ SRC_URI += " \ file://0001-qtsmarthome-fix-runtime-warning.patch \ " -do_install_append() { +do_install:append() { install -d ${D}${datadir}/applications ${D}${datadir}/pixmaps install -m 0644 ${WORKDIR}/qtsmarthome.desktop ${D}${datadir}/applications install -m 0644 ${WORKDIR}/qtsmarthome.png ${D}${datadir}/pixmaps } -RDEPENDS_${PN} += "qtsvg-plugins" +RDEPENDS:${PN} += "qtsvg-plugins" diff --git a/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend index e93689ad3..9622dfc87 100644 --- a/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend +++ b/meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2017, Digi International Inc. -RDEPENDS_${PN} += "nativesdk-python3-json" +RDEPENDS:${PN} += "nativesdk-python3-json" diff --git a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-demos.bb b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-demos.bb index 15d44e01f..dcfc6676f 100644 --- a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-demos.bb +++ b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-demos.bb @@ -7,12 +7,12 @@ LICENSE = "MIT" inherit packagegroup -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ qtserialport \ " # Install the following apps on SoC with GPU -RDEPENDS_${PN}_append_imxgpu = " \ +RDEPENDS:${PN}:append:imxgpu = " \ qtbase-examples \ qtdeclarative-examples \ quitindicators \ diff --git a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend index 4872ac253..2c888ee9a 100644 --- a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend +++ b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend @@ -1,5 +1,5 @@ -RDEPENDS_${PN}_remove = "qtquick1-dev \ +RDEPENDS:${PN}:remove = "qtquick1-dev \ qtquick1-mkspecs \ qtquick1-plugins \ qtquick1-qmlplugins \ @@ -12,6 +12,6 @@ RDEPENDS_${PN}_remove = "qtquick1-dev \ qt3d-qmlplugins \ " -RDEPENDS_${PN}_append_imxgpu = " \ +RDEPENDS:${PN}:append:imxgpu = " \ qtdeclarative-tools \ " diff --git a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-webengine.bb b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-webengine.bb index 70658a4fb..aa9d60b2e 100644 --- a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-webengine.bb +++ b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-webengine.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" inherit packagegroup -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtwebengine \ qtwebengine-qmlplugins \ qtquickcontrols-qmlplugins \ diff --git a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_%.bbappend b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_%.bbappend index 67ee15d20..4a0a2d0b6 100644 --- a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_%.bbappend +++ b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_%.bbappend @@ -1,3 +1,3 @@ # Copyright (C) 2014 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend b/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend index b045dcec1..36fed946d 100644 --- a/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend +++ b/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend @@ -3,13 +3,13 @@ # Disable network manager NETWORK_MANAGER = "" -RDEPENDS_${PN}-apps_remove_ccimx6ul = "gst-player" +RDEPENDS:${PN}-apps:remove:ccimx6ul = "gst-player" matchbox-base = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', ' \ matchbox-desktop matchbox-session-sato matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im matchbox-config-gtk', '', d)}" matchbox-apps = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'matchbox-terminal', '', d)}" -RDEPENDS_${PN}-base_remove = "${matchbox-base}" -RDEPENDS_${PN}-apps_remove = "${matchbox-apps} \ +RDEPENDS:${PN}-base:remove = "${matchbox-base}" +RDEPENDS:${PN}-apps:remove = "${matchbox-apps} \ gst-player-bin \ " diff --git a/meta-digi-dey/recipes-support/curl/curl_%.bbappend b/meta-digi-dey/recipes-support/curl/curl_%.bbappend index f6826841b..a36b0ae61 100644 --- a/meta-digi-dey/recipes-support/curl/curl_%.bbappend +++ b/meta-digi-dey/recipes-support/curl/curl_%.bbappend @@ -1,5 +1,5 @@ # Copyright (C) 2017, 2018 Digi International Inc. # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG_remove_class-target = "threaded-resolver" -PACKAGECONFIG_append_class-target = " ares" +PACKAGECONFIG:remove:class-target = "threaded-resolver" +PACKAGECONFIG:append:class-target = " ares" diff --git a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend index 9327c8869..be2269f60 100644 --- a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend +++ b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend @@ -1,7 +1,7 @@ # Copyright (C) 2017, Digi International Inc. # Enable DBUS support so it can be used from NetworkManager -PACKAGECONFIG_append = " dbus" +PACKAGECONFIG:append = " dbus" # NetworkManager will launch 'dnsmasq' using DBUS, so disable the creation # of runlevel's symlinks and disable its systemd service. diff --git a/meta-digi-dey/recipes-support/freerdp/freerdp_2.3.0.bbappend b/meta-digi-dey/recipes-support/freerdp/freerdp_2.3.0.bbappend index 4c662e062..0a9f58b44 100644 --- a/meta-digi-dey/recipes-support/freerdp/freerdp_2.3.0.bbappend +++ b/meta-digi-dey/recipes-support/freerdp/freerdp_2.3.0.bbappend @@ -2,7 +2,7 @@ # In sysvinit builds, cups pulls in procps as a dependency, which causes # conflicts when building the SDK, so remove it -PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'cups', '', d)}" +PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'cups', '', d)}" # cups pulls in libusb1 as a dependency, but libusb1 is also needed implicitly # by a different freerdp component. Removing cups from PACKAGECONFIG will diff --git a/meta-digi-dey/recipes-support/libical/libical_%.bbappend b/meta-digi-dey/recipes-support/libical/libical_%.bbappend index 9d81de0e0..c74c9d831 100644 --- a/meta-digi-dey/recipes-support/libical/libical_%.bbappend +++ b/meta-digi-dey/recipes-support/libical/libical_%.bbappend @@ -6,6 +6,6 @@ # Only 'libicudata' could weight up to 25MB: # # 25M /usr/lib/libicudata.so.57.1 -PACKAGECONFIG_remove_ccimx6ul = "icu" +PACKAGECONFIG:remove:ccimx6ul = "icu" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bb b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bb index fdd67205c..cfd9da124 100644 --- a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bb +++ b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bb @@ -29,10 +29,10 @@ PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-n PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" -RDEPENDS_${PN} = "libgcc" -RDEPENDS_${PYTHON_PN}-libsoc = "${PN} ${PYTHON_PN}-ctypes" +RDEPENDS:${PN} = "libgcc" +RDEPENDS:${PYTHON_PN}-libsoc = "${PN} ${PYTHON_PN}-ctypes" -FILES_${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" -FILES_${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" +FILES:${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" DEFAULT_PREFERENCE = "-1" diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend index 8c158739a..af4dd5459 100644 --- a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend +++ b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2017 Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" LIBSOC_URI_STASH = "${DIGI_MTK_GIT}/dey/libsoc.git;protocol=ssh" LIBSOC_URI_GITHUB = "git://github.com/jackmitch/libsoc.git;protocol=https" diff --git a/meta-digi-dey/recipes-support/lvm2/libdevmapper_%s.bbappend b/meta-digi-dey/recipes-support/lvm2/libdevmapper_%s.bbappend index 7bdc22e99..3a721eeba 100644 --- a/meta-digi-dey/recipes-support/lvm2/libdevmapper_%s.bbappend +++ b/meta-digi-dey/recipes-support/lvm2/libdevmapper_%s.bbappend @@ -2,4 +2,4 @@ # Copyright (C) 2019 Digi International. # -RRECOMMENDS_${PN}_remove_class-target = " lvm2-udevrules" +RRECOMMENDS:${PN}:remove:class-target = " lvm2-udevrules" diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate_2021.11.bbappend b/meta-digi-dey/recipes-support/swupdate/swupdate_2021.11.bbappend index 4008e2d04..baa0e7bfd 100644 --- a/meta-digi-dey/recipes-support/swupdate/swupdate_2021.11.bbappend +++ b/meta-digi-dey/recipes-support/swupdate/swupdate_2021.11.bbappend @@ -1,16 +1,16 @@ # Copyright (C) 2016-2022 Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # Without libgcc, swupdate generates an error signal when terminating -RDEPENDS_${PN} += "libgcc" +RDEPENDS:${PN} += "libgcc" SRC_URI += " \ file://0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch \ file://0002-config-add-on-the-fly-build-configuration-variable.patch \ " -do_configure_append() { +do_configure:append() { # If Trustfence is enabled, enable the signing support in the # '.config' file. if [ "${TRUSTFENCE_SIGN}" = "1" ]; then @@ -19,7 +19,7 @@ do_configure_append() { cml1_do_configure } -do_install_append() { +do_install:append() { # Copy the 'progress' binary. install -d ${D}${bindir}/ install -m 0755 tools/swupdate-progress ${D}${bindir}/progress