From dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 2 Aug 2021 17:10:51 -0400 Subject: Convert to new override syntax This is mostly the result of running a slightly customized version of the convert-overrides.py script from poky with additional overrides added. A few minor fixups were done by hand afterwards during a review of the changes. The intent of these changes is to minimize the effort to keep the "next" branch that builds against poky master up to date and tested in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4052 Signed-off-by: Scott Murray Change-Id: Ia3bf63b7cb1aa1d95ada373d1a3ab56def0a125d Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26564 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_bbe.inc | 22 +++++++-------- meta-agl-bsp/conf/include/agl_beaglebone.inc | 22 +++++++-------- meta-agl-bsp/conf/include/agl_cubox-i.inc | 2 +- meta-agl-bsp/conf/include/agl_cyclone5.inc | 2 +- meta-agl-bsp/conf/include/agl_dragonboard-410c.inc | 2 +- meta-agl-bsp/conf/include/agl_dragonboard-820c.inc | 2 +- meta-agl-bsp/conf/include/agl_ebisu.inc | 8 +++--- meta-agl-bsp/conf/include/agl_h3-salvator-x.inc | 2 +- meta-agl-bsp/conf/include/agl_hsdk.inc | 8 +++--- meta-agl-bsp/conf/include/agl_imx-common.inc | 2 +- meta-agl-bsp/conf/include/agl_imx6-common.inc | 4 +-- meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc | 6 ++-- meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc | 2 +- meta-agl-bsp/conf/include/agl_imx8mqevk.inc | 4 +-- meta-agl-bsp/conf/include/agl_j7-evm.inc | 2 +- meta-agl-bsp/conf/include/agl_m3-salvator-x.inc | 2 +- meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 4 +-- meta-agl-bsp/conf/include/agl_m3ulcb.inc | 4 +-- meta-agl-bsp/conf/include/agl_qemuarm.inc | 12 ++++---- meta-agl-bsp/conf/include/agl_qemuarm64.inc | 12 ++++---- meta-agl-bsp/conf/include/agl_qemuriscv64.inc | 4 +-- meta-agl-bsp/conf/include/agl_qemux86-64.inc | 12 ++++---- meta-agl-bsp/conf/include/agl_raspberrypi4.inc | 16 +++++------ meta-agl-bsp/conf/include/agl_rcar-nogfx.inc | 32 +++++++++++----------- meta-agl-bsp/conf/include/agl_rcar.inc | 14 +++++----- meta-agl-bsp/conf/include/agl_refhw-h3.inc | 8 +++--- meta-agl-bsp/conf/include/agl_virtio-aarch64.inc | 4 +-- meta-agl-bsp/conf/machine/include/virtio.inc | 4 +-- 28 files changed, 109 insertions(+), 109 deletions(-) (limited to 'meta-agl-bsp/conf') diff --git a/meta-agl-bsp/conf/include/agl_bbe.inc b/meta-agl-bsp/conf/include/agl_bbe.inc index 5c28bea20..9f9eb5039 100644 --- a/meta-agl-bsp/conf/include/agl_bbe.inc +++ b/meta-agl-bsp/conf/include/agl_bbe.inc @@ -9,14 +9,14 @@ CORE_IMAGE_EXTRA_INSTALL += "packagegroup-machine-base" ## Graphics section ## #------------------------------------------------- PACKAGES_GFX = "ti-sgx-ddk-km" -IMAGE_INSTALL_append = " ${PACKAGES_GFX}" +IMAGE_INSTALL:append = " ${PACKAGES_GFX}" # Enable Gfx Pkgs -MACHINE_FEATURES_append = " sgx" +MACHINE_FEATURES:append = " sgx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" -DEPENDS_remove = "virtual/libgl" +DEPENDS:remove = "virtual/libgl" # Preferred providers PREFERRED_PROVIDER_virtual/libgles1 = "" @@ -30,11 +30,11 @@ PREFERRED_PROVIDER_virtual/mesa = "mesa-gl" #------------------------------------------------- # DEFAULTTUNE for cortex-a8 -DISTRO_FEATURES_append = " agl-medium-arm-compiler" - -SECURITY_CFLAGS_pn-mozjs = "" -SECURITY_LDFLAGS_pn-mozjs = "" -SECURITY_CFLAGS_pn-gpm = "" -SECURITY_LDFLAGS_pn-gpm = "" -SECURITY_CFLAGS_pn-libatasmart = "" -SECURITY_LDFLAGS_pn-libatasmart = "" +DISTRO_FEATURES:append = " agl-medium-arm-compiler" + +SECURITY_CFLAGS:pn-mozjs = "" +SECURITY_LDFLAGS:pn-mozjs = "" +SECURITY_CFLAGS:pn-gpm = "" +SECURITY_LDFLAGS:pn-gpm = "" +SECURITY_CFLAGS:pn-libatasmart = "" +SECURITY_LDFLAGS:pn-libatasmart = "" diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc index cfd189df3..857a801f3 100644 --- a/meta-agl-bsp/conf/include/agl_beaglebone.inc +++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc @@ -4,14 +4,14 @@ ## Graphics section ## #------------------------------------------------- PACKAGES_GFX = "ti-sgx-ddk-km" -IMAGE_INSTALL_append = " ${PACKAGES_GFX}" +IMAGE_INSTALL:append = " ${PACKAGES_GFX}" # Enable Gfx Pkgs -MACHINE_FEATURES_append = " sgx" +MACHINE_FEATURES:append = " sgx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" -DEPENDS_remove = "virtual/libgl" +DEPENDS:remove = "virtual/libgl" # Preferred providers PREFERRED_PROVIDER_virtual/libgles1 = "" @@ -28,13 +28,13 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" PREFERRED_VERSION_virtual/kernel = "4.9" # DEFAULTTUNE for cortex-a8 -DISTRO_FEATURES_append = " agl-medium-arm-compiler" - -SECURITY_CFLAGS_pn-mozjs = "" -SECURITY_LDFLAGS_pn-mozjs = "" -SECURITY_CFLAGS_pn-gpm = "" -SECURITY_LDFLAGS_pn-gpm = "" -SECURITY_CFLAGS_pn-libatasmart = "" -SECURITY_LDFLAGS_pn-libatasmart = "" +DISTRO_FEATURES:append = " agl-medium-arm-compiler" + +SECURITY_CFLAGS:pn-mozjs = "" +SECURITY_LDFLAGS:pn-mozjs = "" +SECURITY_CFLAGS:pn-gpm = "" +SECURITY_LDFLAGS:pn-gpm = "" +SECURITY_CFLAGS:pn-libatasmart = "" +SECURITY_LDFLAGS:pn-libatasmart = "" WKS_FILE = "sdimage-bootpart-uuid.wks" diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc index c3ba5fc17..4fa4815a4 100644 --- a/meta-agl-bsp/conf/include/agl_cubox-i.inc +++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc @@ -1,7 +1,7 @@ require agl_imx6-common.inc # Include devicetrees for SOM 1.5 and Hummingboard 2 hardware -KERNEL_DEVICETREE_append = " \ +KERNEL_DEVICETREE:append = " \ imx6dl-hummingboard-som-v15.dtb \ imx6q-hummingboard-som-v15.dtb \ imx6dl-hummingboard2.dtb \ diff --git a/meta-agl-bsp/conf/include/agl_cyclone5.inc b/meta-agl-bsp/conf/include/agl_cyclone5.inc index 7ebd4090c..3f12a2a92 100644 --- a/meta-agl-bsp/conf/include/agl_cyclone5.inc +++ b/meta-agl-bsp/conf/include/agl_cyclone5.inc @@ -1,7 +1,7 @@ OSTREE_BOOTLOADER ?= "u-boot" # DEFAULTTUNE for cortex-a9 -DISTRO_FEATURES_append = " agl-medium-arm-compiler" +DISTRO_FEATURES:append = " agl-medium-arm-compiler" # Use the AGL default ext4.xz to generate the rpi-sdimg SDIMG_ROOTFS_TYPE = "ext4.xz" diff --git a/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc b/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc index f66265369..aba92ddf1 100644 --- a/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc +++ b/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc @@ -1,3 +1,3 @@ # Install 96boards-tools for resizing partition # Add systemd unit file for the qcom_q6v5_pil kernel module -IMAGE_INSTALL_append = " 96boards-tools q6v5-pil" +IMAGE_INSTALL:append = " 96boards-tools q6v5-pil" diff --git a/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc b/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc index f74d703fa..265564c18 100644 --- a/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc +++ b/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc @@ -1,2 +1,2 @@ # Install 96boards-tools for resizing partition -IMAGE_INSTALL_append = " 96boards-tools" +IMAGE_INSTALL:append = " 96boards-tools" diff --git a/meta-agl-bsp/conf/include/agl_ebisu.inc b/meta-agl-bsp/conf/include/agl_ebisu.inc index 2ac93adf0..0d10b3130 100644 --- a/meta-agl-bsp/conf/include/agl_ebisu.inc +++ b/meta-agl-bsp/conf/include/agl_ebisu.inc @@ -4,10 +4,10 @@ BOARD_NAME = "ebisu" DTB_SUFFIX = "r8a77990-ebisu" -DISTRO_FEATURES_remove = " use_eva_pkg" +DISTRO_FEATURES:remove = " use_eva_pkg" # Configuration for USB 3.0 -MACHINE_FEATURES_append = " usb3" +MACHINE_FEATURES:append = " usb3" -IMAGE_INSTALL_append = " gstreamer1.0-omx gstreamer1.0-plugin-vspfilter" -IMAGE_INSTALL_append = " kernel-module-mmngr kernel-module-mmngrbuf kernel-module-uvcs-drv kernel-module-vspmif" +IMAGE_INSTALL:append = " gstreamer1.0-omx gstreamer1.0-plugin-vspfilter" +IMAGE_INSTALL:append = " kernel-module-mmngr kernel-module-mmngrbuf kernel-module-uvcs-drv kernel-module-vspmif" diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc index d338a5663..48a282133 100644 --- a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc +++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc @@ -4,6 +4,6 @@ BOARD_NAME = "h3-salvator-x" DTB_SUFFIX = "r8a7795-salvator-xs" -IMAGE_INSTALL_append_rcar-gen3 = " \ +IMAGE_INSTALL:append:rcar-gen3 = " \ kernel-module-vspmif \ " diff --git a/meta-agl-bsp/conf/include/agl_hsdk.inc b/meta-agl-bsp/conf/include/agl_hsdk.inc index 825d5f074..b1b0e4a8f 100644 --- a/meta-agl-bsp/conf/include/agl_hsdk.inc +++ b/meta-agl-bsp/conf/include/agl_hsdk.inc @@ -1,9 +1,9 @@ KERNEL_IMAGETYPE = "uImage" WKS_FILE = "sdimage-hsdk.wks" IMAGE_BOOT_FILES = "uImage uboot.env" -IMAGE_INSTALL_append = " kernel-modules" +IMAGE_INSTALL:append = " kernel-modules" # remove incompatible packages from packagegroups -RDEPENDS_packagegroup-agl-core-devel_remove_hsdk = "valgrind gcc-sanitizers" -RDEPENDS_packagegroup-core-tools-profile_remove_hsdk = "systemtap" -RDEPENDS_packagegroup-core-tools-debug_remove_hsdk = "gdbserver" +RDEPENDS:packagegroup-agl-core-devel:remove:hsdk = "valgrind gcc-sanitizers" +RDEPENDS:packagegroup-core-tools-profile:remove:hsdk = "systemtap" +RDEPENDS:packagegroup-core-tools-debug:remove:hsdk = "gdbserver" diff --git a/meta-agl-bsp/conf/include/agl_imx-common.inc b/meta-agl-bsp/conf/include/agl_imx-common.inc index f6cc567e8..b58a99589 100644 --- a/meta-agl-bsp/conf/include/agl_imx-common.inc +++ b/meta-agl-bsp/conf/include/agl_imx-common.inc @@ -1,6 +1,6 @@ # Disable meta-freescale package architecure mangling, as it causes # issues with AGL's explicit setting of DEFAULTTUNE. -INHERIT_remove = "fsl-dynamic-packagearch" +INHERIT:remove = "fsl-dynamic-packagearch" MACHINE_SOCARCH = "${TUNE_PKGARCH}" # Disable the meta-freescale weston-init bbappend as it conflicts diff --git a/meta-agl-bsp/conf/include/agl_imx6-common.inc b/meta-agl-bsp/conf/include/agl_imx6-common.inc index 1ba2bce63..7b22282dd 100644 --- a/meta-agl-bsp/conf/include/agl_imx6-common.inc +++ b/meta-agl-bsp/conf/include/agl_imx6-common.inc @@ -1,6 +1,6 @@ require agl_imx-common.inc -DISTRO_FEATURES_append = " agl-medium-arm-compiler" +DISTRO_FEATURES:append = " agl-medium-arm-compiler" # This disables the Freescale/NXP Vivante GPU driver and enables # etnaviv support. This is the default for the i.MX6 platforms in @@ -9,6 +9,6 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler" IMX_DEFAULT_BSP = "mainline" # Set CMA size large enough to work with AGL -UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M" +UBOOT_EXTLINUX_KERNEL_ARGS:append = " cma=512M" AGL_DEFAULT_INITRAMFS_FSTYPES := "" diff --git a/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc b/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc index 3640ec2ff..f3c4a736e 100644 --- a/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc +++ b/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc @@ -2,12 +2,12 @@ require agl_imx-common.inc # Force use of the community supported LTS kernel instead of the # default linux-imx -IMX_DEFAULT_KERNEL_imx8mqevk = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:imx8mqevk = "linux-fslc-imx" # For EVKB wifi support -MACHINE_FEATURES_append = " bcm4356" +MACHINE_FEATURES:append = " bcm4356" # Add helper to drive setting up HCI UART device -MACHINE_EXTRA_RRECOMMENDS_append = " hci-uart-helper" +MACHINE_EXTRA_RRECOMMENDS:append = " hci-uart-helper" AGL_DEFAULT_INITRAMFS_FSTYPES := "" diff --git a/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc b/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc index 8227f5c06..2cc08df64 100644 --- a/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc +++ b/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc @@ -1 +1 @@ -include agl_imx8mqevk-common.inc +include agl:imx8mqevk-common.inc diff --git a/meta-agl-bsp/conf/include/agl_imx8mqevk.inc b/meta-agl-bsp/conf/include/agl_imx8mqevk.inc index e5e1ae7c1..ce9d8037a 100644 --- a/meta-agl-bsp/conf/include/agl_imx8mqevk.inc +++ b/meta-agl-bsp/conf/include/agl_imx8mqevk.inc @@ -1,4 +1,4 @@ -include agl_imx8mqevk-common.inc +include agl:imx8mqevk-common.inc # NOTE: currently not using IMX_DEFAULT_BSP = "mainline", as it # requires more changes than this approach of disabling @@ -9,7 +9,7 @@ include agl_imx8mqevk-common.inc MACHINEOVERRIDES .= ":etnaviv" # Knock out Vivante overrides -MACHINEOVERRIDES_EXTENDER_mx8mq_forcevariable = "" +MACHINEOVERRIDES_EXTENDER:mx8mq:forcevariable = "" PREFERRED_VERSION_weston_mx8 = "8.0.0" PREFERRED_VERSION_wayland-protocols_mx8 = "1.20" PREFERRED_VERSION_libdrm_mx8 = "2.4.101" diff --git a/meta-agl-bsp/conf/include/agl_j7-evm.inc b/meta-agl-bsp/conf/include/agl_j7-evm.inc index d6f3c6d31..b394aa5ee 100644 --- a/meta-agl-bsp/conf/include/agl_j7-evm.inc +++ b/meta-agl-bsp/conf/include/agl_j7-evm.inc @@ -12,4 +12,4 @@ TMPDIR_k3r5 = "${TOPDIR}/tmp-${BB_CURRENT_MC}" DEPLOY_DIR_k3r5 = "${TOPDIR}/tmp/deploy" # Workaround for recipe assumption of poky location -LIC_FILES_CHKSUM_pn-ti-rtos-firmware = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" +LIC_FILES_CHKSUM:pn-ti-rtos-firmware = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" diff --git a/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc index 5dcb5373d..b332c4b81 100644 --- a/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc +++ b/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc @@ -4,6 +4,6 @@ BOARD_NAME = "m3-salvator-x" DTB_SUFFIX = "r8a7796-salvator-xs" -IMAGE_INSTALL_append_rcar-gen3 = " \ +IMAGE_INSTALL:append:rcar-gen3 = " \ kernel-module-vspmif \ " diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index 48fe12eaf..f319e97de 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -9,8 +9,8 @@ BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK += "kernel-module-uvcs-drv|omx-user-module" -DISTRO_FEATURES_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" -IMAGE_INSTALL_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}" +DISTRO_FEATURES:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" +IMAGE_INSTALL:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}" # Workaround for SPEC-3706 - versioned bbappends and upstream moved on to 1.16.3 BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-.*1.16.2\.bbappend" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index b845e8c3c..652a61126 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -4,5 +4,5 @@ BOARD_NAME = "m3ulcb" DTB_SUFFIX = "r8a7796-m3ulcb" -DISTRO_FEATURES_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" -IMAGE_INSTALL_append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}" \ No newline at end of file +DISTRO_FEATURES:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" +IMAGE_INSTALL:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}" \ No newline at end of file diff --git a/meta-agl-bsp/conf/include/agl_qemuarm.inc b/meta-agl-bsp/conf/include/agl_qemuarm.inc index 0c058c801..f45b2d445 100644 --- a/meta-agl-bsp/conf/include/agl_qemuarm.inc +++ b/meta-agl-bsp/conf/include/agl_qemuarm.inc @@ -1,5 +1,5 @@ # Build updatable image. Only takes effect when sota.bbclass is inherited -#DISTRO_FEATURES_append = " sota" +#DISTRO_FEATURES:append = " sota" # Root device ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" @@ -8,10 +8,10 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" WKS_FILE="directdisk.wks.in" # Over-ride setting in oe-core's qemuboot.bbclass -QB_MEM_qemuarm = "-m 2048" +QB_MEM:qemuarm = "-m 2048" # Changes to make runqemu work out-of-the-box -QB_AUDIO_DRV_qemuarm := "alsa" -QB_MACHINE_qemuarm := "-machine virt-2.11 -smp 4" -QB_OPT_APPEND_qemuarm := "-show-cursor -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -QB_KERNEL_CMDLINE_APPEND_qemuarm := "console=ttyAMA0 verbose vmalloc=256M" +QB_AUDIO_DRV:qemuarm := "alsa" +QB_MACHINE:qemuarm := "-machine virt-2.11 -smp 4" +QB_OPT_APPEND:qemuarm := "-show-cursor -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" +QB_KERNEL_CMDLINE_APPEND:qemuarm := "console=ttyAMA0 verbose vmalloc=256M" diff --git a/meta-agl-bsp/conf/include/agl_qemuarm64.inc b/meta-agl-bsp/conf/include/agl_qemuarm64.inc index 58e1812fc..089c4f261 100644 --- a/meta-agl-bsp/conf/include/agl_qemuarm64.inc +++ b/meta-agl-bsp/conf/include/agl_qemuarm64.inc @@ -1,5 +1,5 @@ # Build updatable image. Only takes effect when sota.bbclass is inherited -#DISTRO_FEATURES_append = " sota" +#DISTRO_FEATURES:append = " sota" # Root device ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" @@ -8,10 +8,10 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" WKS_FILE="directdisk.wks.in" # Over-ride setting in oe-core's qemuboot.bbclass -QB_MEM_qemuarm64 = "-m 2048" +QB_MEM:qemuarm64 = "-m 2048" # Changes to make runqemu work out-of-the-box -QB_AUDIO_DRV_qemuarm64 := "alsa" -QB_MACHINE_qemuarm64 := "-machine virt -smp 4" -QB_OPT_APPEND_qemuarm64 := " -show-cursor -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -QB_KERNEL_CMDLINE_APPEND_qemuarm64 := "console=ttyAMA0,115200n8 verbose" \ No newline at end of file +QB_AUDIO_DRV:qemuarm64 := "alsa" +QB_MACHINE:qemuarm64 := "-machine virt -smp 4" +QB_OPT_APPEND:qemuarm64 := " -show-cursor -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" +QB_KERNEL_CMDLINE_APPEND:qemuarm64 := "console=ttyAMA0,115200n8 verbose" \ No newline at end of file diff --git a/meta-agl-bsp/conf/include/agl_qemuriscv64.inc b/meta-agl-bsp/conf/include/agl_qemuriscv64.inc index a7353898b..1ffc3cf0e 100644 --- a/meta-agl-bsp/conf/include/agl_qemuriscv64.inc +++ b/meta-agl-bsp/conf/include/agl_qemuriscv64.inc @@ -1,11 +1,11 @@ # Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES_append = " sota" +DISTRO_FEATURES:append = " sota" # Root device ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" # Over-ride setting in oe-core's qemuriscv64.conf -QB_MEM_qemuriscv64 = "-m 2048" +QB_MEM:qemuriscv64 = "-m 2048" # Use our own wks file WKS_FILE="directdisk.wks.in" diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc index 81310001e..638778b81 100644 --- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -12,17 +12,17 @@ UVESA_MODE = "1280x1024-32" # kernel command line. # # Configuration for serial console -QB_KERNEL_CMDLINE_APPEND_append = " console=ttyS0,115200n8" +QB_KERNEL_CMDLINE_APPEND:append = " console=ttyS0,115200n8" # # All boot message will be off -QB_KERNEL_CMDLINE_APPEND_append = " quiet" +QB_KERNEL_CMDLINE_APPEND:append = " quiet" # Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES_append = " sota" +DISTRO_FEATURES:append = " sota" # Add firmware required by Up^2 board and default Intel mPCIe wifi card # sold by upshop.org -MACHINE_EXTRA_RRECOMMENDS_append = " \ +MACHINE_EXTRA_RRECOMMENDS:append = " \ linux-firmware-i915 \ linux-firmware-rtl8168 \ linux-firmware-ibt-hw-37-8 \ @@ -35,13 +35,13 @@ MACHINE_EXTRA_RRECOMMENDS_append = " \ # AGL_DEFAULT_IMAGE_FSTYPES to not include them, but for Intel # we actually do want them for use on physical hardware. AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'wic.vmdk.xz', 'wic.vmdk', d)}" -IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom" +IMAGE_BOOT_FILES:sota = "u-boot-qemux86-64.rom" # Root device ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" # Force the virtio video device as 'vmware' doesn't always work -QB_OPT_APPEND_append = " -vga virtio" +QB_OPT_APPEND:append = " -vga virtio" # DRM device weston/compositor systemd unit should depend upon WESTON_DRM_DEVICE = "dev-dri-card0.device" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc index e590cb2f9..09cdfa7c1 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc @@ -2,7 +2,7 @@ GPU_MEM = "256" # Add CMA to the kernel arguments for SOTA -OSTREE_KERNEL_ARGS_sota_append = " cma=256M" +OSTREE_KERNEL_ARGS:sota:append = " cma=256M" # use u-boot always RPI_USE_U_BOOT = "1" @@ -13,23 +13,23 @@ ENABLE_UART ?= "1" # For libomxil #LICENSE_FLAGS_WHITELIST = "commercial" -IMAGE_INSTALL_append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb " +IMAGE_INSTALL:append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb " # Psplash causes crash on first boot on RPi -IMAGE_FEATURES_remove = "splash" +IMAGE_FEATURES:remove = "splash" # Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES_append = " sota" +DISTRO_FEATURES:append = " sota" # Add xen build, if the xen feature activated -DISTRO_FEATURES_append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" +DISTRO_FEATURES:append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" # add xen-tools to build -IMAGE_INSTALL_append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', 'xen-tools xen-mkimage-rpi4', '', d)}" +IMAGE_INSTALL:append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', 'xen-tools xen-mkimage-rpi4', '', d)}" # Add xen-raspberry binary to boot files -IMAGE_BOOT_FILES_append = " ${@bb.utils.contains('AGL_XEN_WANTED','1', 'xen-${MACHINE}', '',d)}" +IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('AGL_XEN_WANTED','1', 'xen-${MACHINE}', '',d)}" PREFERRED_VERSION_u-boot = "2020.10" PREFERRED_VERSION_u-boot-tools = "2020.10" -UBOOT_MACHINE_rpi = "rpi_arm64_config" +UBOOT_MACHINE:rpi = "rpi_arm64_config" diff --git a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc index a9deefe61..f3548b8ab 100644 --- a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc @@ -1,14 +1,14 @@ -DISTRO_FEATURES_append = " sota" +DISTRO_FEATURES:append = " sota" OSTREE_KERNEL = "Image" -IMAGE_BOOT_FILES_sota = "renesas-ota-bootfiles/* ${DTB_SUFFIX}.dtb" +IMAGE_BOOT_FILES:sota = "renesas-ota-bootfiles/* ${DTB_SUFFIX}.dtb" OSTREE_BOOTLOADER ?= "u-boot" WKS_FILE = "singlepart-noloader.wks" RENESAS_DATADIR = "/usr" -IMAGE_INSTALL_append_rcar-gen3 = " \ +IMAGE_INSTALL:append:rcar-gen3 = " \ kernel-devicetree \ " @@ -28,16 +28,16 @@ IMAGE_INSTALL_append_rcar-gen3 = " \ # to the recipes in the BSP, or removed if the recipes are changed to # shift the module headers and symbols to their dev packages. # -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-avb-mch = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-avb-mse = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-avb-streaming = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-scu-src = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-ssp = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-tddmac = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-tsif = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-mmngr = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-mmngrbuf = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-qos = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-vsp2driver = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-vspmif = ",${KERNELSRC}" -PSEUDO_IGNORE_PATHS_append_pn-kernel-module-vspm = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-avb-mch = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-avb-mse = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-avb-streaming = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-scu-src = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-ssp = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-tddmac = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-tsif = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-mmngr = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-mmngrbuf = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-qos = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-vsp2driver = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-vspmif = ",${KERNELSRC}" +PSEUDO_IGNORE_PATHS:append:pn-kernel-module-vspm = ",${KERNELSRC}" diff --git a/meta-agl-bsp/conf/include/agl_rcar.inc b/meta-agl-bsp/conf/include/agl_rcar.inc index 1fd563960..6dc40dcb5 100644 --- a/meta-agl-bsp/conf/include/agl_rcar.inc +++ b/meta-agl-bsp/conf/include/agl_rcar.inc @@ -1,10 +1,10 @@ require conf/include/agl_rcar-nogfx.inc # Enable AGL virtualization features -MACHINE_FEATURES_append = " agl-egvirt" +MACHINE_FEATURES:append = " agl-egvirt" # Enable Gfx Pkgs -MACHINE_FEATURES_append = " gsx" +MACHINE_FEATURES:append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" # for Wayland/Weston @@ -22,12 +22,12 @@ PREFERRED_PROVIDER_virtual/libomxil = "omx-user-module" # Add for gstreamer plugins ugly LICENSE_FLAGS_WHITELIST = "commercial" -MACHINE_FEATURES_append = " multimedia" +MACHINE_FEATURES:append = " multimedia" -DISTRO_FEATURES_append = " use_eva_pkg" +DISTRO_FEATURES:append = " use_eva_pkg" -#DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib" -DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw" +#DISTRO_FEATURES:append = " h265dec_lib mpeg2dec_lib" +DISTRO_FEATURES:append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw" # Mask out meta-renesas-rcar-gen3's tweaks to weston-init, as they do # not seem necessary for anything in AGL, and the addition of @@ -42,7 +42,7 @@ BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend" # Add graphics and decoder drivers to packagegroup-machine-base # recommendation. -MACHINE_EXTRA_RRECOMMENDS_append_rcar-gen3 = " \ +MACHINE_EXTRA_RRECOMMENDS:append:rcar-gen3 = " \ kernel-module-pvrsrvkm \ kernel-module-vsp2 \ kernel-module-vspm \ diff --git a/meta-agl-bsp/conf/include/agl_refhw-h3.inc b/meta-agl-bsp/conf/include/agl_refhw-h3.inc index 96e726921..7c2c56668 100644 --- a/meta-agl-bsp/conf/include/agl_refhw-h3.inc +++ b/meta-agl-bsp/conf/include/agl_refhw-h3.inc @@ -1,9 +1,9 @@ -AGL_FEATURES_append = " agl-refhw-h3" +AGL_FEATURES:append = " agl-refhw-h3" # Reference hardware has USB3 -MACHINE_FEATURES_append = " usb3" +MACHINE_FEATURES:append = " usb3" -KERNEL_DEVICETREE_append = " renesas/r8a7795-agl-refhw.dtb" +KERNEL_DEVICETREE:append = " renesas/r8a7795-agl-refhw.dtb" -UBOOT_CONFIG_append = " agl-refhw-4x2g" +UBOOT_CONFIG:append = " agl-refhw-4x2g" UBOOT_CONFIG[agl-refhw-4x2g] = "r8a7795_salvator-xs-4x2g_defconfig" diff --git a/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc b/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc index e3faaf7bc..5093d0bd5 100644 --- a/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc +++ b/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc @@ -1,5 +1,5 @@ # Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES_append = " sota" +DISTRO_FEATURES:append = " sota" # Root device ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" @@ -11,4 +11,4 @@ WKS_FILE = "directdisk.wks.in" AGL_DEFAULT_IMAGE_FSTYPES = "ext4" # Need to run QEMU with virtio-gpu device -PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer glx gtk+" +PACKAGECONFIG:append:pn-qemu-system-native = " virglrenderer glx gtk+" diff --git a/meta-agl-bsp/conf/machine/include/virtio.inc b/meta-agl-bsp/conf/machine/include/virtio.inc index e10dc2622..8ee71a80b 100644 --- a/meta-agl-bsp/conf/machine/include/virtio.inc +++ b/meta-agl-bsp/conf/machine/include/virtio.inc @@ -10,7 +10,7 @@ MACHINEOVERRIDES =. "virtio-all:" IMAGE_FSTYPES += "tar.bz2 ext4" # Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" # Use a common kernel recipe for all VirtIO machines PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" @@ -24,7 +24,7 @@ LIN_DRIVERS = "" # Clear since it is set to 'lttng-modules' in packagegroup-core-tools-profile.bb, # and lttng-modules are not compatible with 5.10 kernel used for virtio. -LTTNGMODULES_virtio-all = "" +LTTNGMODULES:virtio-all = "" EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" -- cgit 1.2.3-korg