summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-agl-bsp/conf/include/agl_bbe.inc22
-rw-r--r--meta-agl-bsp/conf/include/agl_beaglebone.inc22
-rw-r--r--meta-agl-bsp/conf/include/agl_cubox-i.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_cyclone5.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_dragonboard-410c.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_dragonboard-820c.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_ebisu.inc8
-rw-r--r--meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_h3-salvator-x.inc4
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb.inc3
-rw-r--r--meta-agl-bsp/conf/include/agl_hsdk.inc8
-rw-r--r--meta-agl-bsp/conf/include/agl_imx-common.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_imx6-common.inc4
-rw-r--r--meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc6
-rw-r--r--meta-agl-bsp/conf/include/agl_imx8mqevk.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_j7-evm.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_m3-salvator-x.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc6
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb.inc6
-rw-r--r--meta-agl-bsp/conf/include/agl_qemuarm.inc12
-rw-r--r--meta-agl-bsp/conf/include/agl_qemuarm64.inc12
-rw-r--r--meta-agl-bsp/conf/include/agl_qemuriscv64.inc4
-rw-r--r--meta-agl-bsp/conf/include/agl_qemux86-64.inc12
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi4.inc20
-rw-r--r--meta-agl-bsp/conf/include/agl_rcar-nogfx.inc36
-rw-r--r--meta-agl-bsp/conf/include/agl_rcar.inc14
-rw-r--r--meta-agl-bsp/conf/include/agl_refhw-h3.inc12
-rw-r--r--meta-agl-bsp/conf/include/agl_virtio-aarch64.inc4
-rw-r--r--meta-agl-bsp/conf/machine/include/virtio.inc4
-rw-r--r--meta-agl-bsp/meta-agl-refhw-gen3/recipes-navigation/gpsd/gpsd-conf-refhw_1.0.bb4
-rw-r--r--meta-agl-bsp/meta-core/recipes-graphics/mesa/mesa_agl.inc8
-rw-r--r--meta-agl-bsp/meta-core/recipes-graphics/wayland/weston_agl.inc6
-rw-r--r--meta-agl-bsp/meta-freescale-layer/recipes-connectivity/hci-uart-helper/hci-uart-helper_1.0.bb4
-rw-r--r--meta-agl-bsp/meta-freescale-layer/recipes-graphics/mesa/mesa_%.bbappend6
-rw-r--r--meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_8.0.0.imx.bbappend6
-rw-r--r--meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend8
-rw-r--r--meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend4
-rw-r--r--meta-agl-bsp/meta-iot-cloud/recipes-aws/aws-iot-device-sdk-embedded-c/aws-iot-device-sdk-embedded-c.bb8
-rw-r--r--meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-iot-sdk-c/azure-iot-sdk-c_%.bbappend2
-rw-r--r--meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-macro-utils-c/azure-macro-utils-c_%.bbappend2
-rw-r--r--meta-agl-bsp/meta-iot-cloud/recipes-azure/umock-c/umock-c_%.bbappend2
-rw-r--r--meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb4
-rw-r--r--meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb2
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bootfiles.bbappend2
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend8
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend6
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2020.10.inc3
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2021.07.inc3
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-tools_2021.07.bb (renamed from meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-tools_2020.10.bb)2
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2021.07.bb (renamed from meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2020.10.bb)2
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend4
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb4
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-kernel/dtc/dtc_1.6.0.bbappend2
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend14
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bbappend2
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES10
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc6
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend6
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend6
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch68
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend6
-rw-r--r--meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb8
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc31
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend4
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb4
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb6
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend4
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb6
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb6
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend4
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend4
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/wayland-wsegl.bbappend1
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend12
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend4
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch95
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/Set_GOV_PERFORMANCE.cfg2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts (renamed from meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a7796-m3ulcb-xen.dts)2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend14
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh4
-rw-r--r--meta-agl-bsp/meta-sancloud/recipes-graphics/wayland/weston-ini-conf.bbappend2
-rw-r--r--meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend2
-rw-r--r--meta-agl-bsp/meta-ti/recipes-arago/weston/weston_8.0.0.bbappend4
-rw-r--r--meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend2
-rw-r--r--meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend10
-rw-r--r--meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend6
-rw-r--r--meta-agl-bsp/openembedded-layer/recipes-devtools/lua/lua_%.bbappend2
-rw-r--r--meta-agl-bsp/openembedded-layer/recipes-support/libbytesize/libbytesize_%.bbappend2
-rw-r--r--meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-mkimage-rpi4.bb6
-rw-r--r--meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-tools_git.bbappend8
-rw-r--r--meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen_git.bbappend12
-rw-r--r--meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend4
-rw-r--r--meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.10.bb56
-rw-r--r--meta-agl-core-test/images/agl-image-minimal-qa.bb2
-rw-r--r--meta-agl-core-test/recipes-test/ebizzy/ebizzy_0.3.bb2
-rw-r--r--meta-agl-core-test/recipes-test/fontconfig/fontconfig_%.bbappend6
-rw-r--r--meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend10
-rw-r--r--meta-agl-core-test/recipes-test/glmark2/glmark2_%.bbappend2
-rw-r--r--meta-agl-core-test/recipes-test/himeno/himeno_2.0.bb2
-rw-r--r--meta-agl-core-test/recipes-test/interbench/interbench_0.31.bb2
-rw-r--r--meta-agl-core-test/recipes-test/ipv6connect/ipv6connect.bb2
-rw-r--r--meta-agl-core-test/recipes-test/linus-stress/linus-stress.bb2
-rw-r--r--meta-agl-core-test/recipes-test/packagegroups/packagegroup-agl-test.bb10
-rw-r--r--meta-agl-core-test/recipes-test/trinity/trinity_git.bb6
-rw-r--r--meta-agl-core/classes/image_types_wic_workaround.bbclass2
-rw-r--r--meta-agl-core/conf/distro/include/aarch64-tune.inc2
-rw-r--r--meta-agl-core/conf/distro/include/x86_64-tune.inc40
-rw-r--r--meta-agl-core/conf/distro/poky-agl.conf40
-rw-r--r--meta-agl-core/conf/include/agl-devel.inc8
-rw-r--r--meta-agl-core/conf/include/base-agl.inc4
-rw-r--r--meta-agl-core/conf/local.conf.sample12
-rw-r--r--meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc2
-rw-r--r--meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland/0001-Fix-timer-leak-and-a-potential-race.patch42
-rw-r--r--meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_%.bbappend1
-rw-r--r--meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_aglcore.inc6
-rw-r--r--meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc4
-rw-r--r--meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb4
-rw-r--r--meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc6
-rw-r--r--meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc2
-rw-r--r--meta-agl-core/recipes-core/systemd/systemd_aglcore.inc12
-rw-r--r--meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc6
-rw-r--r--meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc2
-rw-r--r--meta-agl-core/recipes-graphics/rba/librba_1.0.bb8
-rw-r--r--meta-agl-core/recipes-graphics/rba/rba-config.bb2
-rw-r--r--meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf12
-rw-r--r--meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb8
-rw-r--r--meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb2
-rw-r--r--meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb4
-rw-r--r--meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend4
-rw-r--r--meta-agl-core/recipes-graphics/wayland/waltham_git.bb4
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb30
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend10
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc4
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch33
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch49
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc12
-rw-r--r--meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc2
-rw-r--r--meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc6
-rw-r--r--meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc4
-rw-r--r--meta-agl-core/recipes-kernel/linux/linux-agl-config.inc18
-rw-r--r--meta-agl-core/recipes-kernel/linux/linux-agl.inc2
-rw-r--r--meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc4
-rw-r--r--meta-agl-core/recipes-platform/images/agl-image-boot.bb2
-rw-r--r--meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb2
-rw-r--r--meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc6
-rw-r--r--meta-agl-core/recipes-platform/images/agl-image-minimal.bb2
-rw-r--r--meta-agl-core/recipes-platform/images/agl-image-weston.bb2
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb4
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb4
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb4
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb4
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb4
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb2
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb4
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb6
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb8
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb6
-rw-r--r--meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc2
-rwxr-xr-xmeta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh4
-rwxr-xr-xmeta-agl-core/scripts/run-yocto-check-layer.sh4
-rw-r--r--meta-app-framework/classes/aglwgt.bbclass22
-rw-r--r--meta-app-framework/conf/include/agl-appfw-smack.inc10
-rw-r--r--meta-app-framework/conf/include/agl-sign-wgts.inc2
-rw-r--r--meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc2
-rw-r--r--meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc2
-rw-r--r--meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc2
-rw-r--r--meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb8
-rw-r--r--meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb4
-rw-r--r--meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc8
-rw-r--r--meta-app-framework/recipes-connectivity/connman/connman_appfw.inc10
-rw-r--r--meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb2
-rw-r--r--meta-app-framework/recipes-core/af-binder/af-binder_git.bb38
-rw-r--r--meta-app-framework/recipes-core/af-binder/af-binder_git.inc4
-rw-r--r--meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb2
-rw-r--r--meta-app-framework/recipes-core/af-main/af-main_git.bb42
-rw-r--r--meta-app-framework/recipes-core/af-main/af-main_git.inc4
-rw-r--r--meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb9
-rw-r--r--meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb2
-rw-r--r--meta-app-framework/recipes-core/base-files/base-files_appfw.inc18
-rw-r--r--meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc8
-rw-r--r--meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.24.bbappend (renamed from meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.16.bbappend)0
-rw-r--r--meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc8
-rw-r--r--meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb8
-rw-r--r--meta-app-framework/recipes-core/shadow/shadow_appfw.inc2
-rw-r--r--meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb6
-rw-r--r--meta-app-framework/recipes-core/systemd/systemd_appfw.inc6
-rw-r--r--meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc2
-rw-r--r--meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb2
-rw-r--r--meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc2
-rw-r--r--meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb4
-rw-r--r--meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc2
-rw-r--r--meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb6
-rw-r--r--meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc2
-rw-r--r--meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc8
-rw-r--r--meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc4
-rw-r--r--meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc10
-rw-r--r--meta-app-framework/recipes-kernel/linux/linux-appfw.inc2
-rw-r--r--meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb4
-rw-r--r--meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb4
-rw-r--r--meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb4
-rw-r--r--meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb2
-rw-r--r--meta-app-framework/recipes-security/audit/audit_2.8.5.bb28
-rw-r--r--meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb2
-rw-r--r--meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb6
-rw-r--r--meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb14
-rw-r--r--meta-app-framework/recipes-security/security-manager/security-manager.inc14
-rw-r--r--meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend4
-rw-r--r--meta-app-framework/recipes-security/security-manager/security-manager_git.bb2
-rw-r--r--meta-app-framework/recipes-support/libcap/libcap_appfw.inc4
-rw-r--r--meta-app-framework/recipes-test/afb-test/afb-test_git.bb6
-rwxr-xr-xmeta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh10
-rwxr-xr-xmeta-app-framework/scripts/run-yocto-check-layer.sh8
-rw-r--r--meta-netboot/README2
-rw-r--r--meta-netboot/recipes-core/busybox/busybox_netboot.inc4
-rw-r--r--meta-netboot/recipes-core/images/initramfs-netboot-image_netboot.inc2
-rw-r--r--meta-netboot/recipes-core/initramfs-netboot/initramfs-netboot_1.0.bb4
-rw-r--r--meta-netboot/recipes-support/nbd/nbd_netboot.inc4
-rwxr-xr-xmeta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh4
-rwxr-xr-xmeta-netboot/scripts/run-yocto-check-layer.sh4
-rw-r--r--meta-pipewire/conf/include/agl-pipewire.inc2
-rw-r--r--meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb2
-rw-r--r--meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend2
-rw-r--r--meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch26
-rw-r--r--meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.43.bbappend (renamed from meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend)9
-rw-r--r--meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend4
-rw-r--r--meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend2
-rw-r--r--meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend2
-rw-r--r--meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire.bb2
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch241
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-alsa-plugin-allow-specifying-a-media.role-on-the-vir.patch124
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-null-sink-make-the-timerfd-non-blocking.patch43
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-Revert-treewide-meson.build-use-dependency-variable-.patch1129
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-node-driver-make-the-timerfd-non-blocking.patch43
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire/0003-Revert-meson-declare-spa_dep-and-override_dependency.patch83
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire/0004-Revert-systemd-correctly-prefix-systemd-system-units.patch25
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire/0005-pipewiresink-set-a-default-channel-map-if-the-number.patch77
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.43.bb (renamed from meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bb)116
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.43.bbappend (renamed from meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend)12
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/10-default-policy.lua19
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/30-bluez-monitor.lua23
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb8
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch78
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch138
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb31
-rwxr-xr-xmeta-pipewire/scripts/run-yocto-check-layer.sh4
-rw-r--r--templates/base/01_setup_pkg_revision.sh4
-rw-r--r--templates/base/99_local.conf.inc2
-rw-r--r--templates/base/local.conf.sample6
-rw-r--r--templates/feature/agl-ci/99_local.conf.inc4
-rw-r--r--templates/feature/agl-devel/README_feature_agl-devel.md2
-rw-r--r--templates/feature/agl-hmi-framework/50_local.conf.inc2
-rw-r--r--templates/feature/agl-ptest/90_local.conf.inc6
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc4
-rw-r--r--templates/feature/agl-virt/50_local.conf.inc2
-rw-r--r--templates/feature/agl-weston-remoting/50_local.conf.inc2
-rw-r--r--templates/feature/agl-weston-waltham-remoting/50_local.conf.inc2
-rw-r--r--templates/machine/ebisu/50_bblayers.conf.inc1
-rw-r--r--templates/machine/h3-salvator-x/50_bblayers.conf.inc1
-rw-r--r--templates/machine/h3ulcb-kf/50_bblayers.conf.inc1
-rw-r--r--templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc1
-rw-r--r--templates/machine/h3ulcb/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3-salvator-x/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3ulcb-kf/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3ulcb/50_bblayers.conf.inc1
275 files changed, 2958 insertions, 1076 deletions
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-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
index 3bc9f95c2..1ee0fe5b5 100644
--- a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
@@ -2,7 +2,7 @@ require conf/include/agl_rcar-nogfx.inc
SOC_FAMILY = "r8a7795"
BOARD_NAME = "h3-salvator-x"
-DTB_SUFFIX = "r8a7795-salvator-xs"
+DTB_SUFFIX = "r8a77951-salvator-xs"
# Mask graphic Pkgs
BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
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..e7a8b463c 100644
--- a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
+++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
@@ -2,8 +2,8 @@ require conf/include/agl_rcar.inc
SOC_FAMILY = "r8a7795"
BOARD_NAME = "h3-salvator-x"
-DTB_SUFFIX = "r8a7795-salvator-xs"
+DTB_SUFFIX = "r8a77951-salvator-xs"
-IMAGE_INSTALL_append_rcar-gen3 = " \
+IMAGE_INSTALL:append:rcar-gen3 = " \
kernel-module-vspmif \
"
diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
index 25dfb046d..07a93df80 100644
--- a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
@@ -2,7 +2,7 @@ require conf/include/agl_rcar-nogfx.inc
SOC_FAMILY = "r8a7795"
BOARD_NAME = "h3ulcb"
-DTB_SUFFIX = "r8a7795-h3ulcb"
+DTB_SUFFIX = "r8a77951-ulcb"
# Mask graphic Pkgs
BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index eb3836abb..b958d767c 100644
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -2,4 +2,5 @@ require conf/include/agl_rcar.inc
SOC_FAMILY = "r8a7795"
BOARD_NAME = "h3ulcb"
-DTB_SUFFIX = "r8a7795-h3ulcb"
+#ws2.0
+DTB_SUFFIX = "r8a77951-ulcb"
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.inc b/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
index e5e1ae7c1..6801722be 100644
--- a/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
+++ b/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
@@ -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..d2c4c056c 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
@@ -2,15 +2,15 @@ require conf/include/agl_rcar-nogfx.inc
SOC_FAMILY = "r8a7796"
BOARD_NAME = "m3ulcb"
-DTB_SUFFIX = "r8a7796-m3ulcb"
+DTB_SUFFIX = "r8a77960-ulcb"
# Mask graphic Pkgs
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..4f788324c 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -2,7 +2,7 @@ require conf/include/agl_rcar.inc
SOC_FAMILY = "r8a7796"
BOARD_NAME = "m3ulcb"
-DTB_SUFFIX = "r8a7796-m3ulcb"
+DTB_SUFFIX = "r8a77960-ulcb"
-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)}"
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..5a0e89e66 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"
+PREFERRED_VERSION_u-boot = "2021.07"
+PREFERRED_VERSION_u-boot-tools = "2021.07"
+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..eb29f1a43 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,20 @@ 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}"
+
+# Mask out base-files and systemd bbappends to avoid changing systemd-tmpfiles
+# behavior, see SPEC-4256 for a more involved explanation.
+BBMASK += "meta-rcar-gen3/recipes-core/base-files/ meta-rcar-gen3/recipes-core/systemd/"
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 54470a948..68c0007bd 100644
--- a/meta-agl-bsp/conf/include/agl_refhw-h3.inc
+++ b/meta-agl-bsp/conf/include/agl_refhw-h3.inc
@@ -1,14 +1,14 @@
-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/r8a77951-agl-refhw.dtb"
-UBOOT_CONFIG_append = " agl-refhw-4x2g"
-UBOOT_CONFIG[agl-refhw-4x2g] = "r8a7795_salvator-xs-4x2g_defconfig"
+UBOOT_CONFIG:append = " agl-refhw"
+UBOOT_CONFIG[agl-refhw] = "rcar3_salvator-x_defconfig"
-MACHINE_EXTRA_RRECOMMENDS_append_h3ulcb = " \
+MACHINE_EXTRA_RRECOMMENDS:append:h3ulcb = " \
linux-firmware-wl18xx \
ti-bt-firmware \
wlconf \
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"
diff --git a/meta-agl-bsp/meta-agl-refhw-gen3/recipes-navigation/gpsd/gpsd-conf-refhw_1.0.bb b/meta-agl-bsp/meta-agl-refhw-gen3/recipes-navigation/gpsd/gpsd-conf-refhw_1.0.bb
index 048b23565..25bdb73c8 100644
--- a/meta-agl-bsp/meta-agl-refhw-gen3/recipes-navigation/gpsd/gpsd-conf-refhw_1.0.bb
+++ b/meta-agl-bsp/meta-agl-refhw-gen3/recipes-navigation/gpsd/gpsd-conf-refhw_1.0.bb
@@ -23,7 +23,7 @@ do_install() {
fi
}
-ALTERNATIVE_${PN} = "gpsd-defaults"
+ALTERNATIVE:${PN} = "gpsd-defaults"
ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd"
ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.refhw"
# NOTE: Priority needs to be below default of 10 to avoid overriding the
@@ -31,7 +31,7 @@ ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.refhw"
# will tweak things on boot to handle h3ulcb vs refhw.
ALTERNATIVE_PRIORITY[gpsd-defaults] = "5"
-CONFFILES_${PN} = "${sysconfdir}/default/gpsd.refhw"
+CONFFILES:${PN} = "${sysconfdir}/default/gpsd.refhw"
# NOTE: Explicitly not defining RPROVIDES of "virtual/gpsd-conf" to
# avoid conflicting with the default configuration and potentially
diff --git a/meta-agl-bsp/meta-core/recipes-graphics/mesa/mesa_agl.inc b/meta-agl-bsp/meta-core/recipes-graphics/mesa/mesa_agl.inc
index 8ac343aa3..e74761317 100644
--- a/meta-agl-bsp/meta-core/recipes-graphics/mesa/mesa_agl.inc
+++ b/meta-agl-bsp/meta-core/recipes-graphics/mesa/mesa_agl.inc
@@ -1,7 +1,7 @@
# The gallium-llvm is recommended as software 3D graphics renderer
GALLIUM_LLVM = "gallium-llvm"
-PACKAGECONFIG_append_qemux86 = " gallium ${GALLIUM_LLVM}"
-PACKAGECONFIG_append_qemux86-64 = " gallium ${GALLIUM_LLVM}"
-PACKAGECONFIG_append_intel-corei7-64 = " gallium ${GALLIUM_LLVM}"
+PACKAGECONFIG:append:qemux86 = " gallium ${GALLIUM_LLVM}"
+PACKAGECONFIG:append:qemux86-64 = " gallium ${GALLIUM_LLVM}"
+PACKAGECONFIG:append:intel-corei7-64 = " gallium ${GALLIUM_LLVM}"
-DRIDRIVERS_append_intel-corei7-64 = ",i965"
+DRIDRIVERS:append:intel-corei7-64 = ",i965"
diff --git a/meta-agl-bsp/meta-core/recipes-graphics/wayland/weston_agl.inc b/meta-agl-bsp/meta-core/recipes-graphics/wayland/weston_agl.inc
index 9aaea5f69..e3b36034f 100644
--- a/meta-agl-bsp/meta-core/recipes-graphics/wayland/weston_agl.inc
+++ b/meta-agl-bsp/meta-core/recipes-graphics/wayland/weston_agl.inc
@@ -1,3 +1,3 @@
-RDEPENDS_${PN}_append_qemux86 = " mesa-megadriver"
-RDEPENDS_${PN}_append_qemux86-64 = " mesa-megadriver"
-RDEPENDS_${PN}_append_intel-corei7-64 = " mesa-megadriver"
+RDEPENDS:${PN}:append:qemux86 = " mesa-megadriver"
+RDEPENDS:${PN}:append:qemux86-64 = " mesa-megadriver"
+RDEPENDS:${PN}:append:intel-corei7-64 = " mesa-megadriver"
diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-connectivity/hci-uart-helper/hci-uart-helper_1.0.bb b/meta-agl-bsp/meta-freescale-layer/recipes-connectivity/hci-uart-helper/hci-uart-helper_1.0.bb
index e497a4a21..1a9c6bb4e 100644
--- a/meta-agl-bsp/meta-freescale-layer/recipes-connectivity/hci-uart-helper/hci-uart-helper_1.0.bb
+++ b/meta-agl-bsp/meta-freescale-layer/recipes-connectivity/hci-uart-helper/hci-uart-helper_1.0.bb
@@ -25,6 +25,6 @@ do_install() {
ln -s ../hci-uart-helper.service ${D}${systemd_system_unitdir}/bluetooth.service.wants/
}
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_system_unitdir}"
-RDEPENDS_${PN} += "bluez5"
+RDEPENDS:${PN} += "bluez5"
diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/mesa/mesa_%.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/mesa/mesa_%.bbappend
index 636b75c53..e7633f215 100644
--- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/mesa/mesa_%.bbappend
+++ b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI += "file://0001-kmsro-add-imx-dcss.patch"
# These over-rides should use "use-mainline-bsp" instead when that
# becomes more workable for i.MX8 in upstream meta-freescale.
-USE_OSMESA_ONLY_etnaviv = "no"
+USE_OSMESA_ONLY:etnaviv = "no"
-PACKAGECONFIG_append_etnaviv = " gallium etnaviv kmsro"
+PACKAGECONFIG:append:etnaviv = " gallium etnaviv kmsro"
diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_8.0.0.imx.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_8.0.0.imx.bbappend
index 7928342e1..270d8e8f5 100644
--- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_8.0.0.imx.bbappend
+++ b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_8.0.0.imx.bbappend
@@ -1,10 +1,10 @@
-# Work around PACKAGECONFIG_remove of "x11 wayland" added to the recipe
+# Work around PACKAGECONFIG:remove of "x11 wayland" added to the recipe
# in meta-freescale commit 5a5c5dd. This can be removed once the issue
# has been resolved by a revert of that breakage upstream.
# What is done below is effectively a disabling of the "wayland"
# PACKAGECONFIG option and then open coding what its effects would
# normally be, since the _remove prevents specifying it in the usual way.
PACKAGECONFIG[wayland] = ""
-DEPENDS_append = " virtual/egl virtual/libgles2"
-PACKAGECONFIG_CONFARGS_append = " -Dbackend-wayland=true"
+DEPENDS:append = " virtual/egl virtual/libgles2"
+PACKAGECONFIG_CONFARGS:append = " -Dbackend-wayland=true"
diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend
index c6f60d33b..cc26e25c6 100644
--- a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend
+++ b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:${THISDIR}/files:"
require recipes-kernel/linux/linux-yocto-agl.inc
# These patches and the configuration fragment below will need to be
# revisited if/when using IMX_DEFAULT_BSP = "mainline" with i.MX8
# becomes more feasible with upstream meta-freescale.
-SRC_URI_append_etnaviv = " \
+SRC_URI:append:etnaviv = " \
file://0001-enable-mhdp-with-etnaviv.patch \
file://0002-dts-enable-etnaviv.patch \
"
@@ -25,7 +25,7 @@ AGL_KCONFIG_FRAGMENTS += "cfg80211.cfg"
AGL_KCONFIG_FRAGMENTS += "fixups.cfg"
# Support for i.MX8MQ EVKB (e.g. Broadcom wifi)
-AGL_KCONFIG_FRAGMENTS_append_imx8mqevk = " imx8mq-evkb.cfg"
+AGL_KCONFIG_FRAGMENTS:append:imx8mqevk = " imx8mq-evkb.cfg"
# Build in etnaviv if required
-AGL_KCONFIG_FRAGMENTS_append_etnaviv = " etnaviv.cfg"
+AGL_KCONFIG_FRAGMENTS:append:etnaviv = " etnaviv.cfg"
diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend
index 95f764be8..948b8c22c 100644
--- a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend
+++ b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
require recipes-kernel/linux/linux-yocto-agl.inc
@@ -16,7 +16,7 @@ AGL_KCONFIG_FRAGMENTS += "cfg80211.cfg"
# (lock debugging and userspace firmware loader fallback)
AGL_KCONFIG_FRAGMENTS += "fixups.cfg"
-do_install_append_cubox-i() {
+do_install:append:cubox-i() {
# Add symlink to work with default Hummingboard 2 u-boot configuration
ln -sf imx6q-hummingboard2.dtb ${D}/boot/imx6q-hummingboard2-emmc.dtb
}
diff --git a/meta-agl-bsp/meta-iot-cloud/recipes-aws/aws-iot-device-sdk-embedded-c/aws-iot-device-sdk-embedded-c.bb b/meta-agl-bsp/meta-iot-cloud/recipes-aws/aws-iot-device-sdk-embedded-c/aws-iot-device-sdk-embedded-c.bb
index a3f67004e..a4719280b 100644
--- a/meta-agl-bsp/meta-iot-cloud/recipes-aws/aws-iot-device-sdk-embedded-c/aws-iot-device-sdk-embedded-c.bb
+++ b/meta-agl-bsp/meta-iot-cloud/recipes-aws/aws-iot-device-sdk-embedded-c/aws-iot-device-sdk-embedded-c.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=acc7a1bf87c055789657b148939e4b40"
SRC_URI = "\
- git://github.com/aws/aws-iot-device-sdk-embedded-C.git;protocol=https \
+ git://github.com/aws/aws-iot-device-sdk-embedded-C.git;protocol=https;branch=master \
file://Makefile.aws \
file://aws_iot_config.h \
file://awsiotsdk.pc \
@@ -16,9 +16,9 @@ S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
DEPENDS = "mbedtls"
-RDEPENDS_${PN} += "mbedtls"
+RDEPENDS:${PN} += "mbedtls"
-do_configure_prepend() {
+do_configure:prepend() {
cp ${WORKDIR}/Makefile.aws ${S}/src
cp ${WORKDIR}/aws_iot_config.h ${S}/include
cp ${WORKDIR}/awsiotsdk.pc ${S}
@@ -36,5 +36,5 @@ do_install() {
BBCLASSEXTEND = "native nativesdk"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-iot-sdk-c/azure-iot-sdk-c_%.bbappend b/meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-iot-sdk-c/azure-iot-sdk-c_%.bbappend
index ecd5fe2f6..58d4693f0 100644
--- a/meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-iot-sdk-c/azure-iot-sdk-c_%.bbappend
+++ b/meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-iot-sdk-c/azure-iot-sdk-c_%.bbappend
@@ -2,4 +2,4 @@
# symbols from amqp code are not included in the libiothub_client.so
# NOTE: amqp is not used by AGL in IoT context at the moment
-PACKAGECONFIG_remove = "amqp"
+PACKAGECONFIG:remove = "amqp"
diff --git a/meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-macro-utils-c/azure-macro-utils-c_%.bbappend b/meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-macro-utils-c/azure-macro-utils-c_%.bbappend
index afe3e9cda..b90c754d5 100644
--- a/meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-macro-utils-c/azure-macro-utils-c_%.bbappend
+++ b/meta-agl-bsp/meta-iot-cloud/recipes-azure/azure-macro-utils-c/azure-macro-utils-c_%.bbappend
@@ -1 +1 @@
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-agl-bsp/meta-iot-cloud/recipes-azure/umock-c/umock-c_%.bbappend b/meta-agl-bsp/meta-iot-cloud/recipes-azure/umock-c/umock-c_%.bbappend
index afe3e9cda..b90c754d5 100644
--- a/meta-agl-bsp/meta-iot-cloud/recipes-azure/umock-c/umock-c_%.bbappend
+++ b/meta-agl-bsp/meta-iot-cloud/recipes-azure/umock-c/umock-c_%.bbappend
@@ -1 +1 @@
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb b/meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb
index 446770f8e..3ea57d770 100644
--- a/meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb
+++ b/meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb
@@ -28,5 +28,5 @@ do_install () {
INITSCRIPT_NAME = "resize-disk"
INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
-SYSTEMD_SERVICE_${PN} = "resize-helper.service"
-RDEPENDS_${PN} += "e2fsprogs-resize2fs gptfdisk parted util-linux udev"
+SYSTEMD_SERVICE:${PN} = "resize-helper.service"
+RDEPENDS:${PN} += "e2fsprogs-resize2fs gptfdisk parted util-linux udev"
diff --git a/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb b/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb
index 19f0760ac..14bab2430 100644
--- a/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb
+++ b/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb
@@ -17,4 +17,4 @@ do_install() {
echo "blacklist qcom_q6v5_pil" > ${D}/${sysconfdir}/modprobe.d/qcom_q6v5_pil.conf
}
-SYSTEMD_SERVICE_${PN} = "qcom-q6v5-pil.service"
+SYSTEMD_SERVICE:${PN} = "qcom-q6v5-pil.service"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bootfiles.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bootfiles.bbappend
index adb19c09c..59bc5a741 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bootfiles.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bootfiles.bbappend
@@ -1 +1 @@
-RDEPENDS_${PN}_append_sota += " u-boot-otascript"
+RDEPENDS:${PN}:append:sota += " u-boot-otascript"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
index dc9df4ad8..4492a9182 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
@@ -1,7 +1,7 @@
DISABLE_OVERSCAN = "1"
TOTAL_BOARD_MEM = "3072"
-do_deploy_append_raspberrypi4() {
+do_deploy:append:raspberrypi4() {
# ENABLE CAN
if [ "${ENABLE_CAN}" = "1" ]; then
echo "# Enable CAN" >>${DEPLOYDIR}/bootfiles/config.txt
@@ -24,7 +24,7 @@ do_deploy_append_raspberrypi4() {
fi
}
-do_deploy_append() {
+do_deploy:append() {
if [ "${ENABLE_CMA}" = "1" ] && [ -n "${CMA_LWM}" ]; then
sed -i '/#cma_lwm/ c\cma_lwm=${CMA_LWM}' ${DEPLOYDIR}/bootfiles/config.txt
fi
@@ -40,11 +40,11 @@ do_deploy_append() {
echo "dtparam=audio=on" >> ${DEPLOYDIR}/bootfiles/config.txt
}
-do_deploy_append_raspberrypi4() {
+do_deploy:append:raspberrypi4() {
echo -e "\n[pi4]" >> ${DEPLOYDIR}/bootfiles/config.txt
echo "max_framebuffers=2" >> ${DEPLOYDIR}/bootfiles/config.txt
}
-do_deploy_append_sota() {
+do_deploy:append:sota() {
echo "device_tree_address=0x0c800000" >> ${DEPLOYDIR}/bootfiles/config.txt
}
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend
index 2437d9a84..1e9f47d23 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI_append =" \
+SRC_URI:append =" \
${@bb.utils.contains('AGL_XEN_WANTED','1',' file://boot_xen.cmd','',d)} \
"
-do_compile_append() {
+do_compile:append() {
# if xen feature is activated we overwirte the boot script with xen specific one
if [ "${AGL_XEN_WANTED}" = "1" ]; then
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2020.10.inc b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2020.10.inc
deleted file mode 100644
index 27f46096a..000000000
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2020.10.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC_URI = "git://git.denx.de/u-boot.git"
-SRCREV = "050acee119b3757fee3bd128f55d720fdd9bb890"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2021.07.inc b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2021.07.inc
new file mode 100644
index 000000000..fe3f656ee
--- /dev/null
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2021.07.inc
@@ -0,0 +1,3 @@
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
+SRCREV = "840658b093976390e9537724f802281c9c8439f5"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-tools_2020.10.bb b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-tools_2021.07.bb
index 2d9d76955..a963d3fff 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-tools_2020.10.bb
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-tools_2021.07.bb
@@ -1,2 +1,2 @@
require recipes-bsp/u-boot/u-boot-tools_2020.01.bb
-require u-boot-2020.10.inc
+require u-boot-2021.07.inc
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2020.10.bb b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2021.07.bb
index 0d967575b..2077262a3 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2020.10.bb
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2021.07.bb
@@ -1,2 +1,2 @@
require recipes-bsp/u-boot/u-boot_2020.01.bb
-require u-boot-2020.10.inc
+require u-boot-2021.07.inc
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
index 086fff751..5f8af211a 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend_raspberrypi := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:raspberrypi := "${THISDIR}/${PN}:"
-SRC_URI_append_raspberrypi = " file://dsi.cfg"
+SRC_URI:append:raspberrypi = " file://dsi.cfg"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb
index c365715fa..bcb92b23d 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
DEPENDS = "dtc-native"
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = ""
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = ""
S = "${WORKDIR}"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/dtc/dtc_1.6.0.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/dtc/dtc_1.6.0.bbappend
index 89e45a8d3..a28a9e748 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/dtc/dtc_1.6.0.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/dtc/dtc_1.6.0.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI += "file://0001-fdtoverlay-Prevent-overlays-from-modifying-phandle-p.patch"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
index 75ef03bdf..ec3fa910b 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
require recipes-kernel/linux/linux-yocto-agl.inc
-SRC_URI_append = " \
+SRC_URI:append = " \
${@oe.utils.conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
file://0001-mconf-menuconfig.patch \
"
@@ -28,19 +28,19 @@ SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=${SERIAL_OPTION}"
CMDLINE_DEBUG = ""
# Xen related option
-CMDLINE_append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','clk_ignore_unused','',d)}'
+CMDLINE:append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','clk_ignore_unused','',d)}'
# Workaround for crash during brcmfmac loading. Disable it at this moment
-CMDLINE_append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','modprobe.blacklist=brcmfmac','',d)}'
+CMDLINE:append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','modprobe.blacklist=brcmfmac','',d)}'
-CMDLINE_append = " usbhid.mousepoll=0"
+CMDLINE:append = " usbhid.mousepoll=0"
# Add options to allow CMA to operate
-CMDLINE_append = '${@oe.utils.conditional("ENABLE_CMA", "1", " coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}'
+CMDLINE:append = '${@oe.utils.conditional("ENABLE_CMA", "1", " coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}'
KERNEL_MODULE_AUTOLOAD += "snd-bcm2835"
KERNEL_MODULE_AUTOLOAD += "hid-multitouch"
PACKAGES += "kernel-module-snd-bcm2835"
-RDEPENDS_${PN} += "kernel-module-snd-bcm2835"
+RDEPENDS:${PN} += "kernel-module-snd-bcm2835"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bbappend
index 399aa1974..2836918c7 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bbappend
@@ -1,4 +1,4 @@
# For Xen
-SRC_URI_append =" \
+SRC_URI:append =" \
${@bb.utils.contains('AGL_XEN_WANTED','1','file://0002-Disable-DMA-in-sdhci-driver.patch','',d)} \
"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index e48a380a3..2e045c1f2 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,2 +1,2 @@
# Disable faad by default to avoid licensing issues
-PACKAGECONFIG_remove_rpi = "faad"
+PACKAGECONFIG:remove:rpi = "faad"
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES b/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
index f9cb5b1e4..e4f5e7d9b 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
@@ -5,7 +5,7 @@
# E.g. MACHINE_FEATURE. Should *not* be in layer.conf !!
# Radio packages
-#IMAGE_INSTALL_append_rcar-gen3 += " \
+#IMAGE_INSTALL:append:rcar-gen3 += " \
# si-tools \
# si-init \
# linux-firmware-wl18xx \
@@ -17,19 +17,19 @@
# ofono-tests \
#"
# E.g. MACHINE_FEATURE
-#IMAGE_INSTALL_append_r8a7797 += " \
+#IMAGE_INSTALL:append:r8a7797 += " \
# kernel-module-uio-imp \
# kernel-module-cmemdrv \
# udev-rules-cvlib \
#"
# E.g. MACHINE_FEATURE
-#IMAGE_INSTALL_append_r8a7798 += " \
+#IMAGE_INSTALL:append:r8a7798 += " \
# kernel-module-uio-imp \
# kernel-module-cmemdrv \
# udev-rules-cvlib \
#"
# This is a special use case. Should be enabled by user.
-#DISTRO_FEATURES_append = " surroundview "
+#DISTRO_FEATURES:append = " surroundview "
#### BBMASK
@@ -58,7 +58,7 @@ BBMASK += "/meta-rcar-gen3-adas/recipes-devtools/valgrind/"
BBMASK += "/meta-rcar-gen3-adas/recipes-devtools/gcc/"
# libpng in upstream already enabled neon
-# poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb:EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
+# poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb:EXTRA_OECONF:append:class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
BBMASK += "/meta-rcar-gen3-adas/recipes-graphics/libpng/"
# opencv in upstream is newer
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
index 4e0f7dd0d..eb1da3d35 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
@@ -1,10 +1,10 @@
#Keep this as a reminder
#MACHINEOVERRIDES .= ":kingfisher"
-#PACKAGE_EXTRA_ARCHS_append = " kingfisher"
+#PACKAGE_EXTRA_ARCHS:append = " kingfisher"
# Add a feature as a low-impact way to detect Kingfisher support in
# recipes.
-AGL_FEATURES_append = " kingfisher"
+AGL_FEATURES:append = " kingfisher"
PREFERRED_RPROVIDER_virtual/gpsd-conf ?= "gpsd-kingfisher-conf"
@@ -13,7 +13,7 @@ IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}-kf"
TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-kf-toolchain-${SDK_VERSION}"
# Radio packages
-IMAGE_INSTALL_append_rcar-gen3 += " \
+IMAGE_INSTALL:append:rcar-gen3 += " \
si-tools \
si-init \
linux-firmware-wl18xx \
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb
index 7ab99e025..c752bba08 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb
@@ -25,4 +25,4 @@ KERNEL=="i2c-12", MODE="0660", GROUP="audio", SECLABEL{smack}="*"
EOF
}
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend
index 98c66737b..7121bd168 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/files"
+FILESEXTRAPATHS:append := ":${THISDIR}/files"
SRC_URI += " \
file://si-tools-fm-improvements.patch \
"
-EXTRA_OEMAKE_append = " 'LDFLAGS=${LDFLAGS}'"
+EXTRA_OEMAKE:append = " 'LDFLAGS=${LDFLAGS}'"
do_install() {
install -d ${D}${bindir}
@@ -22,7 +22,7 @@ do_install() {
done
}
-FILES_${PN} = " \
+FILES:${PN} = " \
${bindir} \
${nonarch_base_libdir}/firmware/radio \
"
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend
index e29e54e44..52bee656d 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend
@@ -3,4 +3,4 @@ do_install() {
cp *.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
}
-FILES_${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend
index a08cb2624..55d570fc7 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend
@@ -1,15 +1,15 @@
inherit systemd
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://ti-uim.service"
-SYSTEMD_SERVICE_${PN} = "ti-uim.service"
+SYSTEMD_SERVICE:${PN} = "ti-uim.service"
PR = "r0"
PV = "0.1+git${SRCPV}"
-do_install_append() {
+do_install:append() {
# We do not want the blacklist
rm -f ${D}/${sysconfdir}/modprobe.d/ti_bt.conf
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
index 64c9542a3..d3a3229b4 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
@@ -1,4 +1,4 @@
-From ce9a7a41a9f65cc8cc129cdd27e155b35b26d393 Mon Sep 17 00:00:00 2001
+From 71c2e7bc6ecf872dd3b45480859dce0f2e941b03 Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@konsulko.com>
Date: Wed, 13 Dec 2017 12:49:20 -0500
Subject: [PATCH] arm64: dts: renesas: preserve drm HDMI connector naming on KF
@@ -18,16 +18,18 @@ is first.
Change-Id: Ibbb1975c2383a526a54c257fb7d68d32a042d468
Signed-off-by: Matt Porter <mporter@konsulko.com>
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
+Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 10 +++++-----
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 10 +++++-----
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 10 +++++-----
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 10 +++++-----
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 10 +++++-----
+ 3 files changed, 15 insertions(+), 15 deletions(-)
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index f7f947d27b0d..5bcc2391587d 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-@@ -3054,11 +3054,6 @@
+diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+index 12e78097533e..9ead58e8a7c2 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+@@ -3943,11 +3943,6 @@ ports {
#address-cells = <1>;
#size-cells = <0>;
@@ -39,8 +41,8 @@ index f7f947d27b0d..5bcc2391587d 100644
port@1 {
reg = <1>;
du_out_hdmi0: endpoint {
-@@ -3076,6 +3071,11 @@
- du_out_lvds0: endpoint {
+@@ -3966,6 +3961,11 @@ du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
};
};
+ port@0 {
@@ -51,11 +53,11 @@ index f7f947d27b0d..5bcc2391587d 100644
};
};
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index df26656e0f19..154ac1dd91fa 100644
---- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-@@ -2846,11 +2846,6 @@
+diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+index 66ab48b3a704..a5481dc4a3f1 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+@@ -3628,11 +3628,6 @@ ports {
#address-cells = <1>;
#size-cells = <0>;
@@ -67,8 +69,36 @@ index df26656e0f19..154ac1dd91fa 100644
port@1 {
reg = <1>;
du_out_hdmi0: endpoint {
-@@ -2862,6 +2857,11 @@
- du_out_lvds0: endpoint {
+@@ -3645,6 +3640,11 @@ du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
+ };
+ };
++ port@0 {
++ reg = <0>;
++ du_out_rgb: endpoint {
++ };
++ };
+ };
+ };
+
+diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+index ef2cb77f3c32..032ef1ca0633 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+@@ -3434,11 +3434,6 @@ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+- port@0 {
+- reg = <0>;
+- du_out_rgb: endpoint {
+- };
+- };
+ port@1 {
+ reg = <1>;
+ du_out_hdmi0: endpoint {
+@@ -3451,6 +3446,11 @@ du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
};
};
+ port@0 {
@@ -80,5 +110,5 @@ index df26656e0f19..154ac1dd91fa 100644
};
--
-2.11.0
+2.25.1
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
index d6c101443..20682e4f0 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_ulcb = " \
+SRC_URI:append:ulcb = " \
file://0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch \
"
-KERNEL_DEVICETREE_remove_h3ulcb = " \
+KERNEL_DEVICETREE:remove:h3ulcb = " \
renesas/r8a7795-es1-h3ulcb-view.dtb \
renesas/r8a7795-es1-h3ulcb-had-alfa.dtb \
renesas/r8a7795-es1-h3ulcb-had-beta.dtb \
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb
index 2c4192b98..918e29fc1 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb
@@ -8,9 +8,9 @@ SRC_URI = " \
inherit update-alternatives
-RPROVIDES_${PN} += "virtual/gpsd-conf"
+RPROVIDES:${PN} += "virtual/gpsd-conf"
-ALTERNATIVE_${PN} = "gpsd-defaults"
+ALTERNATIVE:${PN} = "gpsd-defaults"
ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd"
ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.kingfisher"
ALTERNATIVE_PRIORITY[gpsd-defaults] = "20"
@@ -23,5 +23,5 @@ do_install() {
install -m 0644 ${WORKDIR}/gpsd.kingfisher ${D}/${sysconfdir}/default/gpsd.kingfisher
}
-FILES_${PN} = "${sysconfdir}/default/gpsd.kingfisher"
-CONFFILES_${PN} = "${sysconfdir}/default/gpsd.kingfisher"
+FILES:${PN} = "${sysconfdir}/default/gpsd.kingfisher"
+CONFFILES:${PN} = "${sysconfdir}/default/gpsd.kingfisher"
diff --git a/meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc b/meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc
index d95f36f03..6c9f49c3b 100644
--- a/meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc
+++ b/meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc
@@ -1,15 +1,16 @@
-CTL_CHECKSUM[r8a77951_linux_gsx_binaries_gles.tar.bz2]="e120465f9fd25115f70791ab4c6c343d"
-CTL_CHECKSUM[r8a77960_linux_gsx_binaries_gles.tar.bz2]="81eeac2320d37d9d4a74db6eb66aeec5"
-CTL_CHECKSUM[GSX_KM_H3.tar.bz2]="a858eaba7e0ff150b489502b36c01459"
-CTL_CHECKSUM[GSX_KM_M3.tar.bz2]="bc6e8268455e1911919cc1b6928fb12e"
-CTL_CHECKSUM[RCG3VUDRL4101ZDO.tar.bz2]="43a8921d5c2a257ccc0bf491c737f5be"
-CTL_CHECKSUM[RTM0AC0000ADAACMZ1SL41C.tar.gz]="4e0bb98feeb1e309a2ec12c201bc16aa"
-CTL_CHECKSUM[RTM0AC0000AEAACMZ1SL41C.tar.gz]="414c5fc22bcf848b5a6eee3812874611"
-CTL_CHECKSUM[RTM0AC0000XAAACD30SL41C.tar.gz]="e44c10bd24372fc70013c2498c6869d3"
-CTL_CHECKSUM[RTM0AC0000XAAACE30SL41C.tar.gz]="1611375916d9e17cff19c34b83300c83"
-CTL_CHECKSUM[RTM0AC0000XACMND30SL41C.tar.gz]="6229f43b2260d194f663bceed16ca273"
-CTL_CHECKSUM[RTM0AC0000XCMCTL30SL41C.tar.bz2]="516f86033669537a162220c773cb972d"
-CTL_CHECKSUM[RTM0AC0000XV264D30SL41C.tar.bz2]="b9e4e0d6dc65f65d21079b88824d6de3"
-CTL_CHECKSUM[RTM0AC0000XV264E30SL41C.tar.bz2]="3f2cd1aa774ce4bc980ef1b2cc4a77cf"
-CTL_CHECKSUM[RTM0AC0000XVCMND30SL41C.tar.bz2]="e484652d06f1383a3543fd9188316a8a"
-CTL_CHECKSUM[RTM0AC0000XVCMNE30SL41C.tar.bz2]="bc419ea899e0d93c226cb637800e8028"
+CTL_CHECKSUM[r8a77951_linux_gsx_binaries_gles.tar.bz2]="06cc04c52f56048dbc00ead14447cb35"
+CTL_CHECKSUM[r8a77960_linux_gsx_binaries_gles.tar.bz2]="a24be039f1c294035416dbd77fa10f4a"
+CTL_CHECKSUM[GSX_KM_H3.tar.bz2]="563ff3f5d5dc8b40d19d0b6e7484bf22"
+CTL_CHECKSUM[GSX_KM_M3.tar.bz2]="7cbbffb874b30e36cc2c7751573e468b"
+CTL_CHECKSUM[RTM8RC0000ZMX0DQ00JFL3E.tar.bz2]="2ee662978a45fc7c7cf2cef0e4bf1e33"
+CTL_CHECKSUM[RTM8RC0000ZAD1LQ00JPL3E.tar.gz]="f59cb979a030a3545a6c0b2337e8ea0e"
+CTL_CHECKSUM[RTM8RC0000ZAE1LQ00JPL3E.tar.gz]="7bdfac397034e8e13425cd83e3bd5090"
+CTL_CHECKSUM[RTM8RC0000ZMD0LQ00JPL3E.tar.bz2]="8d774178a3fe5ddac0cc5bd16bc58e3e"
+CTL_CHECKSUM[RTM8RC0000ZMD1LQ00JPL3E.tar.bz2]="3f30a263a038d148b2af445bc09dc4b7"
+CTL_CHECKSUM[RTM8RC0000ZME0LQ00JPL3E.tar.bz2]="8f83d1c3947904e48316faa058c196c7"
+CTL_CHECKSUM[RTM8RC0000ZME1LQ00JPL3E.tar.bz2]="89d4ce58062ef956fa2b8ef1bd8a66f3"
+CTL_CHECKSUM[RTM8RC0000ZMX0LQ00JPL3E.tar.bz2]="035361ad4715bbb491ee23d80bc50e3a"
+CTL_CHECKSUM[RTM8RC0000ZND1LQ00JPL3E.tar.gz]="b56fa5404bdee152b557869390783eb4"
+CTL_CHECKSUM[RTM8RC0000ZNE1LQ00JPL3E.tar.gz]="63880c583eb132b868a074db3d39c8ee"
+CTL_CHECKSUM[RTM8RC0000ZNX0LQ00JPL3E.tar.gz]="53ff1eb5de6c5345bd24e8e3605eb82d"
+
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend
index 44c2a2b99..86ab018da 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE = "(salvator-x|m3ulcb|h3ulcb|ebisu)"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
index cdfb3cbe0..4ba36ca2c 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI_append = " \
+SRC_URI:append = " \
file://0001-Boot-Normal-World-in-EL2.patch \
"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt
index a08cc7d9c..9cc3eb9d2 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt
@@ -12,7 +12,7 @@ rootmmc=0:2
booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
-bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a7795-h3ulcb.dtb
+bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a77951-ulcb.dtb
bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt
index 979014a28..145f82eae 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt
@@ -12,7 +12,7 @@ rootmmc=0:2
booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
-bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a7796-m3ulcb.dtb
+bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a77960-ulcb.dtb
bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb
index 4007e7f96..e8235b9bd 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb
@@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "(salvator-x|m3ulcb|h3ulcb|ebisu)"
S = "${WORKDIR}"
-SRC_URI_append_sota = "file://uEnv-ota-m3ulcb.txt \
+SRC_URI:append:sota = "file://uEnv-ota-m3ulcb.txt \
file://uEnv-ota-h3ulcb.txt \
file://uEnv-ota-h3-salvator-xs \
file://uEnv-ota-m3-salvator-xs"
@@ -16,7 +16,7 @@ do_deploy() {
install -d ${DEPLOYDIR}/${PN}
}
-do_deploy_append_sota() {
+do_deploy:append:sota() {
install -m 0755 ${WORKDIR}/uEnv-ota-${BOARD_NAME}.txt ${DEPLOYDIR}/${PN}/uEnv.txt
}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb
index 440fe8fdd..9d06df251 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb
@@ -13,7 +13,7 @@ PV = "3.6.0+git${SRCPV}"
SRCREV = "292da2fd8db0176e0e96989268c63ef9ab910a6c"
SRC_URI = " \
- git://github.com/linaro-swg/optee_examples;branch=master;name=master \
+ git://github.com/linaro-swg/optee_examples;branch=master;name=master;protocol=https \
file://0001-secure_storage-ta-Add-a-missing-include-file.patch \
"
@@ -26,7 +26,7 @@ CFLAGS += "-Wno-extra -Wno-error=format"
TARGET_CFLAGS += "-Wno-extra -Wno-error=format"
TARGET_CC_ARCH += "${LDFLAGS}"
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
TA_DEV_KIT_DIR = "${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64"
@@ -58,4 +58,4 @@ do_install () {
cp ${S}/hello_world/ta/include/* ${D}${includedir}
}
-FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend
index 77eeab9f3..52a68e174 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend
@@ -3,5 +3,5 @@ do_install() {
cp -r ${S}/out/arm-plat-${PLATFORM}/export-ta_arm64 ${D}/usr/share/optee
}
-FILES_${PN}-staticdev += "${datadir}/optee/export-ta_arm64/lib/*.a"
-FILES_${PN}-dev += "${datadir}/optee/export-ta_arm64"
+FILES:${PN}-staticdev += "${datadir}/optee/export-ta_arm64/lib/*.a"
+FILES:${PN}-dev += "${datadir}/optee/export-ta_arm64"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb
index 80a22b89f..2feda0eab 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb
@@ -12,7 +12,7 @@ PV = "3.1.0+git${SRCPV}"
SRCREV = "45218eb59b006ad20cc7610904f291dd85157a43"
SRC_URI = " \
- git://github.com/OP-TEE/optee_test.git;branch=master;name=master \
+ git://github.com/OP-TEE/optee_test.git;branch=master;name=master;protocol=https \
file://optee_xtest_fix.diff \
"
@@ -34,7 +34,7 @@ CFLAGS += "-Wno-extra -Wno-error=stringop-overflow -Wno-error=array-bounds"
TARGET_CFLAGS += "-Wno-extra -Wno-error=stringop-overflow -Wno-error=array-bounds"
TARGET_CC_ARCH += "${LDFLAGS}"
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
S = "${WORKDIR}/git"
EXTRA_OEMAKE = "-e MAKEFLAGS="
@@ -52,4 +52,4 @@ do_install () {
install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
}
-FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb
index d66060b05..1577f8f56 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb
@@ -12,7 +12,7 @@ PV = "0.1+git${SRCPV}"
SRCREV = "0.1"
SRC_URI = " \
- git://github.com/iotbzh/optee_user_app_template;branch=master \
+ git://github.com/iotbzh/optee_user_app_template;branch=master;protocol=https \
"
COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)"
@@ -24,7 +24,7 @@ CFLAGS += "-Wno-extra -Wno-error=format"
TARGET_CFLAGS += "-Wno-extra -Wno-error=format"
TARGET_CC_ARCH += "${LDFLAGS}"
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
TA_DEV_KIT_DIR = "${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64"
@@ -54,4 +54,4 @@ do_install () {
install -D -p -m0444 ${S}/out/ta/* ${D}${nonarch_base_libdir}/optee_armtz
}
-FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend
index b8b5cbea5..ec75d0585 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI_append = " file://remove-redundant-yyloc-global.patch "
+SRC_URI:append = " file://remove-redundant-yyloc-global.patch "
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
index 707778cde..7beb4c25c 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
@@ -1,6 +1,8 @@
require checksum_control.inc
-do_install_append(){
+RDEPENDS:${PN}:append = " wayland-wsegl"
+
+do_install:append(){
sed -i 's/MODE="0660", OWNER/MODE="0660", SECLABEL{smack}="*", OWNER/g' ${D}${sysconfdir}/udev/rules.d/72-pvr-seat.rules
sed -i 's/GROUP="video"/GROUP="display"/g' ${D}${sysconfdir}/udev/rules.d/72-pvr-seat.rules
}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/wayland-wsegl.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/wayland-wsegl.bbappend
new file mode 100644
index 000000000..9a0eb73a3
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/wayland-wsegl.bbappend
@@ -0,0 +1 @@
+DEPENDS:append = " wayland-protocols"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
index 2fd50c3d9..4a76dda04 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -1,15 +1,15 @@
-FILESEXTRAPATHS_prepend_rcar-gen3 := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:rcar-gen3 := "${THISDIR}/${PN}:"
-SRC_URI_append_rcar-gen3 = " \
+SRC_URI:append:rcar-gen3 = " \
file://kingfisher_output.cfg \
file://ebisu_output.cfg \
file://salvator-x_output.cfg \
"
-WESTON_FRAGMENTS_append_ulcb = " kingfisher_output"
-WESTON_FRAGMENTS_append_ebisu = " ebisu_output"
-WESTON_FRAGMENTS_append_salvator-x = " salvator-x_output"
+WESTON_FRAGMENTS:append:ulcb = " kingfisher_output"
+WESTON_FRAGMENTS:append:ebisu = " ebisu_output"
+WESTON_FRAGMENTS:append:salvator-x = " salvator-x_output"
-do_configure_append_rcar-gen3() {
+do_configure:append:rcar-gen3() {
echo repaint-window=34 >> ${WORKDIR}/core.cfg
}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
index 7d28d912a..b8882ae49 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
@@ -1,6 +1,6 @@
require checksum_control.inc
-module_do_compile_prepend() {
+module_do_compile:prepend() {
cd ${S}/build/linux/config/compilers
- cp aarch64-poky-linux.mk ${TARGET_SYS}.mk
+ cp aarch64-linux-gnu.mk ${TARGET_SYS}.mk
}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
index 5262a9c5d..98b8e92c3 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
@@ -1,2 +1,2 @@
-KERNEL_MODULE_AUTOLOAD_append = " mmngr"
+KERNEL_MODULE_AUTOLOAD:append = " mmngr"
KERNEL_MODULE_PACKAGE_SUFFIX = ""
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
index 6b935b09e..fbff56fff 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
@@ -1,2 +1,2 @@
-KERNEL_MODULE_AUTOLOAD_append = " mmngrbuf"
+KERNEL_MODULE_AUTOLOAD:append = " mmngrbuf"
KERNEL_MODULE_PACKAGE_SUFFIX = ""
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend
index 379797248..5efe01045 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend
@@ -1,2 +1,2 @@
-KERNEL_MODULE_AUTOLOAD_append = " vspm_if"
+KERNEL_MODULE_AUTOLOAD:append = " vspm_if"
KERNEL_MODULE_PACKAGE_SUFFIX = ""
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
index e8ea125e9..9c7f01b26 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
@@ -1,10 +1,13 @@
-The ADSP on Renesas SoCs required a reserved memory area to become
-enabled, and this needs to be done manually.
+From 274657edb779d77ad0fe5ccb52b51634d075adf8 Mon Sep 17 00:00:00 2001
+From: invalid_git config <unknown@unknown>
+Date: Wed, 6 Oct 2021 14:42:47 +0000
+Subject: [PATCH 2/2] The ADSP on Renesas SoCs required a reserved memory area
+ to become enabled, and this needs to be done manually.
This patch adds sound hardware abstraction information for the m3ulcb
and m3ulcb-kf (kingfisher) device trees. This is helpful on-board the
ADSP for dynamically determining sound hardware at runtime, allowing
-single binaries to be used between the two boards.
+single binaries to be used between the two boards.
Future work will incorporate the h3ulcb and Salvator boards into the
abstraction.
@@ -12,11 +15,15 @@ abstraction.
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
---
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
-index 1cd64c1b3b31..71e59da3528d 100644
---- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
-+++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
-@@ -42,11 +42,18 @@
+ arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts | 45 ++++++++++++++++++-
+ arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 45 ++++++++++++++++++-
+ 2 files changed, 88 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
+index fbc8c9af6e52..df3bd589d9bb 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
++++ b/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
+@@ -62,11 +62,18 @@ lossy_decompress: linux,lossy_decompress@54000000 {
reg = <0x00000000 0x54000000 0x0 0x03000000>;
};
@@ -36,7 +43,7 @@ index 1cd64c1b3b31..71e59da3528d 100644
linux,cma-default;
};
-@@ -110,6 +117,42 @@
+@@ -126,6 +133,42 @@ &du {
"dclkin.0", "dclkin.1", "dclkin.2";
};
@@ -79,3 +86,73 @@ index 1cd64c1b3b31..71e59da3528d 100644
&vspb {
status = "okay";
};
+diff --git a/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
+index e57dd7bb43f7..f583cc6c18bf 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
++++ b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
+@@ -41,11 +41,18 @@ lossy_decompress: linux,lossy_decompress@54000000 {
+ reg = <0x00000000 0x54000000 0x0 0x03000000>;
+ };
+
++ /* For Audio DSP */
++ adsp_reserved: linux,adsp {
++ compatible = "shared-dma-pool";
++ reusable;
++ reg = <0x00000000 0x57000000 0x0 0x01000000>;
++ };
++
+ /* global autoconfigured region for contiguous allocations */
+ linux,cma@57000000 {
+ compatible = "shared-dma-pool";
+ reusable;
+- reg = <0x00000000 0x57000000 0x0 0x19000000>;
++ reg = <0x00000000 0x58000000 0x0 0x18000000>;
+ linux,cma-default;
+ };
+
+@@ -89,6 +96,42 @@ &du {
+ "dclkin.0", "dclkin.1", "dclkin.2";
+ };
+
++&adsp {
++ status = "okay";
++ clock-frequency = <12288000 11289600>;
++ audio-clocks = <22579200 24576000>;
++ memory-region = <&adsp_reserved>;
++
++ /* ADSP playback setting for ak4613 */
++ adsp_playback0: adsp,playback {
++ mode = "i2s";
++ clock-mode = "master";
++ bus-width = <16>;
++ ssi = <0>;
++ bus-if = <0>;
++ channels = <2>;
++ pin-share-ssi = <1>;
++ };
++
++ /* ADSP capture setting for ak4613 */
++ adsp_capture0: adsp,capture {
++ mode = "i2s";
++ clock-mode = "slave";
++ bus-width = <16>;
++ ssi = <1>;
++ bus-if = <0>;
++ channels = <2>;
++ pin-share-ssi = <0>;
++ };
++
++ adsp,ports {
++ port@0 {
++ playback = <&adsp_playback0>;
++ capture = <&adsp_capture0>;
++ };
++ };
++};
++
+ &vspb {
+ status = "okay";
+ };
+--
+2.31.1
+
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/Set_GOV_PERFORMANCE.cfg b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/Set_GOV_PERFORMANCE.cfg
new file mode 100644
index 000000000..b020174e8
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/Set_GOV_PERFORMANCE.cfg
@@ -0,0 +1,2 @@
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a7796-m3ulcb-xen.dts b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts
index 7940b1027..6947a62c2 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a7796-m3ulcb-xen.dts
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts
@@ -7,7 +7,7 @@
*/
/dts-v1/;
-#include "r8a7796.dtsi"
+#include "r8a77960.dtsi"
#include "ulcb.dtsi"
/ {
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
index 68ff69bd9..3665664e0 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -1,21 +1,23 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
require recipes-kernel/linux/linux-yocto-agl.inc
# Add ADSP patch to enable and add sound hardware abstraction
-SRC_URI_append = " \
+SRC_URI:append = " \
file://0004-ADSP-enable-and-add-sound-hardware-abstraction.patch \
"
AGL_KCONFIG_FRAGMENTS += "namespace_fix.cfg"
+AGL_KCONFIG_FRAGMENTS += "Set_GOV_PERFORMANCE.cfg"
# For Xen
AGL_KCONFIG_FRAGMENTS += " \
${@bb.utils.contains('AGL_XEN_WANTED','1','xen-be.cfg','',d)} \
"
-SRC_URI_append_m3ulcb = " \
- ${@bb.utils.contains('AGL_XEN_WANTED','1','file://r8a7796-m3ulcb-xen.dts;subdir=git/arch/${ARCH}/boot/dts/renesas','',d)} \
+
+SRC_URI:append:m3ulcb = " \
+ ${@bb.utils.contains('AGL_XEN_WANTED','1','file://r8a77960-ulcb-xen.dts;subdir=git/arch/${ARCH}/boot/dts/renesas','',d)} \
"
-KERNEL_DEVICETREE_append_m3ulcb = " \
- ${@bb.utils.contains('AGL_XEN_WANTED','1','renesas/r8a7796-m3ulcb-xen.dtb','',d)} \
+KERNEL_DEVICETREE:append:m3ulcb = " \
+ ${@bb.utils.contains('AGL_XEN_WANTED','1','renesas/r8a77960-ulcb-xen.dtb','',d)} \
"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend
index 28160530b..53eb1c540 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend
@@ -1,4 +1,4 @@
-RDEPENDS_${PN}_append_rcar-gen3 = "\
+RDEPENDS:${PN}:append:rcar-gen3 = "\
${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-multimedia-kernel-modules','',d)} \
${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-multimedia-libs','',d)} \
${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-gstreamer1.0-plugins','',d)} \
diff --git a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
index 89238e5b0..3e8a2f242 100644
--- a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
+++ b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston8-20210121.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston8-20210121.zip"
+ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-20220121.zip"
+ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-20220121.zip"
COPY_SCRIPT="$METADIR/bsp/meta-renesas/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
diff --git a/meta-agl-bsp/meta-sancloud/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-sancloud/recipes-graphics/wayland/weston-ini-conf.bbappend
index f2a27ba3c..097d8646c 100644
--- a/meta-agl-bsp/meta-sancloud/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-sancloud/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -1,3 +1,3 @@
-do_configure_append_bbe() {
+do_configure:append:bbe() {
echo 'gbm-format=rgb565' >> ${WORKDIR}/core.cfg
}
diff --git a/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend b/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend
index fcd0e8cc6..b3709a24b 100644
--- a/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend
+++ b/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend
@@ -1,5 +1,5 @@
require recipes-kernel/linux/linux-agl.inc
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
AGL_KCONFIG_FRAGMENTS += "cma-256.cfg"
diff --git a/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_8.0.0.bbappend b/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_8.0.0.bbappend
index 21c912a66..09f1cdc53 100644
--- a/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_8.0.0.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_8.0.0.bbappend
@@ -1,8 +1,8 @@
PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/libgbm mtdev"
-PR_append = ".arago2"
+PR:append = ".arago2"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
# file://0005-weston-drm-fix-dual-display-issue.patch
SRC_URI += " \
diff --git a/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend b/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend
index 6390e660e..62f1947e5 100644
--- a/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://0001-Add-support-for-AGL-toolchain.patch"
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend
index 21142df59..3f497a1be 100644
--- a/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend
@@ -1,16 +1,16 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-FILES_${PN} += "/etc/ti-sgx/"
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
+FILES:${PN} += "/etc/ti-sgx/"
-SRC_URI_append = "\
+SRC_URI:append = "\
file://pvr.service \
"
inherit systemd
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "pvr.service"
+SYSTEMD_SERVICE:${PN} = "pvr.service"
-do_install_append() {
+do_install:append() {
install -d ${D}${systemd_system_unitdir}
install -m 0755 ${WORKDIR}/pvr.service ${D}${systemd_system_unitdir}
install -d ${D}/etc/ti-sgx
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend
index a5a69513a..d12ab2be2 100644
--- a/meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend
@@ -1,7 +1,7 @@
# Remove GBM support from Mesa
# TI Platforms provides own GBM library
-PACKAGES_remove = "libgbm"
-PACKAGES_remove = "libgbm-dev"
+PACKAGES:remove = "libgbm"
+PACKAGES:remove = "libgbm-dev"
-EXTRA_OECONF_remove = "--enable-gbm"
+EXTRA_OECONF:remove = "--enable-gbm"
diff --git a/meta-agl-bsp/openembedded-layer/recipes-devtools/lua/lua_%.bbappend b/meta-agl-bsp/openembedded-layer/recipes-devtools/lua/lua_%.bbappend
index e77d79213..f4fc54d86 100644
--- a/meta-agl-bsp/openembedded-layer/recipes-devtools/lua/lua_%.bbappend
+++ b/meta-agl-bsp/openembedded-layer/recipes-devtools/lua/lua_%.bbappend
@@ -1,4 +1,4 @@
# this causes a crash in the selftest db.lua !
# Bug-AGL: SPEC-3828
# Upstream status: pending
-SRC_URI_remove = "file://CVE-2020-15945.patch"
+SRC_URI:remove = "file://CVE-2020-15945.patch"
diff --git a/meta-agl-bsp/openembedded-layer/recipes-support/libbytesize/libbytesize_%.bbappend b/meta-agl-bsp/openembedded-layer/recipes-support/libbytesize/libbytesize_%.bbappend
new file mode 100644
index 000000000..120fa1ed1
--- /dev/null
+++ b/meta-agl-bsp/openembedded-layer/recipes-support/libbytesize/libbytesize_%.bbappend
@@ -0,0 +1,2 @@
+# Change branch to main and update URL
+SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" \ No newline at end of file
diff --git a/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-mkimage-rpi4.bb b/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-mkimage-rpi4.bb
index ae8fe71b6..43a7d639b 100644
--- a/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-mkimage-rpi4.bb
+++ b/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-mkimage-rpi4.bb
@@ -6,15 +6,15 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = ""
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = ""
S = "${WORKDIR}"
DEPENDS = "u-boot-mkimage-native "
# Only for aarch64
COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_aarch64 = "(.*)"
+COMPATIBLE_MACHINE:aarch64 = "(.*)"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-tools_git.bbappend b/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-tools_git.bbappend
index 057f4564c..a67200618 100644
--- a/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-tools_git.bbappend
+++ b/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen-tools_git.bbappend
@@ -3,9 +3,9 @@
PACKAGE_ARCH = "${MACHINE_ARCH}"
# rpi4
-LIC_FILES_CHKSUM_raspberrypi4 = "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49"
-XEN_REL_raspberrypi4 = "4.13"
-SRCREV_raspberrypi4 = "721f2c323ca55c77857c93e7275b4a93a0e15e1f"
-SRC_URI_raspberrypi4 = " \
+LIC_FILES_CHKSUM:raspberrypi4 = "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49"
+XEN_REL:raspberrypi4 = "4.13"
+SRCREV:raspberrypi4 = "721f2c323ca55c77857c93e7275b4a93a0e15e1f"
+SRC_URI:raspberrypi4 = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
"
diff --git a/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen_git.bbappend b/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen_git.bbappend
index 1b9aaf4ca..2d63e1841 100644
--- a/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen_git.bbappend
+++ b/meta-agl-bsp/virtualization-layer/recipes-extended/xen/xen_git.bbappend
@@ -1,17 +1,17 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
# make the package machine-specific
PACKAGE_ARCH = "${MACHINE_ARCH}"
# rpi4 specifics
-LIC_FILES_CHKSUM_raspberrypi4 = "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49"
-XEN_REL_raspberrypi4 = "4.13"
+LIC_FILES_CHKSUM:raspberrypi4 = "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49"
+XEN_REL:raspberrypi4 = "4.13"
-SRCREV_raspberrypi4 = "721f2c323ca55c77857c93e7275b4a93a0e15e1f"
-SRC_URI_append_raspberrypi4 = " file://0001-XEN-on-RPi4-1GB-lmitation-workaround-XEN-tries-to-al.patch"
+SRCREV:raspberrypi4 = "721f2c323ca55c77857c93e7275b4a93a0e15e1f"
+SRC_URI:append:raspberrypi4 = " file://0001-XEN-on-RPi4-1GB-lmitation-workaround-XEN-tries-to-al.patch"
#due to incorrect xen binary preparation in external library, we add additional deploy
-do_deploy_append_raspberrypi4() {
+do_deploy:append:raspberrypi4() {
if [ -f ${B}/xen/xen ]; then
install -m 0644 ${B}/xen/xen ${DEPLOYDIR}/xen-${MACHINE}
fi
diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend
index e044af5f3..0f255cddb 100644
--- a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto:"
-SRC_URI_append_virtio-all = " \
+SRC_URI:append:virtio-all = " \
file://virtio-kmeta;type=kmeta;destsuffix=virtio-kmeta \
file://virtio-kmeta/bsp/virtio/virtio-aarch64-${LINUX_KERNEL_TYPE}.scc \
"
diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.10.bb b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.10.bb
index 5e27e1fea..322ae51ea 100644
--- a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -3,30 +3,30 @@ KBRANCH ?= "v5.10/standard/base"
require recipes-kernel/linux/linux-yocto.inc
# board specific branches
-KBRANCH_qemuarm ?= "v5.10/standard/arm-versatile-926ejs"
-KBRANCH_qemuarm64 ?= "v5.10/standard/qemuarm64"
-KBRANCH_qemumips ?= "v5.10/standard/mti-malta32"
-KBRANCH_qemuppc ?= "v5.10/standard/qemuppc"
-KBRANCH_qemuriscv64 ?= "v5.10/standard/base"
-KBRANCH_qemuriscv32 ?= "v5.10/standard/base"
-KBRANCH_qemux86 ?= "v5.10/standard/base"
-KBRANCH_qemux86-64 ?= "v5.10/standard/base"
-KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
-
-SRCREV_machine_qemuarm ?= "d8551cae1ccdbe062a5c6068ce39ea8f4e1c72db"
-SRCREV_machine_qemuarm64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemumips ?= "7f1f1ad2f2d90b1b070c6b0a82f0add9aa492e37"
-SRCREV_machine_qemuppc ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemuriscv64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemuriscv32 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemux86 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemux86-64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemumips64 ?= "fd5ac097b891642eea13659bea536f3ec5910d6d"
+KBRANCH:qemuarm ?= "v5.10/standard/arm-versatile-926ejs"
+KBRANCH:qemuarm64 ?= "v5.10/standard/qemuarm64"
+KBRANCH:qemumips ?= "v5.10/standard/mti-malta32"
+KBRANCH:qemuppc ?= "v5.10/standard/qemuppc"
+KBRANCH:qemuriscv64 ?= "v5.10/standard/base"
+KBRANCH:qemuriscv32 ?= "v5.10/standard/base"
+KBRANCH:qemux86 ?= "v5.10/standard/base"
+KBRANCH:qemux86-64 ?= "v5.10/standard/base"
+KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
+
+SRCREV_machine:qemuarm ?= "d8551cae1ccdbe062a5c6068ce39ea8f4e1c72db"
+SRCREV_machine:qemuarm64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
+SRCREV_machine:qemumips ?= "7f1f1ad2f2d90b1b070c6b0a82f0add9aa492e37"
+SRCREV_machine:qemuppc ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
+SRCREV_machine:qemuriscv64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
+SRCREV_machine:qemuriscv32 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
+SRCREV_machine:qemux86 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
+SRCREV_machine:qemux86-64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
+SRCREV_machine:qemumips64 ?= "fd5ac097b891642eea13659bea536f3ec5910d6d"
SRCREV_machine ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
SRCREV_meta ?= "031f6c76e488a3563f35258c72ff1de3e25a512e"
# remap qemuarm to qemuarma15 for the 5.8 kernel
-# KMACHINE_qemuarm ?= "qemuarma15"
+# KMACHINE:qemuarm ?= "qemuarma15"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
@@ -43,16 +43,16 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "1"
-KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
+KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32"
# Functionality flags
KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" \ No newline at end of file
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
+KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" \ No newline at end of file
diff --git a/meta-agl-core-test/images/agl-image-minimal-qa.bb b/meta-agl-core-test/images/agl-image-minimal-qa.bb
index b162f2904..a5ec70830 100644
--- a/meta-agl-core-test/images/agl-image-minimal-qa.bb
+++ b/meta-agl-core-test/images/agl-image-minimal-qa.bb
@@ -7,6 +7,6 @@ require agl-image-minimal.bb
LICENSE = "MIT"
-IMAGE_INSTALL_append = " \
+IMAGE_INSTALL:append = " \
packagegroup-ivi-common-test \
"
diff --git a/meta-agl-core-test/recipes-test/ebizzy/ebizzy_0.3.bb b/meta-agl-core-test/recipes-test/ebizzy/ebizzy_0.3.bb
index 08b0425c0..5e993519d 100644
--- a/meta-agl-core-test/recipes-test/ebizzy/ebizzy_0.3.bb
+++ b/meta-agl-core-test/recipes-test/ebizzy/ebizzy_0.3.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://downloads.sourceforge.net/project/ebizzy/ebizzy/${PV}/ebizzy-$
SRC_URI[md5sum] = "af038bc506066bb3d28db08aba62bc38"
SRC_URI[sha256sum] = "77286029d6348f3d9b3f04eae1feadb5ad1ad07b9f688f4d9f002960862467f2"
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
do_compile () {
${CC} -Wall -Wshadow -lpthread -o ebizzy ebizzy.c
diff --git a/meta-agl-core-test/recipes-test/fontconfig/fontconfig_%.bbappend b/meta-agl-core-test/recipes-test/fontconfig/fontconfig_%.bbappend
index e8ce1ab78..481dd9ee4 100644
--- a/meta-agl-core-test/recipes-test/fontconfig/fontconfig_%.bbappend
+++ b/meta-agl-core-test/recipes-test/fontconfig/fontconfig_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
install -m 755 -d ${D}/${datadir}/fontconfig-test
install -m 755 ${S}/test/run-test.sh ${D}/${datadir}/fontconfig-test/
@@ -12,7 +12,7 @@ do_install_append() {
PACKAGES =+ "fontconfig-test"
-DEBIAN_NOAUTONAME_fontconfig-test = "1"
-FILES_fontconfig-test = "${datadir}/fontconfig-test/*"
+DEBIAN_NOAUTONAME:fontconfig-test = "1"
+FILES:fontconfig-test = "${datadir}/fontconfig-test/*"
diff --git a/meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend b/meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend
index 6aa1eabc2..8fc56fa35 100644
--- a/meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend
+++ b/meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI =+ "${SOURCEFORGE_MIRROR}/freetype/freetype-demos/${PV}/ft2demos-${PV}.tar.gz;name=ft2demos \
file://0001-Makefile-dont-build-gfx-demos.patch;patchdir=../ft2demos-${PV} \
@@ -11,18 +11,18 @@ PACKAGES =+ "${PN}-demos"
B = "${S}"
-do_compile_append () {
+do_compile:append () {
oe_runmake -C ${WORKDIR}/ft2demos-${PV} TOP_DIR=${WORKDIR}/${BPN}-${PV}/
}
-do_install_append () {
+do_install:append () {
install -d -m 0755 ${D}/${bindir}
for x in ftbench ftdump ftlint ftvalid ttdebug; do
install -m 0755 ${WORKDIR}/ft2demos-${PV}/bin/.libs/$x ${D}/${bindir}
done
}
-FILES_${PN}-demos = "\
+FILES:${PN}-demos = "\
${bindir}/ftbench \
${bindir}/ftdump \
${bindir}/ftlint \
@@ -31,4 +31,4 @@ FILES_${PN}-demos = "\
"
# enable pixmap/libpng support to allow color emojis
-PACKAGECONFIG_append = " pixmap"
+PACKAGECONFIG:append = " pixmap"
diff --git a/meta-agl-core-test/recipes-test/glmark2/glmark2_%.bbappend b/meta-agl-core-test/recipes-test/glmark2/glmark2_%.bbappend
index 20dc23296..ab453d8b0 100644
--- a/meta-agl-core-test/recipes-test/glmark2/glmark2_%.bbappend
+++ b/meta-agl-core-test/recipes-test/glmark2/glmark2_%.bbappend
@@ -1,7 +1,7 @@
# Update glmark2
SRCREV = "784aca755a469b144acf3cae180b6e613b7b057a"
# Already in newer version
-SRC_URI_remove = "file://python3.patch"
+SRC_URI:remove = "file://python3.patch"
PACKAGECONFIG = "wayland-gles2"
PACKAGECONFIG[wayland-gles2] = ",,virtual/egl virtual/libgles2 wayland wayland-protocols wayland-native"
diff --git a/meta-agl-core-test/recipes-test/himeno/himeno_2.0.bb b/meta-agl-core-test/recipes-test/himeno/himeno_2.0.bb
index f890e23a4..de1c8d3ad 100644
--- a/meta-agl-core-test/recipes-test/himeno/himeno_2.0.bb
+++ b/meta-agl-core-test/recipes-test/himeno/himeno_2.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://himenoBMT.c;md5=8e8771ddc01c6d1a795e088e2d6dee78"
DEPENDS = "p7zip-native"
-do_configure_append() {
+do_configure:append() {
7z x -y -o${S} ${WORKDIR}/himenobmt.c.lzh
cd ${S}
sed -i -e 's/CC= gcc/#CC= gcc/' Makefile
diff --git a/meta-agl-core-test/recipes-test/interbench/interbench_0.31.bb b/meta-agl-core-test/recipes-test/interbench/interbench_0.31.bb
index 3e6490374..b6c54cc9a 100644
--- a/meta-agl-core-test/recipes-test/interbench/interbench_0.31.bb
+++ b/meta-agl-core-test/recipes-test/interbench/interbench_0.31.bb
@@ -8,7 +8,7 @@ SRC_URI += "file://interbench.c.patch;striplevel=0"
inherit autotools
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
B = "${S}"
EXTRA_OEMAKE = "CC='${CC}'"
diff --git a/meta-agl-core-test/recipes-test/ipv6connect/ipv6connect.bb b/meta-agl-core-test/recipes-test/ipv6connect/ipv6connect.bb
index a8b93716a..0f84a16f9 100644
--- a/meta-agl-core-test/recipes-test/ipv6connect/ipv6connect.bb
+++ b/meta-agl-core-test/recipes-test/ipv6connect/ipv6connect.bb
@@ -8,7 +8,7 @@ SRCREV = "b355b7e1f43a19938895964f314484ffd8a39542"
inherit autotools
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
B = "${WORKDIR}/git/ipv6connect"
S = "${WORKDIR}/git"
diff --git a/meta-agl-core-test/recipes-test/linus-stress/linus-stress.bb b/meta-agl-core-test/recipes-test/linus-stress/linus-stress.bb
index 01b3cfce5..aaa4d138c 100644
--- a/meta-agl-core-test/recipes-test/linus-stress/linus-stress.bb
+++ b/meta-agl-core-test/recipes-test/linus-stress/linus-stress.bb
@@ -7,7 +7,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qa-test-misc;protocol=htt
SRCREV = "87cdfd4626c0cb47fc22f328867e49d6268df85c"
inherit autotools
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
B = "${WORKDIR}/git/linus_stress"
S = "${WORKDIR}/git"
diff --git a/meta-agl-core-test/recipes-test/packagegroups/packagegroup-agl-test.bb b/meta-agl-core-test/recipes-test/packagegroups/packagegroup-agl-test.bb
index f3b2c4ff9..57a5d32e1 100644
--- a/meta-agl-core-test/recipes-test/packagegroups/packagegroup-agl-test.bb
+++ b/meta-agl-core-test/recipes-test/packagegroups/packagegroup-agl-test.bb
@@ -11,9 +11,9 @@ PACKAGES = "\
packagegroup-ivi-common-test \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
bc \
ebizzy \
evtest \
@@ -56,13 +56,13 @@ RDEPENDS_${PN} += "\
# readelf, logrotate, vsftpd, crontab, sar, arp, ftp,
# host, rcp, rlogin, rsh, tcpdump, expect, iptables, dnsmasq,
# pgrep
-RDEPENDS_packagegroup-agl-test-ltp = ""
-#RDEPENDS_packagegroup-agl-test-ltp += " \
+RDEPENDS:packagegroup-agl-test-ltp = ""
+#RDEPENDS:packagegroup-agl-test-ltp += " \
# initscripts-functions bind-utils binutils \
# cronie dnsmasq expect inetutils-ftp inetutils-rsh \
# iptables logrotate net-tools sysstat tcpdump vsftpd \
# "
-RDEPENDS_packagegroup-ivi-common-test = " \
+RDEPENDS:packagegroup-ivi-common-test = " \
packagegroup-agl-test \
"
diff --git a/meta-agl-core-test/recipes-test/trinity/trinity_git.bb b/meta-agl-core-test/recipes-test/trinity/trinity_git.bb
index f0f09a855..eec3381c5 100644
--- a/meta-agl-core-test/recipes-test/trinity/trinity_git.bb
+++ b/meta-agl-core-test/recipes-test/trinity/trinity_git.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
inherit useradd
USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --create-home --shell /bin/sh ${PN} "
+USERADD_PARAM:${PN} = "--system --create-home --shell /bin/sh ${PN} "
do_configure () {
./configure.sh
@@ -38,5 +38,5 @@ do_install () {
PACKAGES =+ "${PN}-example"
-FILES_${PN} = "${bindir}/trinity"
-FILES_${PN}-example = "${datadir}/${PN}"
+FILES:${PN} = "${bindir}/trinity"
+FILES:${PN}-example = "${datadir}/${PN}"
diff --git a/meta-agl-core/classes/image_types_wic_workaround.bbclass b/meta-agl-core/classes/image_types_wic_workaround.bbclass
index a6ea0580f..1a287ff7c 100644
--- a/meta-agl-core/classes/image_types_wic_workaround.bbclass
+++ b/meta-agl-core/classes/image_types_wic_workaround.bbclass
@@ -29,4 +29,4 @@ def get_workaround_wic_typedeps(d):
else:
return ''
-IMAGE_TYPEDEP_wic += "${@get_workaround_wic_typedeps(d)}"
+IMAGE_TYPEDEP:wic += "${@get_workaround_wic_typedeps(d)}"
diff --git a/meta-agl-core/conf/distro/include/aarch64-tune.inc b/meta-agl-core/conf/distro/include/aarch64-tune.inc
index 553bb5a64..320b4f1ac 100644
--- a/meta-agl-core/conf/distro/include/aarch64-tune.inc
+++ b/meta-agl-core/conf/distro/include/aarch64-tune.inc
@@ -4,7 +4,7 @@
# A double inclusion would produce a warning. This include line is just for reference
# include conf/machine/include/arm/arch-armv8.inc
-DEFAULTTUNE_poky-agl := "aarch64"
+DEFAULTTUNE:poky-agl := "aarch64"
# not yet ready
#QB_SYSTEM_NAME ?= "qemu-system-aarch"
#QB_DEFAULT_KERNEL ?= "zImage"
diff --git a/meta-agl-core/conf/distro/include/x86_64-tune.inc b/meta-agl-core/conf/distro/include/x86_64-tune.inc
index 9f2bdc867..a0b5abdfb 100644
--- a/meta-agl-core/conf/distro/include/x86_64-tune.inc
+++ b/meta-agl-core/conf/distro/include/x86_64-tune.inc
@@ -15,41 +15,41 @@ TUNE_CCARGS = "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=corei7 -
# Extra tune selections
AVAILTUNES += "corei7-32"
-TUNE_FEATURES_tune-corei7-32 = "${TUNE_FEATURES_tune-x86} corei7"
-BASE_LIB_tune-corei7-32 = "lib"
-TUNE_PKGARCH_tune-corei7-32 = "corei7-32"
-PACKAGE_EXTRA_ARCHS_tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-32} corei7-32"
+TUNE_FEATURES:tune-corei7-32 = "${TUNE_FEATURES:tune-x86} corei7"
+BASE_LIB:tune-corei7-32 = "lib"
+TUNE_PKGARCH:tune-corei7-32 = "corei7-32"
+PACKAGE_EXTRA_ARCHS:tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-32} corei7-32"
QEMU_EXTRAOPTIONS_corei7-32 = " -cpu Nehalem,check=false"
AVAILTUNES += "corei7-64"
-TUNE_FEATURES_tune-corei7-64 = "${TUNE_FEATURES_tune-x86-64} corei7"
-BASE_LIB_tune-corei7-64 = "lib64"
-TUNE_PKGARCH_tune-corei7-64 = "corei7-64"
-PACKAGE_EXTRA_ARCHS_tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64"
+TUNE_FEATURES:tune-corei7-64 = "${TUNE_FEATURES:tune-x86-64} corei7"
+BASE_LIB:tune-corei7-64 = "lib64"
+TUNE_PKGARCH:tune-corei7-64 = "corei7-64"
+PACKAGE_EXTRA_ARCHS:tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64"
QEMU_EXTRAOPTIONS_corei7-64 = " -cpu Nehalem,check=false"
AVAILTUNES += "corei7-64-x32"
-TUNE_FEATURES_tune-corei7-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} corei7"
-BASE_LIB_tune-corei7-64-x32 = "libx32"
-TUNE_PKGARCH_tune-corei7-64-x32 = "corei7-64-x32"
-PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7-64-x32"
+TUNE_FEATURES:tune-corei7-64-x32 = "${TUNE_FEATURES:tune-x86-64-x32} corei7"
+BASE_LIB:tune-corei7-64-x32 = "libx32"
+TUNE_PKGARCH:tune-corei7-64-x32 = "corei7-64-x32"
+PACKAGE_EXTRA_ARCHS:tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64-x32} corei7-64-x32"
QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false"
TUNE_ARCH = "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '' ,d)}"
# Bump qemux86-64 up to corei7
AVAILTUNES += "qemux86-64"
-TUNE_FEATURES_tune-qemux86-64 = "${TUNE_FEATURES_tune-x86-64} corei7"
-BASE_LIB_tune-qemux86-64 = "lib64"
-TUNE_PKGARCH_tune-qemux86-64 = "corei7-64"
-PACKAGE_EXTRA_ARCHS_tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64"
-QEMU_EXTRAOPTIONS_qemux86-64 = " -cpu Nehalem,check=false"
+TUNE_FEATURES:tune-qemux86-64 = "${TUNE_FEATURES:tune-x86-64} corei7"
+BASE_LIB:tune-qemux86-64 = "lib64"
+TUNE_PKGARCH:tune-qemux86-64 = "corei7-64"
+PACKAGE_EXTRA_ARCHS:tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64"
+QEMU_EXTRAOPTIONS:qemux86-64 = " -cpu Nehalem,check=false"
# QEMU / runqemu options (partly overrides qemuboot-x86.inc)
QB_MACHINE = "-machine q35"
-QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
-QB_CPU_x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
-QB_CPU_KVM_x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
+QB_SYSTEM_NAME:x86-64 = "qemu-system-x86_64"
+QB_CPU:x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
+QB_CPU_KVM:x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci"
diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 7d81b8dff..84f453614 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -8,30 +8,30 @@ DISTRO_NAME = "Automotive Grade Linux"
# Release flags
DISTRO_CODENAME = "lamprey"
AGL_BRANCH = "lamprey"
-AGLVERSION = "12.0.1"
+AGLVERSION = "12.1.18"
# switch devel/release
-AGLRELEASETYPE ?= "agldevelopment"
-#AGLRELEASETYPE ?= "aglrelease"
+#AGLRELEASETYPE ?= "agldevelopment"
+AGLRELEASETYPE = "aglrelease"
OVERRIDES .= ":${AGLRELEASETYPE}"
#
#for development
-DISTRO_VERSION_agldevelopment := "${AGLVERSION}+snapshot-${DATE}"
-AGL_APP_REVISION_agldevelopment = "${AUTOREV}"
-AGL_DEFAULT_REVISION_agldevelopment = "${AUTOREV}"
+DISTRO_VERSION:agldevelopment := "${AGLVERSION}+snapshot-${DATE}"
+AGL_APP_REVISION:agldevelopment = "${AUTOREV}"
+AGL_DEFAULT_REVISION:agldevelopment = "${AUTOREV}"
#for release
-DISTRO_VERSION_aglrelease := "${AGLVERSION}"
+DISTRO_VERSION:aglrelease := "${AGLVERSION}"
DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
-AGL_APP_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-AGL_DEFAULT_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+AGL_APP_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+AGL_DEFAULT_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
# reproducible builds:
# enable the flag
BUILD_REPRODUCIBLE_BINARIES = "1"
# Set the desired timestamps
-export SOURCE_DATE_EPOCH = "1593400000"
-REPRODUCIBLE_TIMESTAMP_ROOTFS = "1593400000"
+export SOURCE_DATE_EPOCH = "1708200000"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = "1708200000"
# inherit the class
INHERIT += "reproducible_build"
@@ -39,10 +39,10 @@ INHERIT += "reproducible_build"
# SDK
SDK_VENDOR = "-aglsdk"
-# SDKPATH is the folder where the SDK is going to be installed
+# SDKPATHINSTALL is the folder where the SDK is going to be installed
# Due to an issue with the qt5 environment (see SPEC-1667),
# we add DEFAULTTUNE to the SDKPATH to mitigate the issue.
-SDKPATH = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}"
+SDKPATHINSTALL = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}"
MAINTAINER = "AGL https://lists.automotivelinux.org/g/agl-dev-community"
@@ -54,7 +54,7 @@ AGL_DEFAULT_DISTRO_FEATURES = "largefile opengl wayland pam bluetooth bluez5 3g
POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
OVERRIDES .= ":${DISTRO_CODENAME}"
-DISTRO_FEATURES_remove = "x11"
+DISTRO_FEATURES:remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
INIT_MANAGER = "systemd"
@@ -107,7 +107,7 @@ CONNECTIVITY_CHECK_URIS ?= ""
#BB_DANGLINGAPPENDS_WARNONLY = "1"
# Not yet upstreamed; should be submitted.
-SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS:pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
#Redefined USER_CLASSES
#Disable prelink. It is unmaintained and likely will go away.
@@ -118,7 +118,7 @@ USER_CLASSES = "buildstats image-mklibs"
# 2 for ARM 32bit
# - a high and a medium setting for the CCARGS
# - the high setting is default (needs >= cortex-a15)
-# - the medium setting is enabled with: DISTRO_FEATURES_append = " agl-medium-arm-compiler "
+# - the medium setting is enabled with: DISTRO_FEATURES:append = " agl-medium-arm-compiler "
# 1 for ARM 64bit / AARCH64
# 1 for x86-64
# 1 for RISC-V 64-bit
@@ -140,8 +140,8 @@ AGL_EXTRA_INITRAMFS_FSTYPES ??= ""
#
# Default IMAGE FSTYPES wic.xz
AGL_DEFAULT_IMAGE_FSTYPES ?= "wic.xz wic.bmap wic.xz.sha256sum"
-AGL_DEFAULT_IMAGE_FSTYPES_qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
-AGL_DEFAULT_IMAGE_FSTYPES_append_netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+AGL_DEFAULT_IMAGE_FSTYPES:qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+AGL_DEFAULT_IMAGE_FSTYPES:append:netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
# DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)
@@ -150,7 +150,7 @@ IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
#
# THE FUTURE is 'wic'
-# IMAGE_FSTYPES_append = " wic"
+# IMAGE_FSTYPES:append = " wic"
# Complementary package definitions for agl-test-wgt and agl-devel-wgt
# image features
@@ -159,7 +159,7 @@ COMPLEMENTARY_GLOB[agl-devel-wgt] = '*-coverage *-debug'
# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
# (revalidate after 2017-10-15, 2018-06-12: still required)
-DIRFILES_pn-nativesdk-cmake = "1"
+DIRFILES:pn-nativesdk-cmake = "1"
# For https://jira.automotivelinux.org/browse/SPEC-1629 :
# We exclude the conflicting vars from the sstate task hash.
diff --git a/meta-agl-core/conf/include/agl-devel.inc b/meta-agl-core/conf/include/agl-devel.inc
index 919f066a7..394ff07b9 100644
--- a/meta-agl-core/conf/include/agl-devel.inc
+++ b/meta-agl-core/conf/include/agl-devel.inc
@@ -1,13 +1,13 @@
IMAGE_FEATURES =+ "debug-tweaks tools-debug tools-profile"
-IMAGE_INSTALL_append = " \
+IMAGE_INSTALL:append = " \
packagegroup-agl-core-devel \
"
# Install libdrm-test, including modetest, to images with GUI
-IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}"
+IMAGE_INSTALL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}"
-IMAGE_FEATURES_append = " agl-devel-wgt"
+IMAGE_FEATURES:append = " agl-devel-wgt"
# disable install of debug files in SDK
# initial value: SDKIMAGE_FEATURES="dev-pkgs dbg-pkgs staticdev-pkgs"
@@ -15,4 +15,4 @@ SDKIMAGE_FEATURES="dev-pkgs"
# allows insertion of code or items specific to developement
OVERRIDES .= ":agl-devel"
-DISTRO_FEATURES_append = " agl-devel"
+DISTRO_FEATURES:append = " agl-devel"
diff --git a/meta-agl-core/conf/include/base-agl.inc b/meta-agl-core/conf/include/base-agl.inc
index f132359a9..30bfc93d3 100644
--- a/meta-agl-core/conf/include/base-agl.inc
+++ b/meta-agl-core/conf/include/base-agl.inc
@@ -4,10 +4,10 @@
MODULE_TARBALL_DEPLOY ?= "0"
# Comment out below if want to use QtWebkit
-PACKAGECONFIG_remove_pn-qtquick1 = "webkit"
+PACKAGECONFIG:remove:pn-qtquick1 = "webkit"
-ASSUME_PROVIDED_remove = "tar-native"
+ASSUME_PROVIDED:remove = "tar-native"
# Use static IDs to enable full-filesystem updates
USERADDEXTENSION = "useradd-staticids"
diff --git a/meta-agl-core/conf/local.conf.sample b/meta-agl-core/conf/local.conf.sample
index 82c9dddc1..8fa6d05a2 100644
--- a/meta-agl-core/conf/local.conf.sample
+++ b/meta-agl-core/conf/local.conf.sample
@@ -152,7 +152,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
# - 'image-prelink' in order to prelink the filesystem image
# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
#
# Runtime testing of images
@@ -162,7 +162,7 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink"
# run tests against any SDK that are built. To enable this uncomment these lines.
# See classes/test{image,sdk}.bbclass for further details.
#IMAGE_CLASSES += "testimage testsdk"
-#TESTIMAGE_AUTO_qemuall = "1"
+#TESTIMAGE_AUTO:qemuall = "1"
#
# Interactive shell configuration
@@ -238,14 +238,14 @@ BB_DISKMON_DIRS ??= "\
#
# By default native qemu will build with a builtin VNC server where graphical output can be
# seen. The line below enables the SDL UI frontend too.
-PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
# By default libsdl2-native will be built, if you want to use your host's libSDL instead of
# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
#ASSUME_PROVIDED += "libsdl2-native"
# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
# a handy set of menus for controlling the emulator.
-#PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
#
# Hash Equivalence
@@ -270,8 +270,8 @@ CONF_VERSION = "1"
AGL_FEATURES ?= ""
AGL_EXTRA_IMAGE_FSTYPES ?= ""
-DISTRO_FEATURES_append = " systemd "
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd "
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
# soon: INIT_MANAGER = "systemd"
diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc
index ae5444e13..54a6311fb 100644
--- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc
+++ b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc
@@ -2,7 +2,7 @@ PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'way
PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
-PACKAGECONFIG_append = " ${PACKAGECONFIG_WAYLAND}"
+PACKAGECONFIG:append = " ${PACKAGECONFIG_WAYLAND}"
# '-qpa wayland-egl' set wayland-egl as default of platform plugins
PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard"
diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland/0001-Fix-timer-leak-and-a-potential-race.patch b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland/0001-Fix-timer-leak-and-a-potential-race.patch
new file mode 100644
index 000000000..642eabc4b
--- /dev/null
+++ b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland/0001-Fix-timer-leak-and-a-potential-race.patch
@@ -0,0 +1,42 @@
+From f4d3297e6705cc524729d629bf94db11841dbb24 Mon Sep 17 00:00:00 2001
+From: Simon Yuan <simon.yuan@navico.com>
+Date: Thu, 7 Nov 2019 09:22:37 +1300
+Subject: [PATCH] Fix timer leak and a potential race
+
+The callback timer is now killed immediately before starting a new timer, this
+makes sure there is always a single active callback timer. It's unclear why
+killing the timer in a separate lambda doesn't always kill the timer in time,
+the hypothesis is that if killing the timer comes after starting a new one, then
+the previous timer is now left dangling. Whatever the reason is, it makes even
+more sense to kill the timer in the same lamda and immediately before starting a
+new timer anyway.
+---
+ src/client/qwaylandwindow.cpp | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 0df99d9f..93b46bf1 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -1136,13 +1136,12 @@ void QWaylandWindow::handleUpdate()
+ mWaitingForFrameCallback = true;
+ mWaitingForUpdate = false;
+
+- // Stop current frame timer if any, can't use killTimer directly, see comment above.
+- int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
+- if (fcbId != -1)
+- QMetaObject::invokeMethod(this, [this, fcbId] { killTimer(fcbId); }, Qt::QueuedConnection);
+-
+ // Start a timer for handling the case when the compositor stops sending frame callbacks.
+- QMetaObject::invokeMethod(this, [this] { // Again; can't do it directly
++ // Can't use killTimer directly, see comment above.
++ QMetaObject::invokeMethod(this, [this] {
++ int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
++ if (fcbId != -1)
++ killTimer(fcbId);
+ if (mWaitingForFrameCallback)
+ mFrameCallbackTimerId = startTimer(100);
+ }, Qt::QueuedConnection);
+--
+2.25.1
+
diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_%.bbappend b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_%.bbappend
new file mode 100644
index 000000000..aa55c3a0c
--- /dev/null
+++ b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'qtwayland_aglcore.inc', '', d)}
diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_aglcore.inc
new file mode 100644
index 000000000..08837ce26
--- /dev/null
+++ b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_aglcore.inc
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/qtwayland:"
+
+# Patch reported in https://bugreports.qt.io/browse/QTBUG-79838, not upstreamed
+SRC_URI += " \
+ file://0001-Fix-timer-leak-and-a-potential-race.patch \
+ "
diff --git a/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc b/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc
index babf0261f..88ff7daec 100644
--- a/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc
+++ b/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = " file://enable-wget-https.cfg"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append = " file://enable-wget-https.cfg"
diff --git a/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb
index bfedb06ab..d4ef916ae 100644
--- a/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb
+++ b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb
@@ -9,7 +9,7 @@ DEPENDS = "dbus ncurses connman json-c"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381"
-SRC_URI = "git://gitlab.com/iotbzh/connman-json-client.git;protocol=https \
+SRC_URI = "git://gitlab.com/iotbzh/connman-json-client.git;protocol=https;branch=master \
file://stdbool-fixes.patch"
SRCREV = "2b0f93ec9518c978c04807fe52e95315d6d80e6b"
@@ -25,4 +25,4 @@ do_install () {
install -Dm755 connman_ncurses ${D}${bindir}
}
-FILES_${PN} = "${bindir}/connman_ncurses"
+FILES:${PN} = "${bindir}/connman_ncurses"
diff --git a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
index e701630ee..7299d18f3 100644
--- a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
+++ b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI += "file://0001-disable-when-booting-over-nfs.patch \
file://main.conf \
"
-FILES_${PN} += "${sysconfdir}/connman/main.conf"
+FILES:${PN} += "${sysconfdir}/connman/main.conf"
-do_install_append() {
+do_install:append() {
install -d ${D}${sysconfdir}/connman
install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
}
diff --git a/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc b/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc
index 6661eab6c..a539d1826 100644
--- a/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc
+++ b/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
# Remove ethernet script deployed by upstream unconditionally (SPEC-3221)
rm -rf ${D}${systemd_unitdir}/network/80-wired.network || true
} \ No newline at end of file
diff --git a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc
index feca107a8..51a5ff45f 100644
--- a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc
+++ b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:"
SRC_URI += "\
file://0002-network-add-CAN-Termination-tristate-option.patch \
@@ -8,11 +8,11 @@ SRC_URI += "\
"
# enable networkd/resolved support
-PACKAGECONFIG_append_pn-systemd = " \
+PACKAGECONFIG:append:pn-systemd = " \
${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','networkd resolved','',d)} \
"
-do_install_append() {
+do_install:append() {
# Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time
install -m 644 -p -D ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf
@@ -25,10 +25,10 @@ do_install_append() {
fi
}
-FILES_${PN} += "${sysconfdir}/e2fsck.conf "
+FILES:${PN} += "${sysconfdir}/e2fsck.conf "
# SPEC-737: connmand also has a NTP client which races with systemd-timesyncd
-PACKAGECONFIG_remove = "timesyncd"
+PACKAGECONFIG:remove = "timesyncd"
# Enable systemd-coredump when agl-devel is set on
-PACKAGECONFIG_append_agl-devel = " coredump"
+PACKAGECONFIG:append:agl-devel = " coredump"
diff --git a/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc b/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc
index 2de1e6836..2d50a1f24 100644
--- a/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc
+++ b/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/files"
+FILESEXTRAPATHS:append := ":${THISDIR}/files"
-SRC_URI_append_class-nativesdk = " \
+SRC_URI:append:class-nativesdk = " \
file://environment.d-cmake-agl.sh \
"
-do_install_append_class-nativesdk() {
+do_install:append:class-nativesdk() {
install -m 644 ${WORKDIR}/environment.d-cmake-agl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake-agl.sh
}
diff --git a/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc b/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc
index 7cba933af..213542ec5 100644
--- a/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc
+++ b/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc
@@ -1 +1 @@
-PACKAGECONFIG_remove = "readline"
+PACKAGECONFIG:remove = "readline"
diff --git a/meta-agl-core/recipes-graphics/rba/librba_1.0.bb b/meta-agl-core/recipes-graphics/rba/librba_1.0.bb
index b04774c84..e8b1e0dbc 100644
--- a/meta-agl-core/recipes-graphics/rba/librba_1.0.bb
+++ b/meta-agl-core/recipes-graphics/rba/librba_1.0.bb
@@ -16,9 +16,9 @@ S = "${WORKDIR}/git"
inherit pkgconfig cmake
-FILES_${PN} = "${libdir}/"
-FILES_${PN}-dev = "${libdir}/pkgconfig/librba.pc \
+FILES:${PN} = "${libdir}/"
+FILES:${PN}-dev = "${libdir}/pkgconfig/librba.pc \
${includedir}/ \
"
-INSANE_SKIP_${PN} += "dev-so"
-INSANE_SKIP_${PN}-dev += "dev-elf"
+INSANE_SKIP:${PN} += "dev-so"
+INSANE_SKIP:${PN}-dev += "dev-elf"
diff --git a/meta-agl-core/recipes-graphics/rba/rba-config.bb b/meta-agl-core/recipes-graphics/rba/rba-config.bb
index 17b7a6708..cbed9df0c 100644
--- a/meta-agl-core/recipes-graphics/rba/rba-config.bb
+++ b/meta-agl-core/recipes-graphics/rba/rba-config.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
-do_install_append() {
+do_install:append() {
install -d ${D}/${sysconfdir}/rba
install -m 0644 ${WORKDIR}/RBAModel.json ${D}/${sysconfdir}/rba
}
diff --git a/meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf b/meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf
index bb66fd2bb..ee75c7335 100644
--- a/meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf
+++ b/meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf
@@ -5,7 +5,7 @@ do_configure() function to your bbappend, using machine (e.g. h3ulcb)
overrides (i.e. use the MACHINE name where "machine" is used below):
'''
-do_configure_machine() {
+do_configure:machine() {
echo repaint-window=34 >> ${WORKDIR}/core.cfg
echo transition-duration=300 >> ${WORKDIR}/ivishell.cfg
@@ -14,17 +14,17 @@ do_configure_machine() {
'''
or:
'''
-do_configure_machine() {
+do_configure:machine() {
sed -i -e 's/drm-backend/fbdev-backend/' ${WORKDIR}/core.cfg
}
'''
To add new non-display sections, just list them in SRC_URI and WESTON_FRAGMENTS:
'''
-FILESEXTRAPATHS_prepend_machine := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:machine := "${THISDIR}/${PN}:"
-SRC_URI_append_machine = " file://foo.cfg"
-WESTON_FRAGMENTS_append_machine = " foo"
+SRC_URI:append:machine = " file://foo.cfg"
+WESTON_FRAGMENTS:append:machine = " foo"
'''
@@ -33,7 +33,7 @@ HDMI-1-A connected screen that needs to be rotated 270 degrees to one
that is rotated 90 degrees, redefine the WESTON_DISPLAYS variable:
'''
-WESTON_DISPLAYS_machine = "hdmi-a-1-90"
+WESTON_DISPLAYS:machine = "hdmi-a-1-90"
'''
Note that the weston-ini-conf recipe automatically generates a landscape
diff --git a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
index 0030e4a14..79a9915d0 100644
--- a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
+++ b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "wayland wayland-protocols wayland-native weston \
${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)}"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/agl-compositor.git;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "bd4c81d5f90d466df8019d19dca4856aa7a5fa80"
+SRCREV = "59b6881bc315388ba0c8f1be382dce1f6aed3304"
PV = "0.0.10+git${SRCPV}"
S = "${WORKDIR}/git"
@@ -23,7 +23,7 @@ PACKAGECONFIG[policy-deny-all] = "-Dpolicy-default=deny-all,,"
inherit meson pkgconfig python3native
-FILES_${PN} = " \
+FILES:${PN} = " \
${bindir}/agl-compositor \
${bindir}/agl-screenshooter \
${datadir}/${PN}/protocols/agl-shell.xml \
@@ -32,8 +32,8 @@ FILES_${PN} = " \
${libdir}/agl-compositor/libexec_compositor.so.0.0.0 \
"
-RDEPENDS_${PN} += " ${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)}"
+RDEPENDS:${PN} += " ${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)}"
-FILES_${PN}-dev += " \
+FILES:${PN}-dev += " \
${libdir}/agl-compositor/libexec_compositor.so \
"
diff --git a/meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb b/meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb
index fe0b61f85..049068341 100644
--- a/meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb
+++ b/meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb
@@ -18,5 +18,5 @@ S = "${WORKDIR}/git"
inherit meson pkgconfig python3native
-FILES_${PN} = " ${bindir}/agl-shell-activator \
+FILES:${PN} = " ${bindir}/agl-shell-activator \
${bindir}/agl-activator "
diff --git a/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb b/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb
index aed96de21..466985f41 100644
--- a/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb
+++ b/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb
@@ -13,5 +13,5 @@ S = "${WORKDIR}/git"
inherit meson pkgconfig python3native
-FILES_${PN} += "${libdir}/*"
-FILES_${PN} += "${bindir}/*"
+FILES:${PN} += "${libdir}/*"
+FILES:${PN} += "${bindir}/*"
diff --git a/meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend b/meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend
index 8d0436a3b..302eba4d2 100644
--- a/meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend
+++ b/meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = "\
+SRC_URI:append = "\
file://0001-waltham-Fix-compile-build-error.patch \
file://0002-commandxml-Add-support-wthp_app_id-interface.patch \
file://0001-Use-python3-instead-of-2.patch \
diff --git a/meta-agl-core/recipes-graphics/wayland/waltham_git.bb b/meta-agl-core/recipes-graphics/wayland/waltham_git.bb
index 01023a1f2..da092a5e7 100644
--- a/meta-agl-core/recipes-graphics/wayland/waltham_git.bb
+++ b/meta-agl-core/recipes-graphics/wayland/waltham_git.bb
@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = " \
file://LICENSE;md5=e8ad01a5182f2c1b3a2640e9ea268264 \
"
SRCREV = "1de58c3ff746ddaba7584d760c5454243723d3ca"
-SRC_URI = "git://github.com/wmizuno/waltham.git \
+SRC_URI = "git://github.com/wmizuno/waltham.git;branch=master;protocol=https \
"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
DEPENDS += "libdrm virtual/kernel wayland"
-RDEPENDS_${PN} += "libdrm" \ No newline at end of file
+RDEPENDS:${PN} += "libdrm" \ No newline at end of file
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
index b3a5a4712..8842a5a46 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
@@ -63,7 +63,7 @@ do_compile() {
sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape-inverted
}
-do_install_append() {
+do_install:append() {
install -d ${D}${weston_ini_dir}
install -m 0644 ${WORKDIR}/weston.ini.default ${D}${weston_ini_dir}/
install -m 0644 ${WORKDIR}/weston.ini.landscape ${D}${weston_ini_dir}/
@@ -81,28 +81,28 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini"
-RDEPENDS_${PN} = "weston-init"
-RPROVIDES_${PN} = "weston-ini"
-RCONFLICTS_${PN} = "${PN}-landscape"
-ALTERNATIVE_${PN} = "weston.ini"
+RDEPENDS:${PN} = "weston-init"
+RPROVIDES:${PN} = "weston-ini"
+RCONFLICTS:${PN} = "${PN}-landscape"
+ALTERNATIVE:${PN} = "weston.ini"
ALTERNATIVE_TARGET_${PN} = "${weston_ini_dir}/weston.ini.default"
PACKAGE_BEFORE_PN += "${PN}-landscape"
-FILES_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
+FILES:${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
-RDEPENDS_${PN}-landscape = "weston-init"
-RPROVIDES_${PN}-landscape = "weston-ini"
-RCONFLICTS_${PN}-landscape = "${PN}"
-ALTERNATIVE_${PN}-landscape = "weston.ini"
+RDEPENDS:${PN}-landscape = "weston-init"
+RPROVIDES:${PN}-landscape = "weston-ini"
+RCONFLICTS:${PN}-landscape = "${PN}"
+ALTERNATIVE:${PN}-landscape = "weston.ini"
ALTERNATIVE_TARGET_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
PACKAGE_BEFORE_PN += "${PN}-landscape-inverted"
-FILES_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted"
+FILES:${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted"
-RDEPENDS_${PN}-landscape-inverted = "weston-init"
-RPROVIDES_${PN}-landscape-inverted = "weston-ini"
-RCONFLICTS_${PN}-landscape-inverted = "${PN}"
-ALTERNATIVE_${PN}-landscape-inverted = "weston.ini"
+RDEPENDS:${PN}-landscape-inverted = "weston-init"
+RPROVIDES:${PN}-landscape-inverted = "weston-ini"
+RCONFLICTS:${PN}-landscape-inverted = "${PN}"
+ALTERNATIVE:${PN}-landscape-inverted = "weston.ini"
ALTERNATIVE_TARGET_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted"
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
index 88590c602..c4cf6c152 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-WESTON_DISPLAYS_append = "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", " remote-output", "", d)}"
-WESTON_DISPLAYS_append = "${@bb.utils.contains("AGL_FEATURES", "waltham-remoting", " transmitter-output", "", d)}"
+WESTON_DISPLAYS:append = "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", " remote-output", "", d)}"
+WESTON_DISPLAYS:append = "${@bb.utils.contains("AGL_FEATURES", "waltham-remoting", " transmitter-output", "", d)}"
# For virtual machines and intel-corei7-64 we want to support both the HDMI-A-1
# and Virtual-1 outputs. This allows us to run virtual images on real hardware
# and vice versa.
-WESTON_DISPLAYS_append_qemuall = " virtual-270"
-WESTON_DISPLAYS_append_intel-corei7-64 = " virtual-270"
+WESTON_DISPLAYS:append:qemuall = " virtual-270"
+WESTON_DISPLAYS:append:intel-corei7-64 = " virtual-270"
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc
index fc6ab5d97..896f1eafb 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc
+++ b/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc
@@ -1,8 +1,8 @@
SYSTEMD_AUTO_ENABLE = "enable"
-do_install_append() {
+do_install:append() {
# Remove upstream weston.ini to avoid conflict with weston-ini-conf package
rm -f ${D}${sysconfdir}/xdg/weston/weston.ini
}
-RDEPENDS_${PN} += "weston-ini"
+RDEPENDS:${PN} += "weston-ini"
diff --git a/meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch b/meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch
new file mode 100644
index 000000000..582a33161
--- /dev/null
+++ b/meta-agl-core/recipes-graphics/wayland/weston/0001-gl-renderer-Avoid-double-free-on-init-failure.patch
@@ -0,0 +1,33 @@
+From d76947b6668e0fabe0a4551ac6c2c978f93768cd Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels@collabora.com>
+Upstream-Status: Backport
+Date: Mon, 3 Feb 2020 20:01:21 +0000
+Subject: [PATCH] gl-renderer: Avoid double-free on init failure
+
+If gl-renderer fails its initialisation, we return to compositor
+teardown, which will try to free the renderer if ec->renderer was set.
+This is unfortunate when we've already torn it down whilst failing
+gl-renderer init, so just clear the renderer member so we don't try to
+tear down twice.
+
+Signed-off-by: Daniel Stone <daniels@collabora.com>
+Reported-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ libweston/renderer-gl/gl-renderer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
+index a40db3607..79285c008 100644
+--- a/libweston/renderer-gl/gl-renderer.c
++++ b/libweston/renderer-gl/gl-renderer.c
+@@ -3596,6 +3596,7 @@ fail_terminate:
+ eglTerminate(gr->egl_display);
+ fail:
+ free(gr);
++ ec->renderer = NULL;
+ return -1;
+ }
+
+--
+2.33.0
+
diff --git a/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
new file mode 100644
index 000000000..4771f689d
--- /dev/null
+++ b/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
@@ -0,0 +1,49 @@
+From bd108ca84767a339c274ad0b56d74b46b3888c38 Mon Sep 17 00:00:00 2001
+From: Marius Vlad <marius.vlad@collabora.com>
+Date: Thu, 1 Apr 2021 00:12:00 +0300
+Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at
+ DRM-backend tear down
+
+Tearing down the drm-backend when there are no input devices, would call
+for the gbm device destruction before compositor shutdown. The latter
+would call into the renderer detroy function and assume that the
+EGLDisplay, which was created using the before-mentioned gbm device, is
+still available. This patch re-orders the gbm destruction after the
+compositor shutdown when no one would make use of it.
+
+Fixes: #314
+
+Upstream-Status: Backport
+Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
+Suggested-by: Daniel Stone <daniel.stone@collabora.com>
+
+---
+ libweston/backend-drm/drm.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
+index be2570b..3cb41bf 100644
+--- a/libweston/backend-drm/drm.c
++++ b/libweston/backend-drm/drm.c
+@@ -2992,10 +2992,6 @@ err_drm_source:
+ err_udev_input:
+ udev_input_destroy(&b->input);
+ err_sprite:
+-#ifdef BUILD_DRM_GBM
+- if (b->gbm)
+- gbm_device_destroy(b->gbm);
+-#endif
+ destroy_sprites(b);
+ err_udev_dev:
+ udev_device_unref(drm_device);
+@@ -3005,6 +3001,10 @@ err_launcher:
+ weston_launcher_destroy(compositor->launcher);
+ err_compositor:
+ weston_compositor_shutdown(compositor);
++#ifdef BUILD_DRM_GBM
++ if (b->gbm)
++ gbm_device_destroy(b->gbm);
++#endif
+ free(b);
+ return NULL;
+ }
diff --git a/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc
index d29d09f7f..c81b35545 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc
+++ b/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc
@@ -1,14 +1,16 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/weston"
+FILESEXTRAPATHS:append := ":${THISDIR}/weston"
-SRC_URI_append = "\
+SRC_URI:append = "\
file://0005-correctly-tear-down-drm-backend.patch \
+ file://0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch \
+ file://0001-gl-renderer-Avoid-double-free-on-init-failure.patch \
"
# Workaround for incorrect upstream definition
PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base"
PACKAGECONFIG[headless] = "-Dbackend-headless=true"
-PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}"
-PACKAGECONFIG_append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', ' remoting', '', d)}"
+PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}"
+PACKAGECONFIG:append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', ' remoting', '', d)}"
# seat management is only for waltham-transmitter-plugin
-SRC_URI_append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'file://0001-libweston-Migrate-weston_seat_init-release-to-public.patch', '', d)}"
+SRC_URI:append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'file://0001-libweston-Migrate-weston_seat_init-release-to-public.patch', '', d)}"
diff --git a/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc b/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc
index 52fe69d24..39289fef7 100644
--- a/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc
+++ b/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc
@@ -1,5 +1,5 @@
# fix for kernel using hardcoded awk while our filesystem only provides gawk
-do_install_append() {
+do_install:append() {
# enforce all scripts to use /usr/bin/awk . This fixes the rpm dependency failure on install of kernel-devsrc
cd ${D} || true
( for i in `grep -srI "\!/bin/awk" | cut -d":" -f1 ` ; do sed -i -e "s#\!/bin/awk#\!/usr/bin/env awk#g" $i ; done ) || true
diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc
index 6d5c67021..8476f343b 100644
--- a/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc
+++ b/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc
@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.14:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-4.14:"
#-------------------------------------------------------------------------
# smack patches for kernels keys
-SRC_URI_append_with-lsm-smack = "\
+SRC_URI:append:with-lsm-smack = "\
file://Smack-Privilege-check-on-key-operations.patch \
file://Smack-Handle-CGROUP2-in-the-same-way-that-CGROUP.patch \
"
-SRC_URI_append = "\
+SRC_URI:append = "\
file://net-sch_generic-add-if_afp.h-header-to-get-ARPHRD_CA.patch \
file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch \
"
diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc
index da4e0c067..1ea476426 100644
--- a/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc
+++ b/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.19:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-4.19:"
-SRC_URI_append = "\
+SRC_URI:append = "\
file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch \
"
diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc
index 4003dd970..a5e9c375a 100644
--- a/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc
+++ b/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc
@@ -22,14 +22,14 @@
# perspective) AGL additions.
#
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
# NOTE: AGL_KERNEL_SRC is explicitly intended as an intermediate variable
# that can be used as a last resort to completely disable all AGL
# additions, modifying or appending it is not recommended.
AGL_KERNEL_SRC ?= "${@' '.join(['file://' + x for x in d.getVar('AGL_KCONFIG_FRAGMENTS').split()])}"
-SRC_URI_append = " ${AGL_KERNEL_SRC}"
+SRC_URI:append = " ${AGL_KERNEL_SRC}"
# For meta-ti and meta-qcom
KERNEL_CONFIG_FRAGMENTS ?= "${@' '.join(['${WORKDIR}/' + x for x in d.getVar('AGL_KCONFIG_FRAGMENTS').split()])}"
@@ -54,29 +54,29 @@ AGL_KCONFIG_FRAGMENTS += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '
#
# Enable required features for the agl-netboot feature
-AGL_KCONFIG_FRAGMENTS_append_netboot = " \
+AGL_KCONFIG_FRAGMENTS:append:netboot = " \
nbd.cfg \
ramdisk.cfg \
"
# Add hda audio and required virtio device support for qemu
-AGL_KCONFIG_FRAGMENTS_append_qemuall = " \
+AGL_KCONFIG_FRAGMENTS:append:qemuall = " \
sound-hda.cfg \
qemu-virtio.cfg \
qemu-drm.cfg \
"
# Configuration for using the ARM virt machine (and not versatilepb)
-AGL_KCONFIG_FRAGMENTS_append_qemuarm = " qemuarm.cfg"
+AGL_KCONFIG_FRAGMENTS:append:qemuarm = " qemuarm.cfg"
# Additional drivers for virtual machines
# OVERRIDES save us some c'n'p below ...
-OVERRIDES_prepend_qemux86 = "virtualmachine:"
-OVERRIDES_prepend_qemux86-64 = "virtualmachine:"
-AGL_KCONFIG_FRAGMENTS_append_virtualmachine = " vbox-vmware-sata.cfg"
+OVERRIDES:prepend:qemux86 = "virtualmachine:"
+OVERRIDES:prepend:qemux86-64 = "virtualmachine:"
+AGL_KCONFIG_FRAGMENTS:append_virtualmachine = " vbox-vmware-sata.cfg"
# Extra configuration for using qemux86-64 image on physical hardware
-AGL_KCONFIG_FRAGMENTS_append_qemux86-64 = " \
+AGL_KCONFIG_FRAGMENTS:append:qemux86-64 = " \
x86-extra-graphic-devices.cfg \
x86-net-devices.cfg \
x86-security-tpm.cfg \
diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl.inc b/meta-agl-core/recipes-kernel/linux/linux-agl.inc
index 547c23987..c318716fe 100644
--- a/meta-agl-core/recipes-kernel/linux/linux-agl.inc
+++ b/meta-agl-core/recipes-kernel/linux/linux-agl.inc
@@ -15,7 +15,7 @@ def find_cfgs(d):
return sources_list
-do_configure_append () {
+do_configure:append () {
if [ -n "${AGL_KCONFIG_FRAGMENTS}" ]; then
[ ! -f .config ] && cp -a ${WORKDIR}/defconfig .config
merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
diff --git a/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc b/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc
index dd4e8e87c..8628731cb 100644
--- a/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc
+++ b/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc
@@ -4,9 +4,9 @@ include linux-agl-config.inc
# For qemuarm, build a generic v7 kernel instead of the arm926j one that
# upstream qemuarm defaults to.
-KBUILD_DEFCONFIG_qemuarm = "multi_v7_defconfig"
+KBUILD_DEFCONFIG:qemuarm = "multi_v7_defconfig"
# Use alldefconfig for the qemu targets, but let other kernel-yocto
# based BSPs use their own defaults (note that linux-renesas and
# linux-raspberrypi also default to alldefconfig).
-KCONFIG_MODE_qemuall = "--alldefconfig"
+KCONFIG_MODE:qemuall = "--alldefconfig"
diff --git a/meta-agl-core/recipes-platform/images/agl-image-boot.bb b/meta-agl-core/recipes-platform/images/agl-image-boot.bb
index 84cdbcf31..6e2b89324 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-boot.bb
+++ b/meta-agl-core/recipes-platform/images/agl-image-boot.bb
@@ -4,6 +4,6 @@ require agl-image-boot.inc
LICENSE = "MIT"
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL:append = "\
packagegroup-agl-image-boot \
"
diff --git a/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb b/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb
index 866d98177..3a887a5c0 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb
+++ b/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb
@@ -4,7 +4,7 @@ require agl-image-weston.inc
LICENSE = "MIT"
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL:append = "\
packagegroup-agl-profile-graphical \
busybox \
psplash \
diff --git a/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc b/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc
index a69e698a1..8695d8d4b 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc
+++ b/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc
@@ -1,5 +1,5 @@
-IMAGE_FEATURES_append = " dev-pkgs"
-IMAGE_INSTALL_append = " kernel-dev kernel-devsrc"
+IMAGE_FEATURES:append = " dev-pkgs"
+IMAGE_INSTALL:append = " kernel-dev kernel-devsrc"
@@ -8,7 +8,7 @@ IMAGE_INSTALL_append = " kernel-dev kernel-devsrc"
# FIXME:
# Always include the test widgets
-#IMAGE_FEATURES_append = " agl-test-wgt"
+#IMAGE_FEATURES:append = " agl-test-wgt"
#
# Required dependencies for app and test builds
#TOOLCHAIN_HOST_TASK += " \
diff --git a/meta-agl-core/recipes-platform/images/agl-image-minimal.bb b/meta-agl-core/recipes-platform/images/agl-image-minimal.bb
index 1fd213d0f..52cc06aeb 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-minimal.bb
+++ b/meta-agl-core/recipes-platform/images/agl-image-minimal.bb
@@ -4,6 +4,6 @@ require agl-image-minimal.inc
LICENSE = "MIT"
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL:append = "\
packagegroup-agl-image-minimal \
"
diff --git a/meta-agl-core/recipes-platform/images/agl-image-weston.bb b/meta-agl-core/recipes-platform/images/agl-image-weston.bb
index bbb61c922..7e9f8814e 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-weston.bb
+++ b/meta-agl-core/recipes-platform/images/agl-image-weston.bb
@@ -4,6 +4,6 @@ require agl-image-weston.inc
LICENSE = "MIT"
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL:append = "\
packagegroup-agl-profile-graphical \
"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb
index 2717dd153..fe1ee7b8c 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb
@@ -14,12 +14,12 @@ inherit packagegroup
# Disto can override
VIRTUAL-RUNTIME_rngd ?= "rng-tools"
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
packagegroup-core-boot \
${VIRTUAL-RUNTIME_rngd} \
"
-RRECOMMENDS_${PN} = "\
+RRECOMMENDS:${PN} = "\
tzdata \
"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
index b4fe577a0..5dd274026 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
@@ -7,11 +7,11 @@ PACKAGES = "\
packagegroup-agl-core-connectivity \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
PKGGROUP_ZEROCONF = "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '', d)}"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests \
connman-tools connman-ncurses' ,'',d)} \
${@bb.utils.contains('AGL_FEATURES', 'agl-devel', '${PKGGROUP_ZEROCONF}', '', d)} \
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb
index 3909f0351..f3e2a9eff 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
inherit packagegroup
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
strace \
ldd \
less \
@@ -22,7 +22,7 @@ RDEPENDS_${PN} = "\
"
# needs meta-oe present
-#RRECOMMENDS_${PN} = "\
+#RRECOMMENDS:${PN} = "\
# jq \
# htop \
# tree \
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb
index aef732838..0ee63e82a 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb
@@ -8,7 +8,7 @@ PACKAGES = "\
packagegroup-agl-core-os-commonlibs \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb
index 0ae5c77a3..7532f4cd7 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb
@@ -8,7 +8,7 @@ PACKAGES = "\
packagegroup-agl-core-security \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb
index cd37cb7d5..f9903d942 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb
@@ -10,7 +10,7 @@ PACKAGES = "\
packagegroup-agl-graphical-multimedia \
"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
alsa-utils \
gstreamer1.0-meta-base \
"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
index 6d3435d99..859303049 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
@@ -7,9 +7,9 @@ PACKAGES = "\
packagegroup-agl-graphical-weston \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
weston \
weston-init \
weston-examples \
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb
index afa04e7a1..8b2cfbb31 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb
@@ -7,12 +7,12 @@ PACKAGES = "\
packagegroup-agl-image-boot \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
packagegroup-agl-core-boot \
packagegroup-machine-base \
"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
index 45107ed9c..1a51a9bf1 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
@@ -8,17 +8,17 @@ PACKAGES = "\
profile-agl-minimal \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
packagegroup-agl-core-boot \
packagegroup-machine-base \
"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
packagegroup-agl-core-connectivity \
packagegroup-agl-core-os-commonlibs \
packagegroup-agl-core-security \
"
-RDEPENDS_profile-agl-minimal = "${PN}"
+RDEPENDS:profile-agl-minimal = "${PN}"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
index bfc5e19e8..2b708603b 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
@@ -9,9 +9,9 @@ PACKAGES = "\
profile-graphical \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
packagegroup-agl-image-minimal \
packagegroup-agl-graphical-weston \
packagegroup-agl-graphical-multimedia \
@@ -19,4 +19,4 @@ RDEPENDS_${PN} += "\
# FIXME: Removed due to issues building against weston 5.0.0:
# waltham-transmitter
-RDEPENDS_profile-graphical = "${PN}"
+RDEPENDS:profile-graphical = "${PN}"
diff --git a/meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc b/meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc
index 1dcbe0b7b..593ad13a6 100644
--- a/meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc
+++ b/meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/ptest-runner:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/ptest-runner:"
SRC_URI += "file://0007-WIP-Initial-LAVA-support.patch"
diff --git a/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh b/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh
index 93403b974..fec73069e 100755
--- a/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh
+++ b/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh
@@ -20,8 +20,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= ""
# important settings imported from poky-agl.conf
# we do not import
-DISTRO_FEATURES_append = " systemd smack"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd smack"
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
# workaround:
diff --git a/meta-agl-core/scripts/run-yocto-check-layer.sh b/meta-agl-core/scripts/run-yocto-check-layer.sh
index 9082be920..369ed98b4 100755
--- a/meta-agl-core/scripts/run-yocto-check-layer.sh
+++ b/meta-agl-core/scripts/run-yocto-check-layer.sh
@@ -20,8 +20,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= ""
# important settings imported from poky-agl.conf
# we do not import
-DISTRO_FEATURES_append = " systemd smack"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd smack"
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
# workaround:
diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index 00d3f9744..f42c282a7 100644
--- a/meta-app-framework/classes/aglwgt.bbclass
+++ b/meta-app-framework/classes/aglwgt.bbclass
@@ -9,16 +9,16 @@
#
# 'wgtpkg-pack' in af-main-native is required.
-DEPENDS_append = " af-main-native"
+DEPENDS:append = " af-main-native"
# for bindings af-binder is required.
-DEPENDS_append = " af-binder"
+DEPENDS:append = " af-binder"
# for bindings that use the cmake-apps-module
-DEPENDS_append = " cmake-apps-module-native"
+DEPENDS:append = " cmake-apps-module-native"
# for hal bindings genskel is required.
-DEPENDS_append = " af-binder-devtools-native"
+DEPENDS:append = " af-binder-devtools-native"
# Re-enable strip for qmake based projects (default value is "echo")
OE_QMAKE_STRIP = "${STRIP}"
@@ -47,8 +47,8 @@ AGLWGT_AUTOINSTALL ?= "1"
# Signature keys
# These are default keys for development purposes !
# Change it for production.
-WGTPKG_AUTOSIGN_0_agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/developer.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/developer.cert.pem"
-WGTPKG_AUTOSIGN_1_agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/platform.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/platform.cert.pem"
+WGTPKG_AUTOSIGN_0:agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/developer.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/developer.cert.pem"
+WGTPKG_AUTOSIGN_1:agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/platform.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/platform.cert.pem"
export WGTPKG_AUTOSIGN_0
export WGTPKG_AUTOSIGN_1
@@ -169,17 +169,17 @@ EOF
PACKAGES += "${PN}-test ${PN}-debug ${PN}-coverage"
-FILES_${PN} += " \
+FILES:${PN} += " \
/usr/AGL/apps/release/*.wgt \
/usr/AGL/apps/autoinstall \
/usr/AGL/apps/manualinstall \
${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} \
"
-FILES_${PN}-test = "/usr/AGL/apps/test/*.wgt"
-FILES_${PN}-debug = "/usr/AGL/apps/debug/*.wgt"
-FILES_${PN}-coverage = "/usr/AGL/apps/coverage/*.wgt"
+FILES:${PN}-test = "/usr/AGL/apps/test/*.wgt"
+FILES:${PN}-debug = "/usr/AGL/apps/debug/*.wgt"
+FILES:${PN}-coverage = "/usr/AGL/apps/coverage/*.wgt"
# Test widgets need the parent widget and the test framework
-RDEPENDS_${PN}-test = "${PN} afb-test"
+RDEPENDS:${PN}-test = "${PN} afb-test"
EXPORT_FUNCTIONS do_configure do_compile do_install
diff --git a/meta-app-framework/conf/include/agl-appfw-smack.inc b/meta-app-framework/conf/include/agl-appfw-smack.inc
index 831368a31..f22fe715c 100644
--- a/meta-app-framework/conf/include/agl-appfw-smack.inc
+++ b/meta-app-framework/conf/include/agl-appfw-smack.inc
@@ -1,7 +1,7 @@
# enable security features (smack, cynagora) - required by Application Framework
OVERRIDES .= ":with-lsm-smack"
-DISTRO_FEATURES_append = " smack xattr"
-DISTRO_FEATURES_NATIVE_append = " smack xattr"
+DISTRO_FEATURES:append = " smack xattr"
+DISTRO_FEATURES_NATIVE:append = " smack xattr"
APPFW_ENABLED = "1"
@@ -14,11 +14,11 @@ EXTRANATIVEPATH += "tar-native"
IMAGE_FEATURES += "ssh-server-openssh"
# enforce copy of xattrs (to be removed, see SPEC-475)
-PACKAGECONFIG_append_pn-shadow = " attr"
-PACKAGECONFIG_append_pn-shadow-native = " attr"
+PACKAGECONFIG:append:pn-shadow = " attr"
+PACKAGECONFIG:append:pn-shadow-native = " attr"
# set the home directory for root
ROOT_HOME = "/home/0"
# include devel wgts in images
-IMAGE_FEATURES_append = " agl-devel-wgt"
+IMAGE_FEATURES:append = " agl-devel-wgt"
diff --git a/meta-app-framework/conf/include/agl-sign-wgts.inc b/meta-app-framework/conf/include/agl-sign-wgts.inc
index d56c01288..06a7abac0 100644
--- a/meta-app-framework/conf/include/agl-sign-wgts.inc
+++ b/meta-app-framework/conf/include/agl-sign-wgts.inc
@@ -1,3 +1,3 @@
# allows insertion of code or items specific to developement
OVERRIDES .= ":agl-sign-wgts"
-AGL_FEATURES_append = " agl-sign-wgts"
+AGL_FEATURES:append = " agl-sign-wgts"
diff --git a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc
index 423f15fdb..52d3f0e92 100644
--- a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc
+++ b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc
@@ -1,4 +1,4 @@
-RDEPENDS_${PN}_append = "\
+RDEPENDS:${PN}:append = "\
smack-system-setup \
xmlsec1 \
cynagora \
diff --git a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc
index b3383f114..2499c07b5 100644
--- a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc
+++ b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc
@@ -1,3 +1,3 @@
-RDEPENDS_${PN}_append = "\
+RDEPENDS:${PN}:append = "\
packagegroup-agl-app-framework \
"
diff --git a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc
index b3383f114..2499c07b5 100644
--- a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc
+++ b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc
@@ -1,3 +1,3 @@
-RDEPENDS_${PN}_append = "\
+RDEPENDS:${PN}:append = "\
packagegroup-agl-app-framework \
"
diff --git a/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb b/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb
index 802167b2d..afbbc09b3 100644
--- a/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb
+++ b/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb
@@ -1,11 +1,11 @@
require recipes-devtools/libafb-helpers/libafb-helpers_git.inc
-DEPENDS_append = " qtwebsockets"
-RDEPENDS_${PN}_append = " af-binder"
+DEPENDS:append = " qtwebsockets"
+RDEPENDS:${PN}:append = " af-binder"
inherit cmake_qt5
-EXTRA_OECMAKE_append = " -DAFB_HELPERS_QT=ON -DAFB_HELPERS=OFF"
+EXTRA_OECMAKE:append = " -DAFB_HELPERS_QT=ON -DAFB_HELPERS=OFF"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb b/meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb
index 2f0f01fec..853627622 100644
--- a/meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb
+++ b/meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb
@@ -9,8 +9,8 @@ PACKAGES = "\
packagegroup-agl-appfw-qt5 \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
packagegroup-agl-appfw-native \
" \ No newline at end of file
diff --git a/meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc b/meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc
index 21529e96b..7b74de980 100644
--- a/meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc
+++ b/meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc
@@ -42,14 +42,14 @@
# The related patch has been submitted to upstream too.
# upstream link: http://permalink.gmane.org/gmane.linux.bluez.kernel/67993
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI_append_with-lsm-smack = "\
+SRC_URI:append:with-lsm-smack = "\
file://bluetooth.service.conf \
"
-FILES_${PN}_append = " ${systemd_unitdir}"
+FILES:${PN}:append = " ${systemd_unitdir}"
-do_install_append_with-lsm-smack() {
+do_install:append:with-lsm-smack() {
install -Dm0644 ${WORKDIR}/bluetooth.service.conf ${D}${systemd_unitdir}/system/bluetooth.service.d/smack.conf
}
diff --git a/meta-app-framework/recipes-connectivity/connman/connman_appfw.inc b/meta-app-framework/recipes-connectivity/connman/connman_appfw.inc
index 23af33104..644602021 100644
--- a/meta-app-framework/recipes-connectivity/connman/connman_appfw.inc
+++ b/meta-app-framework/recipes-connectivity/connman/connman_appfw.inc
@@ -19,16 +19,16 @@
# in which connmand runs, this change is not submitted upstream
# and it can be overridden by a distro via FIX_CONNMAN_CAPABILITIES.
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI_append_with-lsm-smack = "\
+SRC_URI:append:with-lsm-smack = "\
file://connman.service.conf \
"
-RDEPENDS_${PN}_append_with-lsm-smack = " smack"
+RDEPENDS:${PN}:append:with-lsm-smack = " smack"
-FILES_${PN}_append = " ${systemd_unitdir}"
+FILES:${PN}:append = " ${systemd_unitdir}"
-do_install_append_with-lsm-smack() {
+do_install:append:with-lsm-smack() {
install -Dm0644 ${WORKDIR}/connman.service.conf ${D}${systemd_unitdir}/system/connman.service.d/smack.conf
}
diff --git a/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb
index 70dafb38c..1331fb886 100644
--- a/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb
+++ b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb
@@ -4,5 +4,5 @@ DEPENDS = "json-c-native"
inherit cmake pkgconfig native
-EXTRA_OECMAKE_append = " -DONLY_DEVTOOLS=TRUE"
+EXTRA_OECMAKE:append = " -DONLY_DEVTOOLS=TRUE"
diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_git.bb b/meta-app-framework/recipes-core/af-binder/af-binder_git.bb
index cf20e25a1..4728e47ea 100644
--- a/meta-app-framework/recipes-core/af-binder/af-binder_git.bb
+++ b/meta-app-framework/recipes-core/af-binder/af-binder_git.bb
@@ -4,21 +4,21 @@ DEPENDS = "file json-c libmicrohttpd systemd util-linux openssl cynara"
inherit cmake pkgconfig
-EXTRA_OECMAKE_append_class-target = "\
+EXTRA_OECMAKE:append:class-target = "\
-DUNITDIR_SYSTEM=${systemd_system_unitdir} \
"
-EXTRA_OECMAKE_append_agl-devel = " \
+EXTRA_OECMAKE:append:agl-devel = " \
-DAGL_DEVEL=ON \
-DINCLUDE_MONITORING=ON \
-DINCLUDE_SUPERVISOR=ON -DAFS_SUPERVISION_SOCKET=/run/platform/supervisor \
"
-pkg_postinst_${PN}() {
+pkg_postinst:${PN}() {
mkdir -p "$D${libdir}/afb"
}
-do_install_append_agl-devel_class-target() {
+do_install:append:agl-devel:class-target() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d -m 0755 ${D}${systemd_system_unitdir}/multi-user.target.wants
ln -s ../afm-api-supervisor.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-api-supervisor.service
@@ -29,19 +29,19 @@ do_install_append_agl-devel_class-target() {
# main package
#############################################
-FILES_${PN}_append_agl-devel = " ${libdir}/afb/monitoring ${systemd_system_unitdir}"
+FILES:${PN}:append:agl-devel = " ${libdir}/afb/monitoring ${systemd_system_unitdir}"
-RDEPENDS_${PN}-dev += "libafbwsc-dev"
+RDEPENDS:${PN}-dev += "libafbwsc-dev"
#############################################
# intrinsic binding packages
#############################################
PACKAGES =+ "${PN}-intrinsic-bindings"
-ALLOW_EMPTY_${PN}-intrinsic-bindings = "1"
+ALLOW_EMPTY:${PN}-intrinsic-bindings = "1"
PACKAGES_DYNAMIC = "${PN}-binding-*"
-python populate_packages_prepend () {
+python populate_packages:prepend () {
afb_libdir = d.expand('${libdir}/afb')
postinst = d.getVar('binding_postinst', True)
pkgs = []
@@ -49,7 +49,7 @@ python populate_packages_prepend () {
pkgs += do_split_packages(d, afb_libdir, '(.*)-api\.so$', d.expand('${PN}-binding-%s'), 'AFB binding for %s', postinst=postinst, extra_depends=d.expand('${PN}'))
pkgs += do_split_packages(d, afb_libdir, '(.*(?!-api))\.so$', d.expand('${PN}-binding-%s'), 'AFB binding for %s', postinst=postinst, extra_depends=d.expand('${PN}'))
- d.setVar('RDEPENDS_' + d.getVar('PN', True) + '-intrinsic-bindings', ' '.join(pkgs))
+ d.setVar('RDEPENDS:' + d.getVar('PN', True) + '-intrinsic-bindings', ' '.join(pkgs))
}
#############################################
@@ -57,7 +57,7 @@ python populate_packages_prepend () {
#############################################
PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools = "\
+FILES:${PN}-tools = "\
${bindir}/afb-client-demo \
"
@@ -66,10 +66,10 @@ FILES_${PN}-tools = "\
#############################################
PACKAGES =+ "libafbwsc libafbwsc-dev"
-FILES_libafbwsc = "\
+FILES:libafbwsc = "\
${libdir}/libafbwsc.so.* \
"
-FILES_libafbwsc-dev = "\
+FILES:libafbwsc-dev = "\
${includedir}/afb/afb-wsj1.h \
${includedir}/afb/afb-ws-client.h \
${libdir}/libafbwsc.so \
@@ -81,7 +81,7 @@ FILES_libafbwsc-dev = "\
#############################################
PACKAGES =+ "${PN}-devtools"
-FILES_${PN}-devtools = "\
+FILES:${PN}-devtools = "\
${bindir}/afb-exprefs \
${bindir}/afb-json2c \
${bindir}/afb-genskel \
@@ -90,9 +90,9 @@ FILES_${PN}-devtools = "\
#############################################
# supervisor package
#############################################
-PACKAGES_append_agl-devel = " ${PN}-supervisor "
+PACKAGES:append:agl-devel = " ${PN}-supervisor "
-FILES_${PN}-supervisor_agl-devel = "\
+FILES:${PN}-supervisor:agl-devel = "\
${bindir}/afs-supervisor \
${systemd_system_unitdir} \
"
@@ -102,7 +102,7 @@ FILES_${PN}-supervisor_agl-devel = "\
#############################################
PACKAGES =+ "${PN}-samples"
-FILES_${PN}-samples = "\
+FILES:${PN}-samples = "\
${datadir}/af-binder \
"
@@ -110,8 +110,8 @@ FILES_${PN}-samples = "\
# meta package
#############################################
PACKAGES =+ "${PN}-meta"
-ALLOW_EMPTY_${PN}-meta = "1"
+ALLOW_EMPTY:${PN}-meta = "1"
-RDEPENDS_${PN}-meta += "${PN} ${PN}-tools libafbwsc ${PN}-intrinsic-bindings"
-RDEPENDS_${PN}-meta_append_agl-devel = " ${PN}-supervisor "
+RDEPENDS:${PN}-meta += "${PN} ${PN}-tools libafbwsc ${PN}-intrinsic-bindings"
+RDEPENDS:${PN}-meta:append:agl-devel = " ${PN}-supervisor "
diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_git.inc b/meta-app-framework/recipes-core/af-binder/af-binder_git.inc
index fbaa47bc7..2908e5dca 100644
--- a/meta-app-framework/recipes-core/af-binder/af-binder_git.inc
+++ b/meta-app-framework/recipes-core/af-binder/af-binder_git.inc
@@ -14,9 +14,9 @@ PV = "${AGL_BRANCH}+git${SRCPV}"
S = "${WORKDIR}/git"
-CFLAGS_append_agl-devel = " -DAGL_DEVEL"
+CFLAGS:append:agl-devel = " -DAGL_DEVEL"
-EXTRA_OECMAKE_append = "\
+EXTRA_OECMAKE:append = "\
-DAGLVERSION=${AGLVERSION} \
"
diff --git a/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb
index 3223dd05d..334d073c2 100644
--- a/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb
+++ b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb
@@ -4,5 +4,5 @@ DEPENDS = "nativesdk-json-c"
inherit cmake pkgconfig nativesdk
-EXTRA_OECMAKE_append = " -DONLY_DEVTOOLS=TRUE"
+EXTRA_OECMAKE:append = " -DONLY_DEVTOOLS=TRUE"
diff --git a/meta-app-framework/recipes-core/af-main/af-main_git.bb b/meta-app-framework/recipes-core/af-main/af-main_git.bb
index 917eaa414..8e72e4572 100644
--- a/meta-app-framework/recipes-core/af-main/af-main_git.bb
+++ b/meta-app-framework/recipes-core/af-main/af-main_git.bb
@@ -11,12 +11,12 @@ BBCLASSEXTEND = "native"
SECTION = "base"
DEPENDS = "openssl libxml2 xmlsec1 systemd libzip json-c systemd security-manager af-binder sed m4"
-DEPENDS_class-native = "openssl libxml2 xmlsec1 libzip json-c"
-RDEPENDS_${PN}_class-target += "af-binder-tools nss-localuser cynagoauth"
+DEPENDS:class-native = "openssl libxml2 xmlsec1 libzip json-c"
+RDEPENDS:${PN}:class-target += "af-binder-tools nss-localuser cynagoauth"
-PACKAGE_WRITE_DEPS_append_with-lsm-smack = " smack-native libcap-native"
+PACKAGE_WRITE_DEPS:append:with-lsm-smack = " smack-native libcap-native"
-EXTRA_OECMAKE_append_class-native = "\
+EXTRA_OECMAKE:append:class-native = "\
-DUSE_LIBZIP=1 \
-DUSE_SIMULATION=1 \
-DUSE_SDK=1 \
@@ -26,7 +26,7 @@ EXTRA_OECMAKE_append_class-native = "\
-Dafm_datadir=${afm_datadir} \
"
-EXTRA_OECMAKE_append_class-target = "\
+EXTRA_OECMAKE:append:class-target = "\
-DUSE_LIBZIP=1 \
-DUSE_SIMULATION=0 \
-DUSE_SDK=0 \
@@ -52,23 +52,23 @@ EXTRA_OECMAKE_append_class-target = "\
AGL_FORBID_UNSIGNED_APPS ?= "0"
#
# WORKAROUND:
-EXTRA_OECMAKE_append_agl-devel = " -DAGL_DEVEL=1"
-EXTRA_OECMAKE_append = " ${@bb.utils.contains('AGL_FORBID_UNSIGNED_APPS','1','','-DALLOW_NO_SIGNATURE=ON', d)}"
+EXTRA_OECMAKE:append:agl-devel = " -DAGL_DEVEL=1"
+EXTRA_OECMAKE:append = " ${@bb.utils.contains('AGL_FORBID_UNSIGNED_APPS','1','','-DALLOW_NO_SIGNATURE=ON', d)}"
#
# Correct version (IMPORTANT TODO: to be restored later):
-#EXTRA_OECMAKE_append_agl-devel = " -DAGL_DEVEL=1 -DALLOW_NO_SIGNATURE=ON"
+#EXTRA_OECMAKE:append:agl-devel = " -DAGL_DEVEL=1 -DALLOW_NO_SIGNATURE=ON"
#
# ------------------------ WARNING WARNING WARNNING ---------------------------
USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --gid ${afm_name} --home-dir ${afm_datadir} ${afm_name}"
-GROUPADD_PARAM_${PN} = "--system ${afm_name}"
+USERADD_PARAM:${PN} = "--system --gid ${afm_name} --home-dir ${afm_datadir} ${afm_name}"
+GROUPADD_PARAM:${PN} = "--system ${afm_name}"
-RDEPENDS_${PN}_append_with-lsm-smack = " smack bash"
-DEPENDS_append_with-lsm-smack = " smack-native"
+RDEPENDS:${PN}:append:with-lsm-smack = " smack bash"
+DEPENDS:append:with-lsm-smack = " smack-native"
-do_install_append_class-target() {
+do_install:append:class-target() {
install -d ${D}${bindir}
install -d -m 0775 ${D}${systemd_units_root}/system
install -d -m 0775 "${D}${systemd_units_root}/system/multi-user.target.wants"
@@ -87,7 +87,7 @@ do_install_append_class-target() {
fi
}
-pkg_postinst_ontarget_${PN}() {
+pkg_postinst_ontarget:${PN}() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
chgrp ${afm_name} $D${systemd_units_root}/system
chgrp ${afm_name} $D${systemd_units_root}/system/afm-user-session@.target.wants
@@ -99,7 +99,7 @@ pkg_postinst_ontarget_${PN}() {
chown ${afm_name}:${afm_name} $D${afm_datadir}/icons
}
-pkg_postinst_ontarget_${PN}_append_with-lsm-smack() {
+pkg_postinst_ontarget:${PN}:append:with-lsm-smack() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
chsmack -a 'System::Shared' -t $D${systemd_units_root}/system
chsmack -a 'System::Shared' -t $D${systemd_units_root}/system/afm-user-session@.target.wants
@@ -110,13 +110,13 @@ pkg_postinst_ontarget_${PN}_append_with-lsm-smack() {
chsmack -a 'System::Shared' -t $D${afm_datadir}/applications
chsmack -a 'System::Shared' -t $D${afm_datadir}/icons
}
-FILES_${PN} += "${systemd_units_root}/* ${systemd_system_unitdir} ${systemd_user_unitdir}"
-FILES_${PN}_append_agl-sign-wgts = " ${datadir}/afm"
+FILES:${PN} += "${systemd_units_root}/* ${systemd_system_unitdir} ${systemd_user_unitdir}"
+FILES:${PN}:append:agl-sign-wgts = " ${datadir}/afm"
PACKAGES =+ "${PN}-binding ${PN}-binding-dbg"
-FILES_${PN}-binding = " ${afb_binding_dir}/afm-main-binding.so "
-FILES_${PN}-binding-dbg = " ${afb_binding_dir}/.debug/afm-main-binding.so "
+FILES:${PN}-binding = " ${afb_binding_dir}/afm-main-binding.so "
+FILES:${PN}-binding-dbg = " ${afb_binding_dir}/.debug/afm-main-binding.so "
PACKAGES =+ "${PN}-tools ${PN}-tools-dbg"
-FILES_${PN}-tools = "${bindir}/wgtpkg-*"
-FILES_${PN}-tools-dbg = "${bindir}/.debug/wgtpkg-*"
+FILES:${PN}-tools = "${bindir}/wgtpkg-*"
+FILES:${PN}-tools-dbg = "${bindir}/.debug/wgtpkg-*"
diff --git a/meta-app-framework/recipes-core/af-main/af-main_git.inc b/meta-app-framework/recipes-core/af-main/af-main_git.inc
index 5ac76a796..11d563a34 100644
--- a/meta-app-framework/recipes-core/af-main/af-main_git.inc
+++ b/meta-app-framework/recipes-core/af-main/af-main_git.inc
@@ -21,10 +21,10 @@ afm_datadir = "/var/local/lib/${afm_name}"
afb_binding_dir = "${libdir}/afb"
systemd_units_root = "/var/local/lib/systemd"
-CFLAGS_append_agl-devel = " -DAGL_DEVEL"
+CFLAGS:append:agl-devel = " -DAGL_DEVEL"
# only install sample keys in agl-devel mode
# for production you need to deploy real keys
-EXTRA_OECMAKE_append_agl-sign-wgts = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '-DINSTALL_SAMPLE_KEYS=ON', '-DINSTALL_SAMPLE_KEYS=OFF', d)}"
+EXTRA_OECMAKE:append:agl-sign-wgts = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '-DINSTALL_SAMPLE_KEYS=ON', '-DINSTALL_SAMPLE_KEYS=OFF', d)}"
diff --git a/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb b/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb
index 88ab4ae68..4564831a8 100644
--- a/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb
+++ b/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb
@@ -16,13 +16,12 @@ EXTRA_OECMAKE = "\
-Dafm_datadir=${afm_datadir} \
"
-do_install_append() {
+do_install:append() {
# remove unused .pc file we don't want to package
rm -rf ${D}/${libdir}
}
PACKAGES = "${PN}-tools ${PN}-tools-dbg"
-FILES_${PN}-tools = "${bindir}/wgtpkg-* ${afm_confdir}/*"
-FILES_${PN}-tools_append_agl-sign-wgts = " ${datadir}/afm"
-FILES_${PN}-tools-dbg = "${bindir}/.debug/wgtpkg-*"
-
+FILES:${PN}-tools = "${bindir}/wgtpkg-* ${afm_confdir}/*"
+FILES:${PN}-tools:append:agl-sign-wgts = " ${datadir}/afm"
+FILES:${PN}-tools-dbg = "${bindir}/.debug/wgtpkg-*"
diff --git a/meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb b/meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb
index eb473cd14..52c7a6534 100644
--- a/meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb
+++ b/meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb
@@ -13,4 +13,4 @@ do_install() {
install -m 0644 ${S}/udev-shared.conf $d
}
-FILES_${PN} = "${systemd_system_unitdir}"
+FILES:${PN} = "${systemd_system_unitdir}"
diff --git a/meta-app-framework/recipes-core/base-files/base-files_appfw.inc b/meta-app-framework/recipes-core/base-files/base-files_appfw.inc
index 848a39ff4..4c8301314 100644
--- a/meta-app-framework/recipes-core/base-files/base-files_appfw.inc
+++ b/meta-app-framework/recipes-core/base-files/base-files_appfw.inc
@@ -1,7 +1,7 @@
-RDEPENDS_${PN}_append_with-lsm-smack = " smack"
-PACKAGE_WRITE_DEPS_append_with-lsm-smack = " smack-native"
+RDEPENDS:${PN}:append:with-lsm-smack = " smack"
+PACKAGE_WRITE_DEPS:append:with-lsm-smack = " smack-native"
-do_install_append() {
+do_install:append() {
install -m 0700 -d ${D}/${sysconfdir}/skel
chmod -R 0700 ${D}/${sysconfdir}/skel
install -m 0700 -d ${D}/${sysconfdir}/skel/app-data
@@ -15,7 +15,7 @@ do_install_append() {
ln -s ../var/local ${D}/usr/local
}
-do_install_append_with-lsm-smack () {
+do_install:append:with-lsm-smack () {
install -d ${D}/${sysconfdir}/smack/accesses.d
cat > ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user <<EOF
System User::App-Shared rwxat
@@ -24,7 +24,7 @@ EOF
chmod 0644 ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user
}
-pkg_postinst_${PN}_append_with-lsm-smack() {
+pkg_postinst:${PN}:append:with-lsm-smack() {
chsmack -r -a 'User::Home' -t -D $D/${sysconfdir}/skel
chsmack -a 'User::App-Shared' -D $D/${sysconfdir}/skel/app-data
cp -rTf --preserve=all $D/${sysconfdir}/skel $D/${ROOT_HOME}
@@ -35,7 +35,7 @@ pkg_postinst_${PN}_append_with-lsm-smack() {
# Install default Smack rules, copied from a running Tizen IVI 3.0.
# Corresponds to manifest file from default-access-domains in Tizen:
# https://review.tizen.org/git?p=platform/core/security/default-ac-domains.git;a=blob;f=packaging/default-ac-domains.manifest
-do_install_append_with-lsm-smack () {
+do_install:append:with-lsm-smack () {
install -d ${D}/${sysconfdir}/smack/accesses.d
cat >${D}/${sysconfdir}/smack/accesses.d/default-access-domains <<EOF
System _ -----l
@@ -74,9 +74,9 @@ EOF
# via postinst. This is much easier to use with bitbake, too:
# - no need to maintain a patched rpm
# - works for directories which are not packaged by default when empty
-RDEPENDS_${PN}_append_with-lsm-smack = " smack"
-DEPENDS_append_with-lsm-smack = " smack-native"
-pkg_postinst_${PN}_with-lsm-smack() {
+RDEPENDS:${PN}:append:with-lsm-smack = " smack"
+DEPENDS:append:with-lsm-smack = " smack-native"
+pkg_postinst:${PN}:with-lsm-smack() {
#!/bin/sh -e
# https://review.tizen.org/gerrit/gitweb?p=platform/upstream/filesystem.git;a=blob;f=packaging/filesystem.manifest:
diff --git a/meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc b/meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc
index 1b9b722ec..234487531 100644
--- a/meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc
+++ b/meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc
@@ -1,7 +1,7 @@
# Smack patches are included in coreutils v8.22, we just need to enable them.
# The default is not deterministic (enabled if libsmack found), so disable
# explicitly otherwise.
-EXTRA_OECONF_SMACK_class-target = "--disable-libsmack"
-EXTRA_OECONF_SMACK_with-lsm-smack_class-target = "--enable-libsmack"
-EXTRA_OECONF_append_class-target = " ${EXTRA_OECONF_SMACK}"
-DEPENDS_append_with-lsm-smack_class-target = " smack"
+EXTRA_OECONF_SMACK:class-target = "--disable-libsmack"
+EXTRA_OECONF_SMACK:with-lsm-smack:class-target = "--enable-libsmack"
+EXTRA_OECONF:append:class-target = " ${EXTRA_OECONF_SMACK}"
+DEPENDS:append:with-lsm-smack:class-target = " smack"
diff --git a/meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.16.bbappend b/meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.24.bbappend
index 028c734aa..028c734aa 100644
--- a/meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.16.bbappend
+++ b/meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.24.bbappend
diff --git a/meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc b/meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc
index 177a117b8..4efeef7b8 100644
--- a/meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc
+++ b/meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/dbus-cynagora:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/dbus-cynagora:"
-SRC_URI_append_class-target = "\
+SRC_URI:append:class-target = "\
file://0001-Integration-of-Cynara-asynchronous-security-checks.patch \
file://0002-Disable-message-dispatching-when-send-rule-result-is.patch \
file://0003-Handle-unavailability-of-policy-results-for-broadcas.patch \
@@ -10,6 +10,6 @@ SRC_URI_append_class-target = "\
file://0007-Switch-from-cynara-to-cynagora.patch \
"
-DEPENDS_append_class-target = " cynagora smack"
-EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES','smack','--enable-cynagora --disable-selinux','',d)}"
+DEPENDS:append:class-target = " cynagora smack"
+EXTRA_OECONF:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES','smack','--enable-cynagora --disable-selinux','',d)}"
diff --git a/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb b/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb
index 45861f7cc..93d2a2034 100644
--- a/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb
+++ b/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/nss-localuser;protocol=ht
SRCREV = "66803c6fdb609ed83a78b9194ecb23e9c1b773e7"
PV = "${AGL_BRANCH}+git${SRCPV}"
-RDEPENDS_${PN} = "base-files"
+RDEPENDS:${PN} = "base-files"
S = "${WORKDIR}/git"
@@ -25,15 +25,15 @@ do_install() {
make nssdir=${D}${libdir} install
}
-pkg_postinst_ontarget_${PN} () {
+pkg_postinst_ontarget:${PN} () {
sed -e '/^hosts:/s/\<localuser\>\s*//' \
-e 's/\(^hosts:\s\s*\)\(.*\)/\1localuser \2/' \
-i $D${sysconfdir}/nsswitch.conf
}
-pkg_prerm_${PN} () {
+pkg_prerm:${PN} () {
sed -e '/^hosts:/s/\<localuser\>\s*//' \
-i $D${sysconfdir}/nsswitch.conf
}
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-app-framework/recipes-core/shadow/shadow_appfw.inc b/meta-app-framework/recipes-core/shadow/shadow_appfw.inc
index 472ffef2c..d41c996e9 100644
--- a/meta-app-framework/recipes-core/shadow/shadow_appfw.inc
+++ b/meta-app-framework/recipes-core/shadow/shadow_appfw.inc
@@ -1,3 +1,3 @@
-do_install_append() {
+do_install:append() {
sed -i '/^UMASK/s:^.*$:UMASK 077:' ${D}${sysconfdir}/login.defs
}
diff --git a/meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb b/meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb
index 49b12ad3f..b74f462b4 100644
--- a/meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb
+++ b/meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb
@@ -9,9 +9,9 @@ SRC_URI = "\
file://tmp.mount.conf \
"
-RDEPENDS_${PN}_append_with-lsm-smack = " smack"
+RDEPENDS:${PN}:append:with-lsm-smack = " smack"
-do_install_append_with-lsm-smack() {
+do_install:append:with-lsm-smack() {
# tuning systemd units
install -Dm0644 ${WORKDIR}/systemd-tmpfiles-setup.service.conf \
${D}${systemd_unitdir}/system/systemd-tmpfiles-setup.service.d/smack.conf
@@ -25,4 +25,4 @@ do_install_append_with-lsm-smack() {
${D}${sysconfdir}/udev/rules.d/55-udev-smack-default.rules
}
-FILES_${PN} += "${systemd_unitdir}"
+FILES:${PN} += "${systemd_unitdir}"
diff --git a/meta-app-framework/recipes-core/systemd/systemd_appfw.inc b/meta-app-framework/recipes-core/systemd/systemd_appfw.inc
index a5e1ae840..8aa72c570 100644
--- a/meta-app-framework/recipes-core/systemd/systemd_appfw.inc
+++ b/meta-app-framework/recipes-core/systemd/systemd_appfw.inc
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:"
# Ensures systemd runs with label "System"
-EXTRA_OEMESON_append_with-lsm-smack = " -Dsmack-run-label=System"
+EXTRA_OEMESON:append:with-lsm-smack = " -Dsmack-run-label=System"
##################################################################################
# Maintaining trivial, non-upstreamable configuration changes as patches
@@ -34,7 +34,7 @@ patch_systemd() {
# This comes with the recipe systemd_230/234 of poky (meta/recipes-core/systemd)
# It should be removed when poky changes.
##################################################################################
-do_install_prepend() {
+do_install:prepend() {
mv ${WORKDIR}/touchscreen.rules ${WORKDIR}/55-touchscreen.rules || true
}
diff --git a/meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc b/meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc
index 05286f80d..7399aa44d 100644
--- a/meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc
+++ b/meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc
@@ -4,5 +4,5 @@
# booting with "security=none" when userspace otherwise is
# compiled to use Smack.
-PACKAGECONFIG_append_with-lsm-smack_class-target = " smack"
+PACKAGECONFIG:append:with-lsm-smack:class-target = " smack"
PACKAGECONFIG[smack] = "--with-smack, --without-smack"
diff --git a/meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb b/meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb
index 3fea2ed91..4164171ff 100644
--- a/meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb
+++ b/meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
inherit cmake
-FILES_${PN} += " ${datadir}/*/Modules/CMakeAfbTemplates*"
+FILES:${PN} += " ${datadir}/*/Modules/CMakeAfbTemplates*"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc b/meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc
index f1547e14b..c15548c55 100644
--- a/meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc
+++ b/meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc
@@ -1 +1 @@
-EXTRA_OECONF_append = " --enable-threading"
+EXTRA_OECONF:append = " --enable-threading"
diff --git a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb
index 1174ac4d7..9ca32fdda 100644
--- a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb
+++ b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb
@@ -2,7 +2,7 @@ require libafb-helpers_git.inc
inherit cmake
-RDEPENDS_${PN}_append = " af-binder"
+RDEPENDS:${PN}:append = " af-binder"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc
index 6753225b4..6da093237 100644
--- a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc
+++ b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc
@@ -10,5 +10,5 @@ SRCREV = "1d1c6cef6039effd4c045a76d30414b589336d0e"
PV = "${AGLVERSION}"
S = "${WORKDIR}/git"
-DEPENDS_append = " af-binder jq"
+DEPENDS:append = " af-binder jq"
diff --git a/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb b/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb
index 0ee9c5e84..74fe08144 100644
--- a/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb
+++ b/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb
@@ -10,10 +10,10 @@ SRCREV = "1bef31c8bbad27f4914484c5007b2e199fb073d4"
PV = "${AGLVERSION}"
S = "${WORKDIR}/git"
-DEPENDS_append = " af-binder libafb-helpers lua"
-RDEPENDS_${PN}_append = " af-binder lua"
+DEPENDS:append = " af-binder libafb-helpers lua"
+RDEPENDS:${PN}:append = " af-binder lua"
inherit cmake
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc b/meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc
index 8d6ffb5b3..27ee7cf52 100644
--- a/meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc
+++ b/meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc
@@ -1,4 +1,4 @@
-RDEPENDS_${PN}_append = " \
+RDEPENDS:${PN}:append = " \
nativesdk-af-main-tools \
nativesdk-af-binder-devtools \
nativesdk-cmake-apps-module \
diff --git a/meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc b/meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc
index 2f3effce6..07b958aea 100644
--- a/meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc
+++ b/meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc
@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/run-postinsts:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/run-postinsts:"
-SRC_URI_append = " file://ldconfig-wait.conf"
+SRC_URI:append = " file://ldconfig-wait.conf"
-do_configure_append() {
+do_configure:append() {
if ! grep -q StandardOutput= ${WORKDIR}/run-postinsts.service; then
sed -i '/ExecStart=/iStandardOutput=journal+console' ${WORKDIR}/run-postinsts.service
fi
}
-do_install_append() {
+do_install:append() {
install -d ${D}${sysconfdir}/systemd/system/run-postinsts.service.d
install -m 0644 ${WORKDIR}/ldconfig-wait.conf ${D}${sysconfdir}/systemd/system/run-postinsts.service.d
}
diff --git a/meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc b/meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc
index f39122de2..a1d55a17d 100644
--- a/meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc
+++ b/meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/wayland:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/wayland:"
-SRC_URI_append = "\
+SRC_URI:append = "\
file://0001-Change-socket-mode-add-rw-for-group.patch \
"
diff --git a/meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc b/meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc
index 219ed1aef..a72f22430 100644
--- a/meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc
+++ b/meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc
@@ -1,19 +1,19 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/weston"
+FILESEXTRAPATHS:append := ":${THISDIR}/weston"
-SRC_URI_append = "\
+SRC_URI:append = "\
file://0001-Allow-regular-users-to-launch-Weston_7.0.0.patch \
file://smack-weston \
"
-EXTRA_OEMESON_append = " -Denable-user-start=true"
+EXTRA_OEMESON:append = " -Denable-user-start=true"
-do_install_append() {
+do_install:append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'smack', 'true', 'false', d)}; then
# Install SMACK rules
install -D -m 0644 ${WORKDIR}/smack-weston ${D}${sysconfdir}/smack/accesses.d/weston
fi
}
-FILES_${PN}_append = "\
+FILES:${PN}:append = "\
${sysconfdir}/smack/accesses.d/* \
"
diff --git a/meta-app-framework/recipes-kernel/linux/linux-appfw.inc b/meta-app-framework/recipes-kernel/linux/linux-appfw.inc
index 1b6d1b6a8..68fb35882 100644
--- a/meta-app-framework/recipes-kernel/linux/linux-appfw.inc
+++ b/meta-app-framework/recipes-kernel/linux/linux-appfw.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
# Enable SMACK support without making it the default explicitly.
AGL_KCONFIG_FRAGMENTS += "smack.cfg"
diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb
index 7ba909162..1c904211b 100644
--- a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb
+++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb
@@ -8,7 +8,7 @@ PACKAGES = "\
packagegroup-agl-app-framework-examples \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
"
diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb
index d15607a40..866f2e0e3 100644
--- a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb
+++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb
@@ -8,9 +8,9 @@ PACKAGES_${PN} = "\
packagegroup-agl-app-framework \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
af-binder \
libafbwsc \
af-main \
diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb
index 750fe678d..bdd967ae8 100644
--- a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb
+++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb
@@ -10,7 +10,7 @@ PACKAGES = "\
packagegroup-agl-appfw-native \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
"
diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb b/meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb
index 6b32b0349..449ce6432 100644
--- a/meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb
+++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb
@@ -14,7 +14,7 @@ inherit packagegroup
# Without configuration, security-manager is not usable. We use
# the policy packaged from the upstream source code here. Adapting
# it for the distro can be done by patching that source.
-RDEPENDS_${PN}_append_with-lsm-smack = " \
+RDEPENDS:${PN}:append:with-lsm-smack = " \
cynagora \
security-manager \
security-manager-policy \
diff --git a/meta-app-framework/recipes-security/audit/audit_2.8.5.bb b/meta-app-framework/recipes-security/audit/audit_2.8.5.bb
index af36ed5e2..618e5e84d 100644
--- a/meta-app-framework/recipes-security/audit/audit_2.8.5.bb
+++ b/meta-app-framework/recipes-security/audit/audit_2.8.5.bb
@@ -7,7 +7,7 @@ SECTION = "base"
LICENSE = "GPLv2+ & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=2.8_maintenance \
+SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=2.8_maintenance;protocol=https \
file://Add-substitue-functions-for-strndupa-rawmemchr.patch \
file://Fixed-swig-host-contamination-issue.patch \
file://0001-lib-i386_table.h-add-new-syscall.patch \
@@ -26,7 +26,7 @@ INITSCRIPT_NAME = "auditd"
INITSCRIPT_PARAMS = "defaults"
SYSTEMD_PACKAGES = "auditd"
-SYSTEMD_SERVICE_auditd = "auditd.service"
+SYSTEMD_SERVICE:auditd = "auditd.service"
DEPENDS += "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native"
@@ -41,8 +41,8 @@ EXTRA_OECONF += "--without-prelude \
--without-golang \
--disable-zos-remote \
"
-EXTRA_OECONF_append_arm = " --with-arm=yes"
-EXTRA_OECONF_append_aarch64 = " --with-aarch64=yes"
+EXTRA_OECONF:append:arm = " --with-arm=yes"
+EXTRA_OECONF:append:aarch64 = " --with-aarch64=yes"
EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \
PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \
@@ -51,8 +51,8 @@ EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \
pkgconfigdir=${libdir}/pkgconfig \
"
-SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher"
-DESCRIPTION_audispd-plugins = "The audispd-plugins package provides plugins for the real-time \
+SUMMARY:audispd-plugins = "Plugins for the audit event dispatcher"
+DESCRIPTION:audispd-plugins = "The audispd-plugins package provides plugins for the real-time \
interface to the audit system, audispd. These plugins can do things \
like relay events to remote machines or analyze events for suspicious \
behavior."
@@ -60,19 +60,19 @@ behavior."
PACKAGES =+ "audispd-plugins"
PACKAGES += "auditd ${PN}-python"
-FILES_${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*"
-FILES_auditd += "${bindir}/* ${base_sbindir}/* ${sysconfdir}/*"
-FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \
+FILES:${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*"
+FILES:auditd += "${bindir}/* ${base_sbindir}/* ${sysconfdir}/*"
+FILES:audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \
${sysconfdir}/audisp/plugins.d/au-remote.conf \
${sbindir}/audisp-remote ${localstatedir}/spool/audit \
"
-FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug"
-FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
+FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug"
+FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
-CONFFILES_auditd += "${sysconfdir}/audit/audit.rules"
-RDEPENDS_auditd += "bash"
+CONFFILES:auditd += "${sysconfdir}/audit/audit.rules"
+RDEPENDS:auditd += "bash"
-do_install_append() {
+do_install:append() {
rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a
rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la
diff --git a/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb b/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
index c77c99189..d76181c98 100644
--- a/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
+++ b/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
@@ -18,6 +18,6 @@ EXTRA_OECMAKE += " \
-DUNITDIR_SYSTEM=${systemd_system_unitdir} \
"
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb b/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb
index f146051cd..55edbcebe 100644
--- a/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb
+++ b/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb
@@ -11,9 +11,9 @@ S = "${WORKDIR}/git"
inherit cmake
PROVIDES = "cynara"
-RPROVIDES_${PN} = "cynara"
+RPROVIDES:${PN} = "cynara"
DEPENDS = "libcap"
-RDEPENDS_${PN} = "cynagora"
+RDEPENDS:${PN} = "cynagora"
EXTRA_OECMAKE += " \
-DWITH_SYSTEMD=OFF \
@@ -21,7 +21,7 @@ EXTRA_OECMAKE += " \
-DDIRECT_CYNARA_COMPAT=ON \
"
-do_install_append() {
+do_install:append() {
# remove cynagora stuff
rm $(find ${D} -name '*cynagora*')
# remove stupid test
diff --git a/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb b/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
index 73f2f0949..2ed1b1541 100644
--- a/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
+++ b/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
@@ -20,19 +20,19 @@ EXTRA_OECMAKE += " \
inherit useradd
USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "-r cynagora"
-USERADD_PARAM_${PN} = "\
+GROUPADD_PARAM:${PN} = "-r cynagora"
+USERADD_PARAM:${PN} = "\
--system --home ${localstatedir}/lib/empty \
--no-create-home --shell /bin/false \
--gid cynagora cynagora \
"
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_system_unitdir}"
PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools += "${bindir}/cynagora-admin ${bindir}/cynagora-agent"
-RDEPENDS_${PN}_append_agl-devel = " ${PN}-tools"
+FILES:${PN}-tools += "${bindir}/cynagora-admin ${bindir}/cynagora-agent"
+RDEPENDS:${PN}:append:agl-devel = " ${PN}-tools"
inherit ptest
-SRC_URI_append = " file://run-ptest"
-RDEPENDS_${PN}-ptest_append = " ${PN}-tools"
+SRC_URI:append = " file://run-ptest"
+RDEPENDS:${PN}-ptest:append = " ${PN}-tools"
diff --git a/meta-app-framework/recipes-security/security-manager/security-manager.inc b/meta-app-framework/recipes-security/security-manager/security-manager.inc
index e1d1f4011..c6bc123d3 100644
--- a/meta-app-framework/recipes-security/security-manager/security-manager.inc
+++ b/meta-app-framework/recipes-security/security-manager/security-manager.inc
@@ -34,7 +34,7 @@ EXTRA_OECMAKE = " \
"
inherit systemd
-SYSTEMD_SERVICE_${PN} = "security-manager.service"
+SYSTEMD_SERVICE:${PN} = "security-manager.service"
inherit features_check
REQUIRED_DISTRO_FEATURES += "smack"
@@ -46,8 +46,8 @@ REQUIRED_DISTRO_FEATURES += "smack"
#
# Leave it empty to use the upstream Tizen policy.
SECURITY_MANAGER_POLICY ?= ""
-SRC_URI_append = " ${@' '.join(['file://' + x for x in d.getVar('SECURITY_MANAGER_POLICY', True).split()])}"
-python do_patch_append () {
+SRC_URI:append = " ${@' '.join(['file://' + x for x in d.getVar('SECURITY_MANAGER_POLICY', True).split()])}"
+python do_patch:append () {
import os
import shutil
import glob
@@ -62,22 +62,22 @@ python do_patch_append () {
shutil.copy(file, s + '/policy')
}
-do_install_append () {
+do_install:append () {
install -d ${D}/${systemd_unitdir}/system/multi-user.target.wants
ln -s ../security-manager.service ${D}/${systemd_unitdir}/system/multi-user.target.wants/security-manager.service
install -d ${D}/${systemd_unitdir}/system/sockets.target.wants
ln -s ../security-manager.socket ${D}/${systemd_unitdir}/system/sockets.target.wants/security-manager.socket
}
-RDEPENDS_${PN} += "sqlite3 cynara"
-FILES_${PN} += " \
+RDEPENDS:${PN} += "sqlite3 cynara"
+FILES:${PN} += " \
${systemd_unitdir} \
${TZ_SYS_DB} \
${bindir}/.security-manager-setup \
"
PACKAGES =+ "${PN}-policy"
-FILES_${PN}-policy = " \
+FILES:${PN}-policy = " \
${datadir}/${PN} \
${bindir}/security-manager-policy-reload \
"
diff --git a/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend b/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
index ec8435369..ba3365f12 100644
--- a/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
+++ b/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/security-manager:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/security-manager:"
EXTRA_OECMAKE =+ " -DGLOBALUSER=afm"
@@ -6,7 +6,7 @@ SRC_URI += " \
file://0001-Adapt-rules-to-AGL.patch \
"
-do_install_append() {
+do_install:append() {
# Needed for wayland-0 socket access and memfd usage
echo "~APP~ System::Weston rw" >> ${D}${datadir}/security-manager/policy/app-rules-template.smack
echo "System::Weston ~APP~ rw" >> ${D}${datadir}/security-manager/policy/app-rules-template.smack
diff --git a/meta-app-framework/recipes-security/security-manager/security-manager_git.bb b/meta-app-framework/recipes-security/security-manager/security-manager_git.bb
index b34973519..95ae69feb 100644
--- a/meta-app-framework/recipes-security/security-manager/security-manager_git.bb
+++ b/meta-app-framework/recipes-security/security-manager/security-manager_git.bb
@@ -2,7 +2,7 @@ require security-manager.inc
PV = "1.0.2+git${SRCPV}"
SRCREV = "860305a595d681d650024ad07b3b0977e1fcb0a6"
-SRC_URI += "git://github.com/Samsung/security-manager.git"
+SRC_URI += "git://github.com/Samsung/security-manager.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
SRC_URI += " \
diff --git a/meta-app-framework/recipes-support/libcap/libcap_appfw.inc b/meta-app-framework/recipes-support/libcap/libcap_appfw.inc
index 9ece5ce27..a33fd99b2 100644
--- a/meta-app-framework/recipes-support/libcap/libcap_appfw.inc
+++ b/meta-app-framework/recipes-support/libcap/libcap_appfw.inc
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_append_class-native := ":${THISDIR}/libcap"
+FILESEXTRAPATHS:append:class-native := ":${THISDIR}/libcap"
# FIXME: It needs to be determined if this is still required
-#SRC_URI_append_class-native = " file://removing-capability-enforcement.patch"
+#SRC_URI:append:class-native = " file://removing-capability-enforcement.patch"
diff --git a/meta-app-framework/recipes-test/afb-test/afb-test_git.bb b/meta-app-framework/recipes-test/afb-test/afb-test_git.bb
index 5246abb00..6fd1424e4 100644
--- a/meta-app-framework/recipes-test/afb-test/afb-test_git.bb
+++ b/meta-app-framework/recipes-test/afb-test/afb-test_git.bb
@@ -10,15 +10,15 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/app-afb-test;protocol=ht
SRCREV = "${AGL_APP_REVISION}"
DEPENDS += "lua libafb-helpers libappcontroller"
-RDEPENDS_${PN} += "lua bash jq"
-RDEPENDS_${PN}-ptest += "af-binder"
+RDEPENDS:${PN} += "lua bash jq"
+RDEPENDS:${PN}-ptest += "af-binder"
PV = "${AGLVERSION}"
S = "${WORKDIR}/git"
inherit cmake aglwgt pkgconfig ptest
-do_install_append() {
+do_install:append() {
install -d ${D}${bindir}
install -m 775 ${S}/afm-test.target.sh ${D}${bindir}/afm-test
}
diff --git a/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh b/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh
index 37d2f5615..762a79e83 100755
--- a/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh
+++ b/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh
@@ -19,8 +19,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= ""
# important settings imported from poky-agl.conf
# we do not import
-DISTRO_FEATURES_append = " systemd smack"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd smack"
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
# skip unnecessary in yocto-check-layer - aka FIXME upstream
@@ -28,10 +28,10 @@ BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb"
BBMASK += "packagegroup-core-security-ptest.bb"
# missing in upstream recipes ... aka FIXME upstream
-BBCLASSEXTEND_pn-libzip = "native nativesdk"
-BBCLASSEXTEND_pn-xmlsec1 = "native nativesdk"
+BBCLASSEXTEND:pn-libzip = "native nativesdk"
+BBCLASSEXTEND:pn-xmlsec1 = "native nativesdk"
-DISTRO_FEATURES_append = " appfw smack "
+DISTRO_FEATURES:append = " appfw smack "
EOF
diff --git a/meta-app-framework/scripts/run-yocto-check-layer.sh b/meta-app-framework/scripts/run-yocto-check-layer.sh
index 3b19cd012..c324d64f9 100755
--- a/meta-app-framework/scripts/run-yocto-check-layer.sh
+++ b/meta-app-framework/scripts/run-yocto-check-layer.sh
@@ -19,8 +19,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= ""
# important settings imported from poky-agl.conf
# we do not import
-DISTRO_FEATURES_append = " systemd smack"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd smack"
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
# skip unnecessary in yocto-check-layer - aka FIXME upstream
@@ -28,8 +28,8 @@ BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb"
BBMASK += "packagegroup-core-security-ptest.bb"
# missing in upstream recipes ... aka FIXME upstream
-BBCLASSEXTEND_pn-libzip = "native nativesdk"
-BBCLASSEXTEND_pn-xmlsec1 = "native nativesdk"
+BBCLASSEXTEND:pn-libzip = "native nativesdk"
+BBCLASSEXTEND:pn-xmlsec1 = "native nativesdk"
EOF
diff --git a/meta-netboot/README b/meta-netboot/README
index 7efa22650..4918276ba 100644
--- a/meta-netboot/README
+++ b/meta-netboot/README
@@ -59,7 +59,7 @@ setenv bootargs_root 'root=/dev/ram0 ramdisk_size=16384 ip=dhcp'
setenv bootargs_video 'vmalloc=384M video=HDMI-A-1:1920x1080-32@60'
setenv serverip '<your_serverip>'
setenv 'bootdaddr' '0x48000000'
-setenv 'bootdfile' 'Image-r8a7795-h3ulcb.dtb'
+setenv 'bootdfile' 'Image-r8a77951-ulcb.dtb'
setenv 'bootdload_net' 'tftp ${bootdaddr} h3ulcb/${bootdfile}'
setenv 'bootkaddr' '0x48080000'
setenv 'bootkfile' 'Image'
diff --git a/meta-netboot/recipes-core/busybox/busybox_netboot.inc b/meta-netboot/recipes-core/busybox/busybox_netboot.inc
index 0bcd5afa5..836493834 100644
--- a/meta-netboot/recipes-core/busybox/busybox_netboot.inc
+++ b/meta-netboot/recipes-core/busybox/busybox_netboot.inc
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI_append = " \
+SRC_URI:append = " \
file://enable_nbd.cfg \
"
diff --git a/meta-netboot/recipes-core/images/initramfs-netboot-image_netboot.inc b/meta-netboot/recipes-core/images/initramfs-netboot-image_netboot.inc
index 0c97b0f93..b98024de6 100644
--- a/meta-netboot/recipes-core/images/initramfs-netboot-image_netboot.inc
+++ b/meta-netboot/recipes-core/images/initramfs-netboot-image_netboot.inc
@@ -15,7 +15,7 @@ IMAGE_FSTYPES := "${NETBOOT_FSTYPES}"
inherit core-image
# hotfix for dragonboard (which uses _append in the bsp)
-IMAGE_FSTYPES_remove = "wic.gz"
+IMAGE_FSTYPES:remove = "wic.gz"
IMAGE_ROOTFS_SIZE = "8192"
IMAGE_ROOTFS_EXTRA_SPACE = "256"
diff --git a/meta-netboot/recipes-core/initramfs-netboot/initramfs-netboot_1.0.bb b/meta-netboot/recipes-core/initramfs-netboot/initramfs-netboot_1.0.bb
index f519694ed..264b21492 100644
--- a/meta-netboot/recipes-core/initramfs-netboot/initramfs-netboot_1.0.bb
+++ b/meta-netboot/recipes-core/initramfs-netboot/initramfs-netboot_1.0.bb
@@ -5,7 +5,7 @@ SRC_URI = "file://init.sh"
S = "${WORKDIR}"
-RDEPENDS_${PN} += "nbd-client"
+RDEPENDS:${PN} += "nbd-client"
do_install() {
install -dm 0755 ${D}/etc
@@ -17,5 +17,5 @@ do_install() {
inherit allarch
-FILES_${PN} += " /dev /etc/initrd-release /sbin/init "
+FILES:${PN} += " /dev /etc/initrd-release /sbin/init "
diff --git a/meta-netboot/recipes-support/nbd/nbd_netboot.inc b/meta-netboot/recipes-support/nbd/nbd_netboot.inc
index f2286616f..4c9489de1 100644
--- a/meta-netboot/recipes-support/nbd/nbd_netboot.inc
+++ b/meta-netboot/recipes-support/nbd/nbd_netboot.inc
@@ -1,5 +1,5 @@
-do_install_append() {
+do_install:append() {
mv ${D}/${sbindir}/nbd-client ${D}/${sbindir}/nbd3-client
}
-FILES_${PN}-client_append = " ${sbindir}/nbd3-client"
+FILES:${PN}-client:append = " ${sbindir}/nbd3-client"
diff --git a/meta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh b/meta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh
index c64afa714..cf7a75a30 100755
--- a/meta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh
+++ b/meta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh
@@ -20,8 +20,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= ""
# important settings imported from poky-agl.conf
# we do not import
-DISTRO_FEATURES_append = " systemd smack"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd smack"
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
# workaround
diff --git a/meta-netboot/scripts/run-yocto-check-layer.sh b/meta-netboot/scripts/run-yocto-check-layer.sh
index b3b8e08e1..09e655afb 100755
--- a/meta-netboot/scripts/run-yocto-check-layer.sh
+++ b/meta-netboot/scripts/run-yocto-check-layer.sh
@@ -20,8 +20,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= ""
# important settings imported from poky-agl.conf
# we do not import
-DISTRO_FEATURES_append = " systemd smack"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd smack"
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
# workaround
diff --git a/meta-pipewire/conf/include/agl-pipewire.inc b/meta-pipewire/conf/include/agl-pipewire.inc
index 7234633ff..0c585adb0 100644
--- a/meta-pipewire/conf/include/agl-pipewire.inc
+++ b/meta-pipewire/conf/include/agl-pipewire.inc
@@ -1,2 +1,2 @@
-DISTRO_FEATURES_append = " pipewire"
+DISTRO_FEATURES:append = " pipewire"
PREFERRED_RPROVIDER_virtual/wireplumber-config = "wireplumber-config-agl"
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb
index 2a8261195..f7235c177 100644
--- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb
@@ -14,4 +14,4 @@ S = "${WORKDIR}/git"
inherit cmake aglwgt pkgconfig
DEPENDS += "pipewire wireplumber json-c"
-RDEPENDS_${PN} = "agl-service-signal-composer"
+RDEPENDS:${PN} = "agl-service-signal-composer"
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend
index 92ebf837f..691236d41 100644
--- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend
@@ -1,3 +1,3 @@
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
agl-service-audiomixer \
"
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch
new file mode 100644
index 000000000..74e5ba33b
--- /dev/null
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch
@@ -0,0 +1,26 @@
+From 3b2935ed044e657b515a07e78638b902baa8157a Mon Sep 17 00:00:00 2001
+From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
+Date: Wed, 1 Dec 2021 12:17:52 +0530
+Subject: [PATCH] meson: remove pipewire_module_c_args as it is no longer used.
+
+Upstream-Status: Inappropriate [smack specific]
+
+---
+ src/modules/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index d1d90bf05..c9f629c08 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -114,7 +114,6 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
+
+ pipewire_module_access_seclabel = shared_library('pipewire-module-access-seclabel',
+ [ 'module-access-seclabel.c' ],
+- c_args : pipewire_module_c_args,
+ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+--
+2.33.1
+
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.43.bbappend
index c895efc8b..b6086ea1c 100644
--- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.43.bbappend
@@ -1,14 +1,15 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/pipewire:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/pipewire:"
-SRC_URI_append= "\
+SRC_URI:append= "\
file://0001-modules-add-new-access-seclabel-module.patch \
+ file://0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch \
file://pipewire.conf \
file://pipewire.service \
file://pipewire.socket \
file://smack-pipewire \
"
-do_install_append() {
+do_install:append() {
# replace the original config with our smack-aware config
mkdir -p ${D}${sysconfdir}/pipewire/
install -m 0644 ${WORKDIR}/pipewire.conf ${D}${sysconfdir}/pipewire/pipewire.conf
@@ -28,7 +29,7 @@ do_install_append() {
fi
}
-FILES_${PN}_append = "\
+FILES:${PN}:append = "\
${sysconfdir}/smack/accesses.d/* \
${sysconfdir}/pipewire/pipewire.conf \
"
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend
index e94f67eff..106de4f6a 100644
--- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/wireplumber-config-agl:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/wireplumber-config-agl:"
SRC_URI += "\
file://50-access-agl.lua \
file://access-smack.lua \
"
-do_install_append() {
+do_install:append() {
# install smack-specific config
config_dir="${D}${sysconfdir}/wireplumber/config.lua.d/"
access_dir="${D}${sysconfdir}/wireplumber/scripts/access/"
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend
index ccb6c4137..9dbf47afc 100644
--- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
echo "System::Pipewire * * http://tizen.org/privilege/internal/dbus yes forever" >> ${D}${sysconfdir}/security/cynagora.initial
}
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
index 47c9b9149..6ab9d07ef 100644
--- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
@@ -1,3 +1,3 @@
-do_install_append() {
+do_install:append() {
echo "~APP~ System::Pipewire rw" >> ${D}${datadir}/security-manager/policy/app-rules-template.smack
}
diff --git a/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire.bb b/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire.bb
index f883dfa2c..b56723b2b 100644
--- a/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire.bb
+++ b/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire.bb
@@ -8,7 +8,7 @@ PACKAGES = "\
packagegroup-pipewire \
"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
pipewire \
pipewire-modules-meta \
pipewire-spa-plugins-meta \
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch
new file mode 100644
index 000000000..42f01086a
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch
@@ -0,0 +1,241 @@
+From e850a4c080c80fc218224521727996062ebb9487 Mon Sep 17 00:00:00 2001
+From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
+Date: Fri, 14 Jan 2022 16:12:55 +0530
+Subject: [PATCH 1/4] Revert "treewide: meson.build: use
+ project_{build,source}_root()"
+
+This reverts commit 8ed46a283fa1f8623b940eaeb9f7cbcc52eebf0e.
+Upstream-Status: Inappropriate[meson version dependent]
+---
+ doc/meson.build | 34 ++++++++++++++--------------
+ meson.build | 8 +++----
+ spa/plugins/audioconvert/meson.build | 4 ++--
+ spa/tests/meson.build | 4 ++--
+ src/daemon/meson.build | 6 ++---
+ src/modules/meson.build | 6 ++---
+ src/tests/meson.build | 6 ++---
+ test/meson.build | 4 ++--
+ 8 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index 0e6d7f8e3..082780145 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,8 +1,8 @@
+ doxyfile_conf = configuration_data()
+ doxyfile_conf.set('PACKAGE_NAME', meson.project_name())
+ doxyfile_conf.set('PACKAGE_VERSION', meson.project_version())
+-doxyfile_conf.set('top_srcdir', meson.project_source_root())
+-doxyfile_conf.set('top_builddir', meson.project_build_root())
++doxyfile_conf.set('top_srcdir', meson.source_root())
++doxyfile_conf.set('top_builddir', meson.build_root())
+
+ dot_found = find_program('dot', required: false).found()
+ summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')
+@@ -49,35 +49,35 @@ extra_docs = [
+
+ inputs = []
+ foreach extra : extra_docs
+- inputs += meson.project_source_root() / 'doc' / extra
++ inputs += meson.source_root() / 'doc' / extra
+ endforeach
+ foreach h : pipewire_headers
+- inputs += meson.project_source_root() / 'src' / 'pipewire' / h
++ inputs += meson.source_root() / 'src' / 'pipewire' / h
+ endforeach
+ foreach h : pipewire_ext_headers
+- inputs += meson.project_source_root() / 'src' / 'pipewire' / 'extensions' / h
++ inputs += meson.source_root() / 'src' / 'pipewire' / 'extensions' / h
+ endforeach
+ foreach h : pipewire_ext_sm_headers
+- inputs += meson.project_source_root() / 'src' / 'pipewire' / 'extensions' / h
++ inputs += meson.source_root() / 'src' / 'pipewire' / 'extensions' / h
+ endforeach
+ foreach h : pipewire_sources
+- inputs += meson.project_source_root() / 'src' / 'pipewire' / h
++ inputs += meson.source_root() / 'src' / 'pipewire' / h
+ endforeach
+ foreach h : module_sources
+- inputs += meson.project_source_root() / 'src' / 'modules' / h
++ inputs += meson.source_root() / 'src' / 'modules' / h
+ endforeach
+-inputs += meson.project_source_root() / 'test' / 'pwtest.h'
+-input_dirs = [ meson.project_source_root() / 'spa' / 'include' / 'spa' ]
++inputs += meson.source_root() / 'test' / 'pwtest.h'
++input_dirs = [ meson.source_root() / 'spa' / 'include' / 'spa' ]
+
+ path_prefixes = [
+- meson.project_source_root() / 'src',
+- meson.project_source_root() / 'spa' / 'include',
+- meson.project_source_root(),
++ meson.source_root() / 'src',
++ meson.source_root() / 'spa' / 'include',
++ meson.source_root(),
+ ]
+
+ cssfiles = [
+- meson.project_source_root() / 'doc' / 'doxygen-awesome.css',
+- meson.project_source_root() / 'doc' / 'custom.css'
++ meson.source_root() / 'doc' / 'doxygen-awesome.css',
++ meson.source_root() / 'doc' / 'custom.css'
+ ]
+
+ # Example files (in order from simple to esoteric)
+@@ -118,8 +118,8 @@ input_dirs += [ 'doc/examples.dox' ]
+ doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs))
+ doxyfile_conf.set('cssfiles', ' '.join(cssfiles))
+ doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes))
+-doxyfile_conf.set('c_input_filter', meson.project_source_root() / 'doc' / 'input-filter.sh')
+-doxyfile_conf.set('h_input_filter', meson.project_source_root() / 'doc' / 'input-filter-h.sh')
++doxyfile_conf.set('c_input_filter', meson.source_root() / 'doc' / 'input-filter.sh')
++doxyfile_conf.set('h_input_filter', meson.source_root() / 'doc' / 'input-filter-h.sh')
+
+ doxyfile = configure_file(input: 'Doxyfile.in',
+ output: 'Doxyfile',
+diff --git a/meson.build b/meson.build
+index b1ea32f7a..67e697c15 100644
+--- a/meson.build
++++ b/meson.build
+@@ -304,9 +304,9 @@ includes_inc = include_directories('include')
+ pipewire_inc = include_directories('src')
+
+ makedata = configuration_data()
+-makedata.set('BUILD_ROOT', meson.project_build_root())
+-makedata.set('SOURCE_ROOT', meson.project_source_root())
+-makedata.set('VERSION', pipewire_version)
++ makedata.set('BUILD_ROOT', meson.build_root())
++ makedata.set('SOURCE_ROOT', meson.source_root())
++ makedata.set('VERSION', pipewire_version)
+ if version_arr.length() == 4
+ makedata.set('TAG', 'HEAD')
+ else
+@@ -498,7 +498,7 @@ endif
+ setenv = find_program('pw-uninstalled.sh')
+ run_target('pw-uninstalled',
+ command : [setenv,
+- '-b@0@'.format(meson.project_build_root()),
++ '-b@0@'.format(meson.build_root()),
+ '-v@0@'.format(pipewire_version)]
+ )
+
+diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
+index de9f491af..4d15271f5 100644
+--- a/spa/plugins/audioconvert/meson.build
++++ b/spa/plugins/audioconvert/meson.build
+@@ -140,7 +140,7 @@ foreach a : test_apps
+ install : installed_tests_enabled,
+ install_dir : installed_tests_execdir / 'audioconvert'),
+ env : [
+- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
++ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
+ ])
+
+ if installed_tests_enabled
+@@ -170,7 +170,7 @@ foreach a : benchmark_apps
+ install : installed_tests_enabled,
+ install_dir : installed_tests_execdir / 'audioconvert'),
+ env : [
+- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
++ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
+ ])
+
+ if installed_tests_enabled
+diff --git a/spa/tests/meson.build b/spa/tests/meson.build
+index 990df87bd..9e2a211e2 100644
+--- a/spa/tests/meson.build
++++ b/spa/tests/meson.build
+@@ -5,7 +5,7 @@ find = find_program('find', required: false)
+ summary({'find (for header testing)': find.found()}, bool_yn: true, section: 'Optional programs')
+ if find.found()
+ spa_headers = run_command(find,
+- meson.project_source_root() / 'spa' / 'include',
++ meson.source_root() / 'spa' / 'include',
+ '-name', '*.h',
+ '-not', '-name', 'type-info.h',
+ '-type', 'f',
+@@ -40,7 +40,7 @@ foreach a : benchmark_apps
+ install_dir : installed_tests_execdir,
+ ),
+ env : [
+- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
++ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
+ ]
+ )
+
+diff --git a/src/daemon/meson.build b/src/daemon/meson.build
+index 44a574337..5e64287a1 100644
+--- a/src/daemon/meson.build
++++ b/src/daemon/meson.build
+@@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#')
+
+ conf_config_uninstalled = conf_config
+ conf_config_uninstalled.set('pipewire_path',
+- meson.project_build_root() / 'src' / 'daemon' / 'pipewire')
++ meson.build_root() / 'src' / 'daemon' / 'pipewire')
+ conf_config_uninstalled.set('pipewire_pulse_path',
+- meson.project_build_root() / 'src' / 'daemon' / 'pipewire-pulse')
++ meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
+ conf_config_uninstalled.set('pulse_comment', '')
+
+ build_ms = 'media-session' in get_option('session-managers')
+@@ -105,7 +105,7 @@ custom_target('pipewire-uninstalled',
+ install: false,
+ input: pipewire_exec,
+ output: 'pipewire-uninstalled',
+- command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'],
++ command: [ln, '-fs', meson.build_root() + '/@INPUT@', '@OUTPUT@'],
+ )
+
+ #desktop_file = i18n.merge_file(
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index 93dc70173..45852f3b9 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -370,9 +370,9 @@ test('pw-test-protocol-native',
+ install_dir : installed_tests_execdir,
+ ),
+ env : [
+- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
+- 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
+- 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
++ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
++ 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
++ 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
+ ]
+ )
+
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index 3e8d05012..1b03967fb 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -13,9 +13,9 @@ foreach a : test_apps
+ install : installed_tests_enabled,
+ install_dir : installed_tests_execdir),
+ env : [
+- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
+- 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
+- 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
++ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
++ 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
++ 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
+ ])
+
+ if installed_tests_enabled
+diff --git a/test/meson.build b/test/meson.build
+index 20bdcb210..89f2bc2ec 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -14,8 +14,8 @@ pwtest_deps = [
+ ]
+
+ pwtest_c_args = [
+- '-DBUILD_ROOT="@0@"'.format(meson.project_build_root()),
+- '-DSOURCE_ROOT="@0@"'.format(meson.project_source_root()),
++ '-DBUILD_ROOT="@0@"'.format(meson.build_root()),
++ '-DSOURCE_ROOT="@0@"'.format(meson.source_root()),
+ ]
+
+ pwtest_inc = [
+--
+2.34.1
+
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-alsa-plugin-allow-specifying-a-media.role-on-the-vir.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-alsa-plugin-allow-specifying-a-media.role-on-the-vir.patch
deleted file mode 100644
index c6cf373c2..000000000
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-alsa-plugin-allow-specifying-a-media.role-on-the-vir.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From ff019936a70262c176a4bd950bc80ab84d2a71b0 Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Tue, 22 Jun 2021 13:23:22 +0300
-Subject: [PATCH] alsa plugin: allow specifying a media.role on the virtual
- device name
-
-So that we can do:
- aplay -D pipewire:ROLE=Music music.wav
- aplay -D pipewire:ROLE=Notification notice.wav
-
-Upstream-Status: Backport [from master/0.3.31]
----
- pipewire-alsa/alsa-plugins/pcm_pipewire.c | 14 +++++++++++++-
- pipewire-alsa/conf/50-pipewire.conf | 11 ++++++++++-
- 2 files changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/pipewire-alsa/alsa-plugins/pcm_pipewire.c b/pipewire-alsa/alsa-plugins/pcm_pipewire.c
-index 86792d2c7..6ace1b689 100644
---- a/pipewire-alsa/alsa-plugins/pcm_pipewire.c
-+++ b/pipewire-alsa/alsa-plugins/pcm_pipewire.c
-@@ -59,6 +59,7 @@ typedef struct {
-
- char *node_name;
- char *target;
-+ char *role;
-
- int fd;
- int error;
-@@ -509,6 +510,9 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io)
- pw_properties_set(props, PW_KEY_MEDIA_CATEGORY,
- io->stream == SND_PCM_STREAM_PLAYBACK ?
- "Playback" : "Capture");
-+ if (pw->role != NULL &&
-+ pw_properties_get(props, PW_KEY_MEDIA_ROLE) == NULL)
-+ pw_properties_setf(props, PW_KEY_MEDIA_ROLE, "%s", pw->role);
-
- pw->stream = pw_stream_new(pw->core, pw->node_name, props);
- if (pw->stream == NULL)
-@@ -958,6 +962,7 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name,
- const char *server_name,
- const char *playback_node,
- const char *capture_node,
-+ const char *role,
- snd_pcm_stream_t stream,
- int mode,
- uint32_t flags,
-@@ -1013,6 +1018,8 @@ static int snd_pcm_pipewire_open(snd_pcm_t **pcmp, const char *name,
- pw->target = capture_node ? strdup(capture_node) : NULL;
- }
-
-+ pw->role = (role && *role) ? strdup(role) : NULL;
-+
- pw->main_loop = pw_thread_loop_new("alsa-pipewire", NULL);
- if (pw->main_loop == NULL) {
- err = -errno;
-@@ -1091,6 +1098,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire)
- const char *server_name = NULL;
- const char *playback_node = NULL;
- const char *capture_node = NULL;
-+ const char *role = NULL;
- snd_pcm_format_t format = SND_PCM_FORMAT_UNKNOWN;
- int rate = 0;
- int channels = 0;
-@@ -1125,6 +1133,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire)
- snd_config_get_string(n, &capture_node);
- continue;
- }
-+ if (spa_streq(id, "role")) {
-+ snd_config_get_string(n, &role);
-+ continue;
-+ }
- if (spa_streq(id, "exclusive")) {
- if (snd_config_get_bool(n))
- flags |= PW_STREAM_FLAG_EXCLUSIVE;
-@@ -1174,7 +1186,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire)
- }
-
- err = snd_pcm_pipewire_open(pcmp, name, node_name, server_name, playback_node,
-- capture_node, stream, mode, flags, rate, format,
-+ capture_node, role, stream, mode, flags, rate, format,
- channels, period_bytes);
-
- return err;
-diff --git a/pipewire-alsa/conf/50-pipewire.conf b/pipewire-alsa/conf/50-pipewire.conf
-index 2c6f2d259..f7e58472b 100644
---- a/pipewire-alsa/conf/50-pipewire.conf
-+++ b/pipewire-alsa/conf/50-pipewire.conf
-@@ -3,9 +3,10 @@
- defaults.pipewire.server "pipewire-0"
- defaults.pipewire.node "-1"
- defaults.pipewire.exclusive false
-+defaults.pipewire.role ""
-
- pcm.pipewire {
-- @args [ SERVER NODE EXCLUSIVE ]
-+ @args [ SERVER NODE EXCLUSIVE ROLE ]
- @args.SERVER {
- type string
- default {
-@@ -27,6 +28,13 @@ pcm.pipewire {
- name defaults.pipewire.exclusive
- }
- }
-+ @args.ROLE {
-+ type string
-+ default {
-+ @func refer
-+ name defaults.pipewire.role
-+ }
-+ }
-
-
- type pipewire
-@@ -34,6 +42,7 @@ pcm.pipewire {
- playback_node $NODE
- capture_node $NODE
- exclusive $EXCLUSIVE
-+ role $ROLE
- hint {
- show on
- description "PipeWire Sound Server"
---
-2.30.2
-
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-null-sink-make-the-timerfd-non-blocking.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-null-sink-make-the-timerfd-non-blocking.patch
deleted file mode 100644
index 71e526f86..000000000
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-null-sink-make-the-timerfd-non-blocking.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c633004bf310998580ff8944c59d94689d6fca87 Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Thu, 1 Jul 2021 11:37:01 +0300
-Subject: [PATCH] null-sink: make the timerfd non-blocking
-
-Fixes #1377
-
-Upstream-Status: Backport [from master/0.3.32]
-Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
----
- spa/plugins/support/null-audio-sink.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/spa/plugins/support/null-audio-sink.c b/spa/plugins/support/null-audio-sink.c
-index e9588f1e2..12e671db8 100644
---- a/spa/plugins/support/null-audio-sink.c
-+++ b/spa/plugins/support/null-audio-sink.c
-@@ -221,8 +221,11 @@ static void on_timeout(struct spa_source *source)
- spa_log_trace(this->log, "timeout");
-
- if (spa_system_timerfd_read(this->data_system,
-- this->timer_source.fd, &expirations) < 0)
-+ this->timer_source.fd, &expirations) < 0) {
-+ if (errno == EAGAIN)
-+ return;
- perror("read timerfd");
-+ }
-
- nsec = this->next_time;
-
-@@ -818,7 +821,8 @@ impl_init(const struct spa_handle_factory *factory,
-
- this->timer_source.func = on_timeout;
- this->timer_source.data = this;
-- this->timer_source.fd = spa_system_timerfd_create(this->data_system, CLOCK_MONOTONIC, SPA_FD_CLOEXEC);
-+ this->timer_source.fd = spa_system_timerfd_create(this->data_system, CLOCK_MONOTONIC,
-+ SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
- this->timer_source.mask = SPA_IO_IN;
- this->timer_source.rmask = 0;
- this->timerspec.it_value.tv_sec = 0;
---
-2.30.2
-
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-Revert-treewide-meson.build-use-dependency-variable-.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-Revert-treewide-meson.build-use-dependency-variable-.patch
new file mode 100644
index 000000000..4131e6c27
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-Revert-treewide-meson.build-use-dependency-variable-.patch
@@ -0,0 +1,1129 @@
+From cbe87dc5390c91523a9f0bc3eb126fa500c351e2 Mon Sep 17 00:00:00 2001
+From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
+Date: Fri, 14 Jan 2022 18:23:54 +0530
+Subject: [PATCH 2/4] Revert "treewide: meson.build: use dependency variable
+ for SPA"
+
+This reverts commit 2b110af36683f13f2b55064dec4ae02c1b407561.
+
+Upstream-Status: Inappropriate[meson version dependent]
+---
+ spa/examples/meson.build | 4 +-
+ spa/meson.build | 41 +++++++-------
+ spa/plugins/alsa/acp/meson.build | 4 +-
+ spa/plugins/alsa/meson.build | 7 +--
+ spa/plugins/audioconvert/meson.build | 33 ++++++------
+ spa/plugins/audiomixer/meson.build | 11 ++--
+ spa/plugins/audiotestsrc/meson.build | 3 +-
+ spa/plugins/bluez5/meson.build | 24 ++++-----
+ spa/plugins/control/meson.build | 3 +-
+ spa/plugins/ffmpeg/meson.build | 3 +-
+ spa/plugins/jack/meson.build | 3 +-
+ spa/plugins/libcamera/meson.build | 3 +-
+ spa/plugins/support/meson.build | 14 +++--
+ spa/plugins/test/meson.build | 3 +-
+ spa/plugins/v4l2/meson.build | 3 +-
+ spa/plugins/videoconvert/meson.build | 3 +-
+ spa/plugins/videotestsrc/meson.build | 3 +-
+ spa/plugins/volume/meson.build | 2 +-
+ spa/plugins/vulkan/meson.build | 3 +-
+ spa/tests/meson.build | 5 +-
+ spa/tools/meson.build | 9 ++--
+ src/daemon/meson.build | 8 +--
+ src/gst/meson.build | 4 +-
+ src/modules/meson.build | 80 ++++++++++++++--------------
+ src/modules/spa/meson.build | 16 +++---
+ src/pipewire/meson.build | 4 +-
+ test/meson.build | 11 ++--
+ 27 files changed, 160 insertions(+), 147 deletions(-)
+
+diff --git a/spa/examples/meson.build b/spa/examples/meson.build
+index 7064a0643..bc04b723c 100644
+--- a/spa/examples/meson.build
++++ b/spa/examples/meson.build
+@@ -23,8 +23,8 @@ foreach c : spa_examples
+ executable(
+ c,
+ c + '.c',
+- include_directories : [configinc],
+- dependencies : [spa_dep, dl_lib, pthread_lib, mathlib] + deps,
++ include_directories : [configinc, spa_inc],
++ dependencies : [dl_lib, pthread_lib, mathlib] + deps,
+ install : installed_tests_enabled,
+ install_dir : installed_tests_execdir / 'examples' / 'spa'
+ )
+diff --git a/spa/meson.build b/spa/meson.build
+index 4ad37cdb4..2717b86d6 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -5,28 +5,7 @@
+ #pthread_lib = dependencies('threads')
+ #mathlib = cc.find_library('m', required : false)
+
+-spa_dep = declare_dependency(
+- include_directories : [
+- include_directories('include'),
+- ],
+- version : spaversion,
+- variables : {
+- 'plugindir' : meson.current_build_dir() / 'plugins',
+- 'datadir' : meson.current_source_dir() / 'plugins',
+- },
+-)
+-
+-meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
+-
+-pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
+- name : 'libspa',
+- subdirs : spa_name,
+- description : 'Simple Plugin API',
+- version : spaversion,
+- extra_cflags : '-D_REENTRANT',
+- variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
+- uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
+-)
++spa_inc = include_directories('include')
+
+ subdir('include')
+
+@@ -76,3 +55,21 @@ subdir('tests')
+ if not get_option('examples').disabled()
+ subdir('examples')
+ endif
++
++spa_dep = declare_dependency(
++ include_directories : [spa_inc],
++ version : spaversion,
++ variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
++)
++
++pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
++ name : 'libspa',
++ subdirs : spa_name,
++ description : 'Simple Plugin API',
++ version : spaversion,
++ extra_cflags : '-D_REENTRANT',
++ variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
++ uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
++)
++
++meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
+diff --git a/spa/plugins/alsa/acp/meson.build b/spa/plugins/alsa/acp/meson.build
+index 0ec97e2b4..3686aec82 100644
+--- a/spa/plugins/alsa/acp/meson.build
++++ b/spa/plugins/alsa/acp/meson.build
+@@ -16,7 +16,7 @@ acp_lib = static_library(
+ 'acp',
+ acp_sources,
+ c_args : acp_c_args,
+- include_directories : [configinc, includes_inc ],
+- dependencies : [ spa_dep, alsa_dep, mathlib, ]
++ include_directories : [configinc, spa_inc, includes_inc ],
++ dependencies : [ alsa_dep, mathlib, ]
+ )
+ acp_dep = declare_dependency(link_with: acp_lib)
+diff --git a/spa/plugins/alsa/meson.build b/spa/plugins/alsa/meson.build
+index e3fa6f0d7..402d93486 100644
+--- a/spa/plugins/alsa/meson.build
++++ b/spa/plugins/alsa/meson.build
+@@ -16,8 +16,8 @@ spa_alsa = shared_library(
+ 'spa-alsa',
+ [ spa_alsa_sources ],
+ c_args : acp_c_args,
+- include_directories : [configinc],
+- dependencies : [ spa_dep, alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
++ include_directories : [spa_inc, configinc],
++ dependencies : [ alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
+ link_with : [ acp_lib ],
+ install : true,
+ install_dir : spa_plugindir / 'alsa'
+@@ -30,7 +30,8 @@ alsa_udevrules = [
+ executable('spa-acp-tool',
+ [ 'acp-tool.c' ],
+ c_args : acp_c_args,
+- dependencies : [ spa_dep, alsa_dep, mathlib, acp_dep ],
++ include_directories : [spa_inc ],
++ dependencies : [ alsa_dep, mathlib, acp_dep ],
+ install : true,
+ )
+
+diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
+index 4d15271f5..6f4fd968b 100644
+--- a/spa/plugins/audioconvert/meson.build
++++ b/spa/plugins/audioconvert/meson.build
+@@ -17,7 +17,7 @@ if have_sse
+ 'volume-ops-sse.c',
+ 'channelmix-ops-sse.c' ],
+ c_args : [sse_args, '-O3', '-DHAVE_SSE'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_SSE']
+@@ -27,7 +27,7 @@ if have_sse2
+ audioconvert_sse2 = static_library('audioconvert_sse2',
+ ['fmt-ops-sse2.c' ],
+ c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_SSE2']
+@@ -38,7 +38,7 @@ if have_ssse3
+ ['fmt-ops-ssse3.c',
+ 'resample-native-ssse3.c' ],
+ c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_SSSE3']
+@@ -48,7 +48,7 @@ if have_sse41
+ audioconvert_sse41 = static_library('audioconvert_sse41',
+ ['fmt-ops-sse41.c'],
+ c_args : [sse41_args, '-O3', '-DHAVE_SSE41'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_SSE41']
+@@ -58,7 +58,7 @@ if have_avx and have_fma
+ audioconvert_avx = static_library('audioconvert_avx',
+ ['resample-native-avx.c'],
+ c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
+@@ -68,7 +68,7 @@ if have_avx2
+ audioconvert_avx2 = static_library('audioconvert_avx2',
+ ['fmt-ops-avx2.c'],
+ c_args : [avx2_args, '-O3', '-DHAVE_AVX2'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_AVX2']
+@@ -80,7 +80,7 @@ if have_neon
+ ['resample-native-neon.c',
+ 'fmt-ops-neon.c' ],
+ c_args : [neon_args, '-O3', '-DHAVE_NEON'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_NEON']
+@@ -100,8 +100,7 @@ audioconvert_lib = static_library('audioconvert',
+ 'volume-ops-c.c' ],
+ c_args : [ simd_cargs, '-O3'],
+ link_with : simd_dependencies,
+- include_directories : [configinc],
+- dependencies : [ spa_dep ],
++ include_directories : [configinc, spa_inc],
+ install : false
+ )
+ audioconvert_dep = declare_dependency(link_with: audioconvert_lib)
+@@ -109,7 +108,8 @@ audioconvert_dep = declare_dependency(link_with: audioconvert_lib)
+ spa_audioconvert_lib = shared_library('spa-audioconvert',
+ audioconvert_sources,
+ c_args : simd_cargs,
+- dependencies : [ spa_dep, mathlib, audioconvert_dep ],
++ include_directories : [spa_inc],
++ dependencies : [ mathlib, audioconvert_dep ],
+ install : true,
+ install_dir : spa_plugindir / 'audioconvert')
+ spa_audioconvert_dep = declare_dependency(link_with: spa_audioconvert_lib)
+@@ -117,7 +117,7 @@ spa_audioconvert_dep = declare_dependency(link_with: spa_audioconvert_lib)
+ test_lib = static_library('test_lib',
+ ['test-source.c' ],
+ c_args : ['-O3'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+
+@@ -132,8 +132,8 @@ test_apps = [
+ foreach a : test_apps
+ test(a,
+ executable(a, a + '.c',
+- dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
+- include_directories : [ configinc ],
++ dependencies : [ dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
++ include_directories : [ configinc, spa_inc ],
+ link_with : [ test_lib ],
+ install_rpath : spa_plugindir / 'audioconvert',
+ c_args : [ simd_cargs ],
+@@ -163,8 +163,8 @@ benchmark_apps = [
+ foreach a : benchmark_apps
+ benchmark(a,
+ executable(a, a + '.c',
+- dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
+- include_directories : [ configinc ],
++ dependencies : [ dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
++ include_directories : [ configinc, spa_inc ],
+ c_args : [ simd_cargs ],
+ install_rpath : spa_plugindir / 'audioconvert',
+ install : installed_tests_enabled,
+@@ -192,8 +192,9 @@ if sndfile_dep.found()
+ executable('spa-resample',
+ sparesample_sources,
+ c_args : [ simd_cargs ],
++ include_directories : [spa_inc ],
+ link_with : [ test_lib ],
+- dependencies : [ spa_dep, sndfile_dep, mathlib, audioconvert_dep ],
++ dependencies : [sndfile_dep, mathlib, audioconvert_dep],
+ install : true,
+ )
+ endif
+diff --git a/spa/plugins/audiomixer/meson.build b/spa/plugins/audiomixer/meson.build
+index 9e1d12d59..214c2a887 100644
+--- a/spa/plugins/audiomixer/meson.build
++++ b/spa/plugins/audiomixer/meson.build
+@@ -11,7 +11,7 @@ simd_dependencies = []
+ audiomixer_c = static_library('audiomixer_c',
+ ['mix-ops-c.c' ],
+ c_args : ['-O3'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_dependencies += audiomixer_c
+@@ -20,7 +20,7 @@ if have_sse
+ audiomixer_sse = static_library('audiomixer_sse',
+ ['mix-ops-sse.c' ],
+ c_args : [sse_args, '-O3', '-DHAVE_SSE'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_SSE']
+@@ -30,7 +30,7 @@ if have_sse2
+ audiomixer_sse2 = static_library('audiomixer_sse2',
+ ['mix-ops-sse2.c' ],
+ c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_SSE2']
+@@ -40,7 +40,7 @@ if have_avx and have_fma
+ audiomixer_avx = static_library('audiomixer_avx',
+ ['mix-ops-avx.c'],
+ c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
+@@ -51,7 +51,8 @@ audiomixerlib = shared_library('spa-audiomixer',
+ audiomixer_sources,
+ c_args : simd_cargs,
+ link_with : simd_dependencies,
+- dependencies : [ spa_dep, mathlib ],
++ include_directories : [spa_inc],
++ dependencies : [ mathlib ],
+ install : true,
+ install_dir : spa_plugindir / 'audiomixer'
+ )
+diff --git a/spa/plugins/audiotestsrc/meson.build b/spa/plugins/audiotestsrc/meson.build
+index d1b22428d..8011ee883 100644
+--- a/spa/plugins/audiotestsrc/meson.build
++++ b/spa/plugins/audiotestsrc/meson.build
+@@ -2,6 +2,7 @@ audiotestsrc_sources = ['audiotestsrc.c', 'plugin.c']
+
+ audiotestsrclib = shared_library('spa-audiotestsrc',
+ audiotestsrc_sources,
+- dependencies : [ spa_dep, mathlib ],
++ include_directories : [spa_inc],
++ dependencies : [mathlib, ],
+ install : true,
+ install_dir : spa_plugindir / 'audiotestsrc')
+diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build
+index b13e23cf4..eca9c9eb5 100644
+--- a/spa/plugins/bluez5/meson.build
++++ b/spa/plugins/bluez5/meson.build
+@@ -56,8 +56,8 @@ endif
+
+ bluez5lib = shared_library('spa-bluez5',
+ bluez5_sources,
+- include_directories : [ configinc ],
+- dependencies : [ spa_dep, bluez5_deps ],
++ include_directories : [ spa_inc, configinc ],
++ dependencies : bluez5_deps,
+ install : true,
+ install_dir : spa_plugindir / 'bluez5')
+
+@@ -65,26 +65,26 @@ codec_args = [ '-DCODEC_PLUGIN' ]
+
+ bluez_codec_sbc = shared_library('spa-codec-bluez5-sbc',
+ [ 'a2dp-codec-sbc.c', 'a2dp-codecs.c' ],
+- include_directories : [ configinc ],
++ include_directories : [ spa_inc, configinc ],
+ c_args : codec_args,
+- dependencies : [ spa_dep, sbc_dep ],
++ dependencies : sbc_dep,
+ install : true,
+ install_dir : spa_plugindir / 'bluez5')
+
+ bluez_codec_faststream = shared_library('spa-codec-bluez5-faststream',
+ [ 'a2dp-codec-faststream.c', 'a2dp-codecs.c' ],
+- include_directories : [ configinc ],
++ include_directories : [ spa_inc, configinc ],
+ c_args : codec_args,
+- dependencies : [ spa_dep, sbc_dep ],
++ dependencies : sbc_dep,
+ install : true,
+ install_dir : spa_plugindir / 'bluez5')
+
+ if fdk_aac_dep.found()
+ bluez_codec_aac = shared_library('spa-codec-bluez5-aac',
+ [ 'a2dp-codec-aac.c', 'a2dp-codecs.c' ],
+- include_directories : [ configinc ],
++ include_directories : [ spa_inc, configinc ],
+ c_args : codec_args,
+- dependencies : [ spa_dep, fdk_aac_dep ],
++ dependencies : fdk_aac_dep,
+ install : true,
+ install_dir : spa_plugindir / 'bluez5')
+ endif
+@@ -92,9 +92,9 @@ endif
+ if aptx_dep.found()
+ bluez_codec_aptx = shared_library('spa-codec-bluez5-aptx',
+ [ 'a2dp-codec-aptx.c', 'a2dp-codecs.c' ],
+- include_directories : [ configinc ],
++ include_directories : [ spa_inc, configinc ],
+ c_args : codec_args,
+- dependencies : [ spa_dep, aptx_dep, sbc_dep ],
++ dependencies : [ aptx_dep, sbc_dep ],
+ install : true,
+ install_dir : spa_plugindir / 'bluez5')
+ endif
+@@ -108,9 +108,9 @@ if ldac_dep.found()
+ endif
+ bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac',
+ [ 'a2dp-codec-ldac.c', 'a2dp-codecs.c' ],
+- include_directories : [ configinc ],
++ include_directories : [ spa_inc, configinc ],
+ c_args : ldac_args,
+- dependencies : [ spa_dep, ldac_dep ],
++ dependencies : ldac_dep,
+ install : true,
+ install_dir : spa_plugindir / 'bluez5')
+ endif
+diff --git a/spa/plugins/control/meson.build b/spa/plugins/control/meson.build
+index adabdfab3..10f9cfeda 100644
+--- a/spa/plugins/control/meson.build
++++ b/spa/plugins/control/meson.build
+@@ -5,6 +5,7 @@ control_sources = [
+
+ controllib = shared_library('spa-control',
+ control_sources,
+- dependencies : [ spa_dep, mathlib ],
++ include_directories : [spa_inc],
++ dependencies : [ mathlib ],
+ install : true,
+ install_dir : spa_plugindir / 'control')
+diff --git a/spa/plugins/ffmpeg/meson.build b/spa/plugins/ffmpeg/meson.build
+index 0e41ecb6e..2aec258da 100644
+--- a/spa/plugins/ffmpeg/meson.build
++++ b/spa/plugins/ffmpeg/meson.build
+@@ -4,6 +4,7 @@ ffmpeg_sources = ['ffmpeg.c',
+
+ ffmpeglib = shared_library('spa-ffmpeg',
+ ffmpeg_sources,
+- dependencies : [ spa_dep, avcodec_dep ],
++ include_directories : [spa_inc],
++ dependencies : [avcodec_dep],
+ install : true,
+ install_dir : spa_plugindir / 'ffmpeg')
+diff --git a/spa/plugins/jack/meson.build b/spa/plugins/jack/meson.build
+index 312a54061..b1732acd6 100644
+--- a/spa/plugins/jack/meson.build
++++ b/spa/plugins/jack/meson.build
+@@ -7,6 +7,7 @@ spa_jack_sources = [
+
+ spa_jack = shared_library('spa-jack',
+ spa_jack_sources,
+- dependencies : [ spa_dep, jack_dep, mathlib ],
++ include_directories : [spa_inc],
++ dependencies : [ jack_dep, mathlib ],
+ install : true,
+ install_dir : spa_plugindir / 'jack')
+diff --git a/spa/plugins/libcamera/meson.build b/spa/plugins/libcamera/meson.build
+index abb1a42cf..02ac2d9c2 100644
+--- a/spa/plugins/libcamera/meson.build
++++ b/spa/plugins/libcamera/meson.build
+@@ -11,7 +11,8 @@ summary({'libdrm': libdrm_dep.found()}, bool_yn: true, section: 'Backend')
+ if libdrm_dep.found()
+ libcameralib = shared_library('spa-libcamera',
+ libcamera_sources,
+- dependencies : [ spa_dep, libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
++ include_directories : [ spa_inc ],
++ dependencies : [ libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
+ install : true,
+ install_dir : spa_plugindir / 'libcamera')
+ endif
+diff --git a/spa/plugins/support/meson.build b/spa/plugins/support/meson.build
+index b810b283c..15010a51e 100644
+--- a/spa/plugins/support/meson.build
++++ b/spa/plugins/support/meson.build
+@@ -17,12 +17,14 @@ endif
+
+ spa_support_lib = shared_library('spa-support',
+ spa_support_sources,
++ include_directories : [ spa_inc ],
+ c_args : [ simd_cargs ],
+- dependencies : [ spa_dep, pthread_lib, epoll_shim_dep ],
++ dependencies : [ pthread_lib, epoll_shim_dep ],
+ install : true,
+ install_dir : spa_plugindir / 'support')
+ spa_support_dep = declare_dependency(link_with: spa_support_lib)
+
++
+ if not get_option('evl').disabled()
+ evl_inc = include_directories('/usr/evl/include')
+ evl_lib = cc.find_library('evl',
+@@ -33,8 +35,8 @@ if not get_option('evl').disabled()
+
+ spa_evl_lib = shared_library('spa-evl',
+ spa_evl_sources,
+- include_directories : [ evl_inc],
+- dependencies : [ spa_dep, pthread_lib, evl_lib ],
++ include_directories : [ spa_inc, evl_inc],
++ dependencies : [ pthread_lib, evl_lib],
+ install : true,
+ install_dir : spa_plugindir / 'support')
+ endif
+@@ -44,7 +46,8 @@ if dbus_dep.found()
+
+ spa_dbus_lib = shared_library('spa-dbus',
+ spa_dbus_sources,
+- dependencies : [ spa_dep, dbus_dep ],
++ include_directories : [ spa_inc],
++ dependencies : [dbus_dep, ],
+ install : true,
+ install_dir : spa_plugindir / 'support')
+ spa_dbus_dep = declare_dependency(link_with: spa_dbus_lib)
+@@ -61,7 +64,8 @@ if systemd_dep.found()
+
+ spa_journal_lib = shared_library('spa-journal',
+ spa_journal_sources,
+- dependencies : [ spa_dep, systemd_dep ],
++ include_directories : spa_inc,
++ dependencies : systemd_dep,
+ install : true,
+ install_dir : spa_plugindir / 'support')
+ spa_journal_dep = declare_dependency(link_with: spa_journal_lib)
+diff --git a/spa/plugins/test/meson.build b/spa/plugins/test/meson.build
+index 950ee7c38..e824450f6 100644
+--- a/spa/plugins/test/meson.build
++++ b/spa/plugins/test/meson.build
+@@ -2,6 +2,7 @@ test_sources = ['fakesrc.c', 'fakesink.c', 'plugin.c']
+
+ testlib = shared_library('spa-test',
+ test_sources,
+- dependencies : [ spa_dep, pthread_lib ],
++ include_directories : [ spa_inc],
++ dependencies : [pthread_lib, ],
+ install : true,
+ install_dir : spa_plugindir / 'test')
+diff --git a/spa/plugins/v4l2/meson.build b/spa/plugins/v4l2/meson.build
+index 648583f32..297a62b16 100644
+--- a/spa/plugins/v4l2/meson.build
++++ b/spa/plugins/v4l2/meson.build
+@@ -5,6 +5,7 @@ v4l2_sources = ['v4l2.c',
+
+ v4l2lib = shared_library('spa-v4l2',
+ v4l2_sources,
+- dependencies : [ spa_dep, libudev_dep, libinotify_dep ],
++ include_directories : [ spa_inc ],
++ dependencies : [ libudev_dep, libinotify_dep ],
+ install : true,
+ install_dir : spa_plugindir / 'v4l2')
+diff --git a/spa/plugins/videoconvert/meson.build b/spa/plugins/videoconvert/meson.build
+index 24673a541..17d860d5a 100644
+--- a/spa/plugins/videoconvert/meson.build
++++ b/spa/plugins/videoconvert/meson.build
+@@ -9,7 +9,8 @@ simd_dependencies = []
+ videoconvertlib = shared_library('spa-videoconvert',
+ videoconvert_sources,
+ c_args : simd_cargs,
+- dependencies : [ spa_dep, mathlib ],
++ include_directories : [spa_inc],
++ dependencies : [ mathlib ],
+ link_with : simd_dependencies,
+ install : true,
+ install_dir : spa_plugindir / 'videoconvert')
+diff --git a/spa/plugins/videotestsrc/meson.build b/spa/plugins/videotestsrc/meson.build
+index 01a33ee29..f6f3dca56 100644
+--- a/spa/plugins/videotestsrc/meson.build
++++ b/spa/plugins/videotestsrc/meson.build
+@@ -2,6 +2,7 @@ videotestsrc_sources = ['videotestsrc.c', 'plugin.c']
+
+ videotestsrclib = shared_library('spa-videotestsrc',
+ videotestsrc_sources,
+- dependencies : [ spa_dep, pthread_lib ],
++ include_directories : [ spa_inc],
++ dependencies : [pthread_lib, ],
+ install : true,
+ install_dir : spa_plugindir / 'videotestsrc')
+diff --git a/spa/plugins/volume/meson.build b/spa/plugins/volume/meson.build
+index 2445e2bbd..e10f89563 100644
+--- a/spa/plugins/volume/meson.build
++++ b/spa/plugins/volume/meson.build
+@@ -2,6 +2,6 @@ volume_sources = ['volume.c', 'plugin.c']
+
+ volumelib = shared_library('spa-volume',
+ volume_sources,
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : true,
+ install_dir : spa_plugindir / 'volume')
+diff --git a/spa/plugins/vulkan/meson.build b/spa/plugins/vulkan/meson.build
+index b79bca2cf..9683b41ea 100644
+--- a/spa/plugins/vulkan/meson.build
++++ b/spa/plugins/vulkan/meson.build
+@@ -6,6 +6,7 @@ spa_vulkan_sources = [
+
+ spa_vulkan = shared_library('spa-vulkan',
+ spa_vulkan_sources,
+- dependencies : [ spa_dep, vulkan_dep, mathlib ],
++ include_directories : [spa_inc],
++ dependencies : [ vulkan_dep, mathlib ],
+ install : true,
+ install_dir : spa_plugindir / 'vulkan')
+diff --git a/spa/tests/meson.build b/spa/tests/meson.build
+index 9e2a211e2..146cfe08a 100644
+--- a/spa/tests/meson.build
++++ b/spa/tests/meson.build
+@@ -20,7 +20,7 @@ if find.found()
+ configuration: c)
+ executable('spa-include-test-@0@'.format(spa_header.underscorify()),
+ src,
+- dependencies: [ spa_dep ],
++ include_directories: [spa_inc],
+ install: false)
+ endif
+ endforeach
+@@ -35,7 +35,8 @@ benchmark_apps = [
+ foreach a : benchmark_apps
+ benchmark('spa-' + a,
+ executable('spa-' + a, a + '.c',
+- dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib ],
++ dependencies : [dl_lib, pthread_lib, mathlib ],
++ include_directories : [spa_inc ],
+ install : installed_tests_enabled,
+ install_dir : installed_tests_execdir,
+ ),
+diff --git a/spa/tools/meson.build b/spa/tools/meson.build
+index 6f12e9c8f..e4df6c3ac 100644
+--- a/spa/tools/meson.build
++++ b/spa/tools/meson.build
+@@ -1,11 +1,14 @@
+ executable('spa-inspect', 'spa-inspect.c',
+- dependencies : [ spa_dep, dl_lib ],
++ include_directories : [spa_inc],
++ dependencies : [dl_lib, ],
+ install : true)
+
+ executable('spa-monitor', 'spa-monitor.c',
+- dependencies : [ spa_dep, dl_lib ],
++ include_directories : [spa_inc],
++ dependencies : [dl_lib, ],
+ install : true)
+
+ executable('spa-json-dump', 'spa-json-dump.c',
+- dependencies : [ spa_dep, dl_lib, ],
++ include_directories : [spa_inc],
++ dependencies : [dl_lib, ],
+ install : true)
+diff --git a/src/daemon/meson.build b/src/daemon/meson.build
+index 5e64287a1..104a6dbf3 100644
+--- a/src/daemon/meson.build
++++ b/src/daemon/meson.build
+@@ -86,16 +86,16 @@ pipewire_exec = executable('pipewire',
+ pipewire_daemon_sources,
+ install: true,
+ c_args : pipewire_c_args,
+- include_directories : [ configinc ],
+- dependencies : [ spa_dep, pipewire_dep, ],
++ include_directories : [configinc, spa_inc],
++ dependencies : [pipewire_dep, ],
+ )
+
+ executable('pipewire-pulse',
+ pipewire_daemon_sources,
+ install: true,
+ c_args : pipewire_c_args,
+- include_directories : [ configinc ],
+- dependencies : [ spa_dep, pipewire_dep, ],
++ include_directories : [configinc, spa_inc],
++ dependencies : [pipewire_dep, ],
+ )
+
+ ln = find_program('ln')
+diff --git a/src/gst/meson.build b/src/gst/meson.build
+index 709dc0f1c..b91b33dc9 100644
+--- a/src/gst/meson.build
++++ b/src/gst/meson.build
+@@ -24,8 +24,8 @@ pipewire_gst_headers = [
+
+ pipewire_gst = shared_library('gstpipewire',
+ pipewire_gst_sources,
+- include_directories : [ configinc ],
+- dependencies : [ spa_dep, gst_dep, pipewire_dep ],
++ include_directories : [configinc, spa_inc],
++ dependencies : [gst_dep, pipewire_dep],
+ install : true,
+ install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
+ )
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index 45852f3b9..61a53bd6f 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -30,20 +30,20 @@ module_sources = [
+ ]
+
+ pipewire_module_access = shared_library('pipewire-module-access', [ 'module-access.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_loopback = shared_library('pipewire-module-loopback',
+ [ 'module-loopback.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ simd_cargs = []
+@@ -53,7 +53,7 @@ if have_sse
+ pffft_sse = static_library('pffft_sse',
+ ['module-filter-chain/pffft.c' ],
+ c_args : [sse_args, '-O3', '-DHAVE_SSE'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_SSE']
+@@ -63,7 +63,7 @@ if have_neon
+ pffft_neon = static_library('pffft_neon',
+ ['module-filter-chain/pffft.c' ],
+ c_args : [neon_args, '-O3', '-DHAVE_NEON'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_cargs += ['-DHAVE_NEON']
+@@ -73,7 +73,7 @@ endif
+ pffft_c = static_library('pffft_c',
+ ['module-filter-chain/pffft.c' ],
+ c_args : [simd_cargs, '-O3', '-DPFFFT_SIMD_DISABLE'],
+- dependencies : [ spa_dep ],
++ include_directories : [spa_inc],
+ install : false
+ )
+ simd_dependencies += pffft_c
+@@ -99,7 +99,7 @@ endif
+
+ pipewire_module_filter_chain = shared_library('pipewire-module-filter-chain',
+ filter_chain_sources,
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -120,7 +120,7 @@ endif
+
+ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
+ pipewire_module_echo_cancel_sources,
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -130,17 +130,17 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
+ pipewire_module_profiler = shared_library('pipewire-module-profiler',
+ [ 'module-profiler.c',
+ 'module-profiler/protocol-native.c', ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ build_module_rt = build_machine.system() == 'linux'
+ if build_module_rt
+ pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -152,7 +152,7 @@ summary({'rt': build_module_rt}, bool_yn: true, section: 'Optional Modules')
+ build_module_rtkit = dbus_dep.found()
+ if build_module_rtkit
+ pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -164,7 +164,7 @@ summary({'rtkit': build_module_rtkit}, bool_yn: true, section: 'Optional Modules
+ build_module_portal = dbus_dep.found()
+ if build_module_portal
+ pipewire_module_portal = shared_library('pipewire-module-portal', [ 'module-portal.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -178,20 +178,20 @@ pipewire_module_client_device = shared_library('pipewire-module-client-device',
+ 'module-client-device/resource-device.c',
+ 'module-client-device/proxy-device.c',
+ 'module-client-device/protocol-native.c', ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_link_factory = shared_library('pipewire-module-link-factory',
+ [ 'module-link-factory.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_protocol_deps = [mathlib, dl_lib, pipewire_dep]
+@@ -207,7 +207,7 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ
+ 'module-protocol-native/protocol-native.c',
+ 'module-protocol-native/v0/protocol-native.c',
+ 'module-protocol-native/connection.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -281,7 +281,7 @@ endif
+
+ pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse',
+ pipewire_module_protocol_pulse_sources,
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -293,7 +293,7 @@ if build_module_pulse_tunnel
+ pipewire_module_pulse_tunnel = shared_library('pipewire-module-pulse-tunnel',
+ [ 'module-pulse-tunnel.c',
+ 'module-protocol-pulse/format.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -304,7 +304,7 @@ summary({'pulse-tunnel': build_module_pulse_tunnel}, bool_yn: true, section: 'Op
+
+ pipewire_module_protocol_simple = shared_library('pipewire-module-protocol-simple',
+ [ 'module-protocol-simple.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -313,20 +313,20 @@ pipewire_module_protocol_simple = shared_library('pipewire-module-protocol-simpl
+
+ pipewire_module_example_sink = shared_library('pipewire-module-example-sink',
+ [ 'module-example-sink.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : false,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_example_sink = shared_library('pipewire-module-example-source',
+ [ 'module-example-source.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : false,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_client_node = shared_library('pipewire-module-client-node',
+@@ -338,12 +338,12 @@ pipewire_module_client_node = shared_library('pipewire-module-client-node',
+ 'module-client-node/v0/transport.c',
+ 'module-client-node/v0/protocol-native.c',
+ 'spa/spa-node.c', ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ link_with : pipewire_module_protocol_native,
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_metadata = shared_library('pipewire-module-metadata',
+@@ -351,12 +351,12 @@ pipewire_module_metadata = shared_library('pipewire-module-metadata',
+ 'module-metadata/proxy-metadata.c',
+ 'module-metadata/metadata.c',
+ 'module-metadata/protocol-native.c'],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ link_with : pipewire_module_protocol_native,
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ test('pw-test-protocol-native',
+@@ -364,8 +364,8 @@ test('pw-test-protocol-native',
+ [ 'module-protocol-native/test-connection.c',
+ 'module-protocol-native/connection.c' ],
+ c_args : libpipewire_c_args,
+- include_directories : [configinc ],
+- dependencies : [spa_dep, pipewire_dep],
++ include_directories : [configinc, spa_inc ],
++ dependencies : [pipewire_dep],
+ install : installed_tests_enabled,
+ install_dir : installed_tests_execdir,
+ ),
+@@ -391,7 +391,7 @@ pipewire_module_adapter = shared_library('pipewire-module-adapter',
+ [ 'module-adapter.c',
+ 'module-adapter/adapter.c',
+ 'spa/spa-node.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -413,11 +413,11 @@ pipewire_module_session_manager = shared_library('pipewire-module-session-manage
+ 'module-session-manager/proxy-session-manager.c',
+ 'module-session-manager/session.c',
+ ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ build_module_zeroconf_discover = avahi_dep.found()
+@@ -426,7 +426,7 @@ pipewire_module_zeroconf_discover = shared_library('pipewire-module-zeroconf-dis
+ [ 'module-zeroconf-discover.c',
+ 'module-protocol-pulse/format.c',
+ 'module-zeroconf-discover/avahi-poll.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -440,7 +440,7 @@ if build_module_raop_discover
+ pipewire_module_raop_discover = shared_library('pipewire-module-raop-discover',
+ [ 'module-raop-discover.c',
+ 'module-zeroconf-discover/avahi-poll.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -454,7 +454,7 @@ if build_module_raop
+ pipewire_module_raop_sink = shared_library('pipewire-module-raop-sink',
+ [ 'module-raop-sink.c',
+ 'module-raop/rtsp-client.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -470,7 +470,7 @@ build_module_roc = roc_lib.found()
+ if build_module_roc
+ pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
+ [ 'module-roc-sink.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+@@ -479,7 +479,7 @@ pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
+
+ pipewire_module_roc_source = shared_library('pipewire-module-roc-source',
+ [ 'module-roc-source.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+ install_rpath: modules_install_dir,
+diff --git a/src/modules/spa/meson.build b/src/modules/spa/meson.build
+index 8332910b5..ab4fac18d 100644
+--- a/src/modules/spa/meson.build
++++ b/src/modules/spa/meson.build
+@@ -1,31 +1,31 @@
+ pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
+ [ 'module-node.c', 'spa-node.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_spa_device = shared_library('pipewire-module-spa-device',
+ [ 'module-device.c', 'spa-device.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-factory',
+ [ 'module-node-factory.c', 'spa-node.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+
+ pipewire_module_spa_device_factory = shared_library('pipewire-module-spa-device-factory',
+ [ 'module-device-factory.c', 'spa-device.c' ],
+- include_directories : [configinc],
++ include_directories : [configinc, spa_inc],
+ install : true,
+ install_dir : modules_install_dir,
+- dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
++ dependencies : [mathlib, dl_lib, pipewire_dep],
+ )
+diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
+index 969f50b22..f66ce8746 100644
+--- a/src/pipewire/meson.build
++++ b/src/pipewire/meson.build
+@@ -103,9 +103,9 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
+ version : libversion,
+ soversion : soversion,
+ c_args : libpipewire_c_args,
+- include_directories : [pipewire_inc, configinc, includes_inc],
++ include_directories : [pipewire_inc, configinc, spa_inc, includes_inc],
+ install : true,
+- dependencies : [spa_dep, dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
++ dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
+ )
+
+ pipewire_dep = declare_dependency(link_with : libpipewire,
+diff --git a/test/meson.build b/test/meson.build
+index 89f2bc2ec..87e211431 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -19,6 +19,7 @@ pwtest_c_args = [
+ ]
+
+ pwtest_inc = [
++ spa_inc,
+ pipewire_inc,
+ configinc,
+ includes_inc,
+@@ -36,7 +37,6 @@ test('test-pwtest',
+ executable('test-pwtest',
+ 'test-pwtest.c',
+ include_directories: pwtest_inc,
+- dependencies: [ spa_dep ],
+ link_with: pwtest_lib)
+ )
+
+@@ -45,7 +45,6 @@ test('test-pwtest',
+ executable('test-example',
+ 'test-example.c',
+ include_directories: pwtest_inc,
+- dependencies: [ spa_dep ],
+ link_with: pwtest_lib)
+
+ test('test-pw-utils',
+@@ -55,7 +54,6 @@ test('test-pw-utils',
+ 'test-map.c',
+ 'test-utils.c',
+ include_directories: pwtest_inc,
+- dependencies: [ spa_dep ],
+ link_with: pwtest_lib)
+ )
+
+@@ -63,7 +61,6 @@ test('test-lib',
+ executable('test-lib',
+ 'test-lib.c',
+ include_directories: pwtest_inc,
+- dependencies: [ spa_dep ],
+ link_with: pwtest_lib)
+ )
+
+@@ -71,7 +68,6 @@ test('test-client',
+ executable('test-client',
+ 'test-client.c',
+ include_directories: pwtest_inc,
+- dependencies: [ spa_dep ],
+ link_with: pwtest_lib)
+ )
+
+@@ -80,7 +76,7 @@ test('test-context',
+ 'test-context.c',
+ 'test-config.c',
+ include_directories: pwtest_inc,
+- dependencies: [spa_dep, spa_support_dep, spa_dbus_dep],
++ dependencies: [spa_support_dep, spa_dbus_dep],
+ link_with: [pwtest_lib,
+ pipewire_module_protocol_native,
+ pipewire_module_client_node,
+@@ -95,7 +91,7 @@ test('test-support',
+ 'test-support.c',
+ 'test-logger.c',
+ include_directories: pwtest_inc,
+- dependencies: [spa_dep, systemd_dep, spa_support_dep, spa_journal_dep],
++ dependencies: [systemd_dep, spa_support_dep, spa_journal_dep],
+ link_with: [pwtest_lib])
+ )
+ test('test-spa',
+@@ -107,7 +103,6 @@ test('test-spa',
+ 'test-spa-node.c',
+ 'test-spa-pod.c',
+ include_directories: pwtest_inc,
+- dependencies: [ spa_dep ],
+ link_with: pwtest_lib)
+ )
+
+--
+2.34.1
+
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-node-driver-make-the-timerfd-non-blocking.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-node-driver-make-the-timerfd-non-blocking.patch
deleted file mode 100644
index 5a59d8676..000000000
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0002-node-driver-make-the-timerfd-non-blocking.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 5aa9c953909b936ba215ebca77461a17160f59fb Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Thu, 1 Jul 2021 11:50:40 +0300
-Subject: [PATCH] node-driver: make the timerfd non-blocking
-
-Relates to #1377
-
-Upstream-Status: Backport [from master/0.3.32]
-Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
----
- spa/plugins/support/node-driver.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/spa/plugins/support/node-driver.c b/spa/plugins/support/node-driver.c
-index 34533d0d9..32964110d 100644
---- a/spa/plugins/support/node-driver.c
-+++ b/spa/plugins/support/node-driver.c
-@@ -119,8 +119,11 @@ static void on_timeout(struct spa_source *source)
- spa_log_trace(this->log, "timeout");
-
- if (spa_system_timerfd_read(this->data_system,
-- this->timer_source.fd, &expirations) < 0)
-+ this->timer_source.fd, &expirations) < 0) {
-+ if (errno == EAGAIN)
-+ return;
- perror("read timerfd");
-+ }
-
- nsec = this->next_time;
-
-@@ -349,7 +352,8 @@ impl_init(const struct spa_handle_factory *factory,
-
- this->timer_source.func = on_timeout;
- this->timer_source.data = this;
-- this->timer_source.fd = spa_system_timerfd_create(this->data_system, CLOCK_MONOTONIC, SPA_FD_CLOEXEC);
-+ this->timer_source.fd = spa_system_timerfd_create(this->data_system, CLOCK_MONOTONIC,
-+ SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
- this->timer_source.mask = SPA_IO_IN;
- this->timer_source.rmask = 0;
- this->timerspec.it_value.tv_sec = 0;
---
-2.30.2
-
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0003-Revert-meson-declare-spa_dep-and-override_dependency.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0003-Revert-meson-declare-spa_dep-and-override_dependency.patch
new file mode 100644
index 000000000..47e4f3cc2
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0003-Revert-meson-declare-spa_dep-and-override_dependency.patch
@@ -0,0 +1,83 @@
+From 83b7f6457e5dca3ee2145e35f361f1520d24be42 Mon Sep 17 00:00:00 2001
+From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
+Date: Fri, 14 Jan 2022 18:30:44 +0530
+Subject: [PATCH 3/4] Revert "meson: declare spa_dep and override_dependency()
+ for spa and pipewire"
+
+This reverts commit 7ab5c35cadc075bcdf44031f1f7d95352cf9a13b.
+
+Upstream-Status: Inappropriate[meson version dependent]
+---
+ meson.build | 2 +-
+ spa/meson.build | 13 +------------
+ src/pipewire/meson.build | 10 ++--------
+ 3 files changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 67e697c15..476f722b7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project('pipewire', ['c' ],
+ version : '0.3.43',
+ license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
+- meson_version : '>= 0.56.0',
++ meson_version : '>= 0.49.0',
+ default_options : [ 'warning_level=3',
+ 'c_std=gnu99',
+ 'cpp_std=c++17',
+diff --git a/spa/meson.build b/spa/meson.build
+index 2717b86d6..4e0f96727 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -56,20 +56,9 @@ if not get_option('examples').disabled()
+ subdir('examples')
+ endif
+
+-spa_dep = declare_dependency(
+- include_directories : [spa_inc],
+- version : spaversion,
+- variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
+-)
+-
+ pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
+ name : 'libspa',
+ subdirs : spa_name,
+ description : 'Simple Plugin API',
+ version : spaversion,
+- extra_cflags : '-D_REENTRANT',
+- variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
+- uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
+-)
+-
+-meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
++ extra_cflags : '-D_REENTRANT')
+diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
+index f66ce8746..5cfaba3f9 100644
+--- a/src/pipewire/meson.build
++++ b/src/pipewire/meson.build
+@@ -109,12 +109,8 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
+ )
+
+ pipewire_dep = declare_dependency(link_with : libpipewire,
+- include_directories : [pipewire_inc, configinc],
+- dependencies : [pthread_lib, atomic_dep, spa_dep],
+- variables : {
+- 'moduledir' : meson.current_build_dir() / '..' / 'modules',
+- 'confdatadir' : meson.current_build_dir() / '..' / 'daemon',
+- }
++ include_directories : [pipewire_inc, configinc, spa_inc],
++ dependencies : [pthread_lib, atomic_dep, ],
+ )
+
+ pkgconfig.generate(libpipewire,
+@@ -132,6 +128,4 @@ pkgconfig.generate(libpipewire,
+ ],
+ )
+
+-meson.override_dependency('lib@0@'.format(pipewire_name), pipewire_dep)
+-
+ subdir('extensions')
+--
+2.34.1
+
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0004-Revert-systemd-correctly-prefix-systemd-system-units.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0004-Revert-systemd-correctly-prefix-systemd-system-units.patch
new file mode 100644
index 000000000..8b975d07f
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0004-Revert-systemd-correctly-prefix-systemd-system-units.patch
@@ -0,0 +1,25 @@
+From 85d47ff146f1bda2f94d32b5b392024089c6f564 Mon Sep 17 00:00:00 2001
+From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
+Date: Fri, 14 Jan 2022 20:51:09 +0530
+Subject: [PATCH 4/4] Revert "systemd: correctly prefix systemd system units"
+
+This reverts commit 5054b48c9de655b4b48f7c801cb305d9eb122520.
+
+Upstream-Status: Inappropriate[this systemd configuration is in not relvent to AGL]
+---
+ src/daemon/systemd/system/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/systemd/system/meson.build b/src/daemon/systemd/system/meson.build
+index 7e1c223f8..4d942c1ab 100644
+--- a/src/daemon/systemd/system/meson.build
++++ b/src/daemon/systemd/system/meson.build
+@@ -1,4 +1,4 @@
+-systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix])
++systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir', pkgconfig_define : [ 'prefix', prefix])
+
+ install_data(sources : 'pipewire.socket',
+ install_dir : systemd_system_services_dir)
+--
+2.34.1
+
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0005-pipewiresink-set-a-default-channel-map-if-the-number.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0005-pipewiresink-set-a-default-channel-map-if-the-number.patch
new file mode 100644
index 000000000..3b1b2a490
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0005-pipewiresink-set-a-default-channel-map-if-the-number.patch
@@ -0,0 +1,77 @@
+From ee2e6412d37d012fbf8d25bd37271a5ee92b3ad4 Mon Sep 17 00:00:00 2001
+From: George Kiagiadakis <george.kiagiadakis@collabora.com>
+Date: Thu, 3 Feb 2022 15:08:57 +0200
+Subject: [PATCH] pipewiresink: set a default channel map if the number of
+ channels is fixed
+
+This allows remaping streams using pipewiresink to match the channel layout
+of the target device
+Upstream-Status: Backport [from master/0.3.46]
+---
+ src/gst/gstpipewireformat.c | 42 ++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/src/gst/gstpipewireformat.c b/src/gst/gstpipewireformat.c
+index dca90267c..c8ce7ba62 100644
+--- a/src/gst/gstpipewireformat.c
++++ b/src/gst/gstpipewireformat.c
+@@ -445,6 +445,44 @@ handle_video_fields (ConvertData *d)
+ return TRUE;
+ }
+
++static void
++set_default_channels (struct spa_pod_builder *b, uint32_t channels)
++{
++ uint32_t position[SPA_AUDIO_MAX_CHANNELS] = {0};
++ gboolean ok = TRUE;
++
++ switch (channels) {
++ case 8:
++ position[6] = SPA_AUDIO_CHANNEL_SL;
++ position[7] = SPA_AUDIO_CHANNEL_SR;
++ SPA_FALLTHROUGH
++ case 6:
++ position[5] = SPA_AUDIO_CHANNEL_LFE;
++ SPA_FALLTHROUGH
++ case 5:
++ position[4] = SPA_AUDIO_CHANNEL_FC;
++ SPA_FALLTHROUGH
++ case 4:
++ position[2] = SPA_AUDIO_CHANNEL_RL;
++ position[3] = SPA_AUDIO_CHANNEL_RR;
++ SPA_FALLTHROUGH
++ case 2:
++ position[0] = SPA_AUDIO_CHANNEL_FL;
++ position[1] = SPA_AUDIO_CHANNEL_FR;
++ break;
++ case 1:
++ position[0] = SPA_AUDIO_CHANNEL_MONO;
++ break;
++ default:
++ ok = FALSE;
++ break;
++ }
++
++ if (ok)
++ spa_pod_builder_add (b, SPA_FORMAT_AUDIO_position,
++ SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, channels, position), 0);
++}
++
+ static gboolean
+ handle_audio_fields (ConvertData *d)
+ {
+@@ -538,8 +576,10 @@ handle_audio_fields (ConvertData *d)
+ }
+ if (i > 0) {
+ choice = spa_pod_builder_pop(&d->b, &f);
+- if (i == 1)
++ if (i == 1) {
+ choice->body.type = SPA_CHOICE_None;
++ set_default_channels (&d->b, v);
++ }
+ }
+ }
+ return TRUE;
+--
+2.34.1
+
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bb b/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.43.bb
index b1a1aebc0..f1d4b3863 100644
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bb
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.43.bb
@@ -20,7 +20,8 @@ SECTION = "multimedia"
DEPENDS = "dbus"
-SRCREV = "e857856be7b64d562cdcc01c43933218a68b225e"
+# v0.3.43
+SRCREV = "07724b7aefa8a23a016727b53f4e426ecd63d248"
SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
@@ -29,9 +30,9 @@ inherit meson pkgconfig systemd manpages gettext useradd
USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system pipewire"
+GROUPADD_PARAM:${PN} = "--system pipewire"
-USERADD_PARAM_${PN} = "--system --home / --no-create-home \
+USERADD_PARAM:${PN} = "--system --home / --no-create-home \
--comment 'PipeWire multimedia daemon' \
--gid pipewire --groups audio,video \
pipewire"
@@ -52,6 +53,11 @@ USERADD_PARAM_${PN} = "--system --home / --no-create-home \
# instance does.
#
# manpage generation requires xmltoman, which is not available.
+#
+# Dont build any session managers along with pipewire
+# wireplumber is the session manger used in AGL and it will
+# be build in a different recipe
+#
EXTRA_OEMESON += " \
-Daudiotestsrc=enabled \
-Devl=disabled \
@@ -63,6 +69,7 @@ EXTRA_OEMESON += " \
-Dvulkan=disabled \
-Dlibcamera=disabled \
-Dman=disabled \
+ -Dsession-managers=[] \
"
PACKAGECONFIG ??= "\
@@ -88,10 +95,11 @@ PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd-system-service=enabled ,-D
PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev"
PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib"
PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,,jack"
+PACKAGECONFIG[pipewire-v4l2] = "-Dpipewire-v4l2=enabled -Dpipewire-v4l2=${libdir}/${PW_MODULE_SUBDIR}/v4l2,-Dpipewire-v4l2=disabled,v4l2"
-PACKAGESPLITFUNCS_prepend = " split_dynamic_packages "
-PACKAGESPLITFUNCS_append = " set_dynamic_metapkg_rdepends "
-PACKAGESPLITFUNCS_append = " fixup_dynamic_pkg_licenses "
+PACKAGESPLITFUNCS:prepend = " split_dynamic_packages "
+PACKAGESPLITFUNCS:append = " set_dynamic_metapkg_rdepends "
+PACKAGESPLITFUNCS:append = " fixup_dynamic_pkg_licenses "
SPA_SUBDIR = "spa-0.2"
PW_MODULE_SUBDIR = "pipewire-0.3"
@@ -113,18 +121,18 @@ python fixup_dynamic_pkg_licenses () {
for pkg in packages:
# we manually assign the LICENSES here to cover all packages (even dynamically created ones)
- d.setVar("LICENSE_" + pkg ,"MIT")
+ d.setVar("LICENSE:" + pkg ,"MIT")
# next handle special cases
- # ==> LICENSE_${PN}-spa-plugins-alsa = "LGPL-2.1-or-later"
+ # ==> LICENSE:${PN}-spa-plugins-alsa = "LGPL-2.1-or-later"
if "pipewire-spa-plugins-alsa" in pkg:
- d.setVar("LICENSE_pipewire-spa-plugins-alsa", "LGPL-2.1-or-later")
- # ==> LICENSE_${PN}-alsa-card-profile = "LGPL-2.1-or-later"
+ d.setVar("LICENSE:pipewire-spa-plugins-alsa", "LGPL-2.1-or-later")
+ # ==> LICENSE:${PN}-alsa-card-profile = "LGPL-2.1-or-later"
if "pipewire-alsa-card-profile" in pkg:
- d.setVar("LICENSE_pipewire-alsa-card-profile", "LGPL-2.1-or-later")
- # ==> LICENSE_${PN}-jack = "GPL-2.0-only"
+ d.setVar("LICENSE:pipewire-alsa-card-profile", "LGPL-2.1-or-later")
+ # ==> LICENSE:${PN}-jack = "GPL-2.0-only"
if "pipewire-jack" in pkg:
- d.setVar("LICENSE_pipewire-jack", "GPL-2.0-only")
+ d.setVar("LICENSE:pipewire-jack", "GPL-2.0-only")
}
python split_dynamic_packages () {
@@ -154,11 +162,11 @@ python set_dynamic_metapkg_rdepends () {
pw_module_pn = base_pn + '-modules'
pw_module_metapkg = pw_module_pn + '-meta'
- d.setVar('ALLOW_EMPTY_' + spa_metapkg, "1")
- d.setVar('FILES_' + spa_metapkg, "")
+ d.setVar('ALLOW_EMPTY:' + spa_metapkg, "1")
+ d.setVar('FILES:' + spa_metapkg, "")
- d.setVar('ALLOW_EMPTY_' + pw_module_metapkg, "1")
- d.setVar('FILES_' + pw_module_metapkg, "")
+ d.setVar('ALLOW_EMPTY:' + pw_module_metapkg, "1")
+ d.setVar('FILES:' + pw_module_metapkg, "")
blacklist = [ spa_pn, spa_metapkg, pw_module_pn, pw_module_metapkg ]
spa_metapkg_rdepends = []
@@ -193,11 +201,11 @@ python set_dynamic_metapkg_rdepends () {
if is_pw_module_pkg:
pw_module_metapkg_rdepends.append(pkg)
- d.setVar('RDEPENDS_' + spa_metapkg, ' '.join(spa_metapkg_rdepends))
- d.setVar('DESCRIPTION_' + spa_metapkg, spa_pn + ' meta package')
+ d.setVar('RDEPENDS:' + spa_metapkg, ' '.join(spa_metapkg_rdepends))
+ d.setVar('DESCRIPTION:' + spa_metapkg, spa_pn + ' meta package')
- d.setVar('RDEPENDS_' + pw_module_metapkg, ' '.join(pw_module_metapkg_rdepends))
- d.setVar('DESCRIPTION_' + pw_module_metapkg, pw_module_pn + ' meta package')
+ d.setVar('RDEPENDS:' + pw_module_metapkg, ' '.join(pw_module_metapkg_rdepends))
+ d.setVar('DESCRIPTION:' + pw_module_metapkg, pw_module_pn + ' meta package')
}
PACKAGES =+ "\
@@ -206,7 +214,7 @@ PACKAGES =+ "\
${PN}-pulse \
${PN}-alsa \
${PN}-jack \
- ${PN}-media-session \
+ ${PN}-v4l2 \
${PN}-spa-plugins \
${PN}-spa-plugins-meta \
${PN}-spa-tools \
@@ -218,95 +226,91 @@ PACKAGES =+ "\
PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*"
-SYSTEMD_SERVICE_${PN} = "pipewire.service"
-CONFFILES_${PN} += "${datadir}/pipewire/pipewire.conf"
-FILES_${PN} = " \
+SYSTEMD_SERVICE:${PN} = "pipewire.service"
+CONFFILES:${PN} += "${datadir}/pipewire/pipewire.conf"
+FILES:${PN} = " \
${datadir}/pipewire/pipewire.conf \
${datadir}/pipewire/filter-chain \
${systemd_user_unitdir}/pipewire.* \
${bindir}/pipewire \
"
-FILES_${PN}-dev += " \
+FILES:${PN}-dev += " \
${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \
"
-CONFFILES_libpipewire += "${datadir}/pipewire/client.conf"
-FILES_libpipewire = " \
+CONFFILES:libpipewire += "${datadir}/pipewire/client.conf"
+FILES:libpipewire = " \
${datadir}/pipewire/client.conf \
${libdir}/libpipewire-*.so.* \
"
# Add the bare minimum modules and plugins required to be able
# to use libpipewire. Without these, it is essentially unusable.
-RDEPENDS_libpipewire += " \
+RDEPENDS:libpipewire += " \
${PN}-modules-client-node \
${PN}-modules-protocol-native \
${PN}-spa-plugins-support \
"
-FILES_${PN}-tools = " \
+FILES:${PN}-tools = " \
${bindir}/pw-* \
"
# This is a shim daemon that is intended to be used as a
# drop-in PulseAudio replacement, providing a pulseaudio-compatible
# socket that can be used by applications that use libpulse.
-CONFFILES_${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf"
+CONFFILES:${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf"
-FILES_${PN}-pulse = " \
+FILES:${PN}-pulse = " \
${datadir}/pipewire/pipewire-pulse.conf \
${systemd_user_unitdir}/pipewire-pulse.* \
${bindir}/pipewire-pulse \
"
-RDEPENDS_${PN}-pulse += " \
+RDEPENDS:${PN}-pulse += " \
${PN}-modules-protocol-pulse \
"
# alsa plugin to redirect audio to pipewire
-FILES_${PN}-alsa = "\
+FILES:${PN}-alsa = "\
${libdir}/alsa-lib/* \
${datadir}/alsa/alsa.conf.d/* \
"
+#lib to emulate v4l2 system calls on top of PipeWire
+FILES:${PN}-v4l2 = "\
+ ${libdir}/${PW_MODULE_SUBDIR}/v4l2/libpw-v4l2.so \
+"
+
# jack drop-in libraries to redirect audio to pipewire
-CONFFILES_${PN}-jack = "${datadir}/pipewire/jack.conf"
-FILES_${PN}-jack = "\
+CONFFILES:${PN}-jack = "${datadir}/pipewire/jack.conf"
+FILES:${PN}-jack = "\
${datadir}/pipewire/jack.conf \
${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \
"
-
-# Example session manager. Not intended for use in production.
-CONFFILES_${PN}-media-session = "${datadir}/pipewire/media-session.d/*"
-SYSTEMD_SERVICE_${PN}-media-session = "pipewire-media-session.service"
-FILES_${PN}-media-session = " \
- ${bindir}/pipewire-media-session \
- ${datadir}/pipewire/media-session.d/* \
- ${systemd_system_unitdir}/pipewire-media-session.service \
-"
-RPROVIDES_${PN}-media-session = "virtual/pipewire-sessionmanager"
-
# Dynamic packages (see set_dynamic_metapkg_rdepends).
-FILES_${PN}-spa-plugins = ""
-RRECOMMENDS_${PN}-spa-plugins += "${PN}-spa-plugins-meta"
+FILES:${PN}-spa-plugins-bluez5 += " \
+ ${datadir}/${SPA_SUBDIR}/bluez5/bluez-hardware.conf \
+"
+RRECOMMENDS:${PN}-spa-plugins += "${PN}-spa-plugins-meta"
-FILES_${PN}-spa-tools = " \
+FILES:${PN}-spa-tools = " \
${bindir}/spa-* \
"
# Dynamic packages (see set_dynamic_metapkg_rdepends).
-FILES_${PN}-modules = ""
-RRECOMMENDS_${PN}-modules += "${PN}-modules-meta"
+FILES:${PN}-modules = ""
+RRECOMMENDS:${PN}-modules += "${PN}-modules-meta"
-CONFFILES_${PN}-modules-rtkit = "${datadir}/pipewire/client-rt.conf"
-FILES_${PN}-modules-rtkit += " \
+CONFFILES:${PN}-modules-rtkit = "${datadir}/pipewire/client-rt.conf"
+FILES:${PN}-modules-rtkit += " \
${datadir}/pipewire/client-rt.conf \
"
-FILES_${PN}-alsa-card-profile = " \
+FILES:${PN}-alsa-card-profile = " \
${datadir}/alsa-card-profile/* \
${nonarch_base_libdir}/udev/rules.d/90-pipewire-alsa.rules \
"
-FILES_gstreamer1.0-pipewire = " \
+FILES:gstreamer1.0-pipewire = " \
${libdir}/gstreamer-1.0/* \
"
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend b/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.43.bbappend
index 85c9edab3..8d3df64cb 100644
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire_0.3.43.bbappend
@@ -7,12 +7,14 @@ PACKAGECONFIG = "\
"
SRC_URI += "\
- file://0001-alsa-plugin-allow-specifying-a-media.role-on-the-vir.patch \
- file://0001-null-sink-make-the-timerfd-non-blocking.patch \
- file://0002-node-driver-make-the-timerfd-non-blocking.patch \
+ file://0001-Revert-treewide-meson.build-use-project_-build-sourc.patch \
+ file://0002-Revert-treewide-meson.build-use-dependency-variable-.patch \
+ file://0003-Revert-meson-declare-spa_dep-and-override_dependency.patch \
+ file://0004-Revert-systemd-correctly-prefix-systemd-system-units.patch \
+ file://0005-pipewiresink-set-a-default-channel-map-if-the-number.patch \
"
-do_install_append() {
+do_install:append() {
# install symlinks to alsalib configuration files
for i in 50-pipewire.conf 99-pipewire-default.conf; do
if [ -f ${D}${datadir}/alsa/alsa.conf.d/${i} ]; then
@@ -22,6 +24,6 @@ do_install_append() {
done
}
-FILES_${PN}-alsa_append = "\
+FILES:${PN}-alsa:append = "\
${sysconfdir}/alsa/conf.d/* \
"
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/10-default-policy.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/10-default-policy.lua
index f71b31316..333f520fc 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/10-default-policy.lua
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/10-default-policy.lua
@@ -4,7 +4,10 @@ default_policy = {}
default_policy.endpoints = {
-- [endpoint name] = { endpoint properties }
-
+ ["endpoint.capture"] = {
+ ["media.class"] = "Audio/Source",
+ ["role"] = "Capture",
+ },
["endpoint.multimedia"] = {
["media.class"] = "Audio/Sink",
["role"] = "Multimedia",
@@ -43,11 +46,23 @@ default_policy.policy = {
["move"] = false, -- moves session items when metadata target.node changes
["follow"] = true, -- moves session items to the default device when it has changed
+ -- Set to 'true' to disable channel splitting & merging on nodes and enable
+ -- passthrough of audio in the same format as the format of the device.
+ -- Note that this breaks JACK support; it is generally not recommended
+ ["audio.no-dsp"] = false,
+
-- how much to lower the volume of lower priority streams when ducking
-- note that this is a linear volume modifier (not cubic as in the mixer)
["duck.level"] = 0.2,
["roles"] = {
+ ["Capture"] = {
+ ["alias"] = { "Multimedia", "Music", "Voice", "Capture" },
+ ["priority"] = 25,
+ ["action.default"] = "cork",
+ ["action.Capture"] = "mix",
+ ["media.class"] = "Audio/Source",
+ },
["Multimedia"] = {
["alias"] = { "Movie", "Music", "Game" },
["priority"] = 25,
@@ -110,7 +125,7 @@ function default_policy.enable()
load_script("static-endpoints.lua", default_policy.endpoints)
-- Create session items for nodes that appear in the graph
- load_script("create-item.lua")
+ load_script("create-item.lua", default_policy.policy)
-- Link nodes to each other to make media flow in the graph
load_script("policy-node.lua", default_policy.policy)
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/30-bluez-monitor.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/30-bluez-monitor.lua
index fab9ac0e4..c3bc587aa 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/30-bluez-monitor.lua
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/30-bluez-monitor.lua
@@ -3,13 +3,15 @@
bluez_monitor = {}
bluez_monitor.properties = {
- -- Enable mSBC support, disabled by default. Be aware that
- -- mSBC is not expected to work on all headset + adapter combinations.
- -- This can be overloaded for a specific device and native backend
- -- in rules section.
- --["bluez5.msbc-support"] = false,
+ -- These features do not work on all headsets, so they are enabled
+ -- by default based on the hardware database. They can also be
+ -- forced on/off for all devices by the following options:
- --["bluez5.sbc-xq-support"] = true,
+ --["bluez5.enable-sbc-xq"] = true,
+ --["bluez5.enable-msbc"] = true,
+ --["bluez5.enable-hw-volume"] = true,
+
+ -- See bluez-hardware.conf for the hardware database.
-- Enabled headset roles (default: [ hsp_hs hfp_ag ]), this
-- property only applies to native backend. Currently some headsets
@@ -23,7 +25,11 @@ bluez_monitor.properties = {
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]",
-- Enabled A2DP codecs (default: all).
- --["bluez5.codecs"] = "[ sbc aac ldac aptx aptx_hd ]",
+ --["bluez5.codecs"] = "[ sbc sbc_xq aac ldac aptx aptx_hd aptx_ll aptx_ll_duplex faststream faststream_duplex ]",
+
+ -- HFP/HSP backend (default: native).
+ -- Available values: any, none, hsphfpd, ofono, native
+ ["bluez5.hfphsp-backend"] = "ofono",
-- Properties for the A2DP codec configuration
--["bluez5.default.rate"] = 48000,
@@ -50,9 +56,6 @@ bluez_monitor.rules = {
--["bluez5.auto-connect"] = "[ hfp_hf hsp_hs a2dp_sink hfp_ag hsp_ag a2dp_source ]",
["bluez5.auto-connect"] = "[ hfp_hf hsp_hs a2dp_sink ]",
- -- Overload mSBC support for native backend and a specific device.
- --["bluez5.msbc-support"] = false,
-
-- Hardware volume control (default: [ hfp_ag hsp_ag a2dp_source ])
--["bluez5.hw-volume"] = "[ hfp_hf hsp_hs a2dp_sink hfp_ag hsp_ag a2dp_source ]",
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
index 2d70fc5e1..2b77df7f2 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
@@ -18,7 +18,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
-do_install_append() {
+do_install:append() {
config_dir="${D}${sysconfdir}/wireplumber/config.lua.d/"
dbus_config_dir="${D}${sysconfdir}/dbus-1/system.d/"
@@ -35,10 +35,10 @@ do_install_append() {
install -m 0644 ${WORKDIR}/wireplumber-bluetooth.conf ${dbus_config_dir}
}
-FILES_${PN} += "\
+FILES:${PN} += "\
${sysconfdir}/wireplumber/* \
"
-CONFFILES_${PN} += "\
+CONFFILES:${PN} += "\
${sysconfdir}/wireplumber/* \
"
-RPROVIDES_${PN} += "virtual/wireplumber-config"
+RPROVIDES:${PN} += "virtual/wireplumber-config"
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch
new file mode 100644
index 000000000..658b89946
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch
@@ -0,0 +1,78 @@
+From 78cde5e91ba5d9aa7bfe918ce6bad3b4af30c796 Mon Sep 17 00:00:00 2001
+From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
+Date: Fri, 14 Jan 2022 20:14:56 +0530
+Subject: [PATCH] Revert "wp-uninstalled: build this script with the meson dirs
+ filled in"
+
+This reverts commit 52aaf96179584292f493c4b329bc2c409e6d3dee.
+
+Upstream-Status: Inappropriate[meson version dependent]
+---
+ meson.build | 31 -------------------------------
+ wp-uninstalled.sh | 11 ++---------
+ 2 files changed, 2 insertions(+), 40 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 1f9c9d8..7e02b29 100644
+--- a/meson.build
++++ b/meson.build
+@@ -120,34 +120,3 @@ subdir('src')
+ if get_option('tests')
+ subdir('tests')
+ endif
+-
+-conf_uninstalled = configuration_data()
+-conf_uninstalled.set('MESON', '')
+-conf_uninstalled.set('MESON_SOURCE_ROOT', meson.project_source_root())
+-conf_uninstalled.set('MESON_BUILD_ROOT', meson.project_build_root())
+-
+-wp_uninstalled = configure_file(
+- input : 'wp-uninstalled.sh',
+- output : 'wp-uninstalled.sh.in',
+- configuration : conf_uninstalled,
+-)
+-
+-wireplumber_uninstalled = custom_target('wp-uninstalled',
+- output : 'wp-uninstalled.sh',
+- input : wp_uninstalled,
+- build_by_default : true,
+- command : ['cp', '@INPUT@', '@OUTPUT@'],
+-)
+-
+-if meson.version().version_compare('>= 0.58')
+- builddir = meson.project_build_root()
+- srcdir = meson.project_source_root()
+-
+- devenv = environment({
+- 'WIREPLUMBER_MODULE_DIR': builddir / 'modules',
+- 'WIREPLUMBER_CONFIG_DIR': srcdir / 'src' / 'config',
+- 'WIREPLUMBER_DATA_DIR': srcdir / 'src',
+- })
+-
+- meson.add_devenv(devenv)
+-endif
+diff --git a/wp-uninstalled.sh b/wp-uninstalled.sh
+index 79e53f2..d6279ff 100755
+--- a/wp-uninstalled.sh
++++ b/wp-uninstalled.sh
+@@ -2,15 +2,8 @@
+
+ set -e
+
+-# This is unset by meson
+-# shellcheck disable=SC2157
+-if [ -z "@MESON@" ]; then
+- SOURCEDIR="@MESON_SOURCE_ROOT@"
+- BUILDDIR="@MESON_BUILD_ROOT@"
+-else
+- SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+- BUILDDIR=$(find "${SOURCEDIR}" -maxdepth 2 -name build.ninja -printf "%h\n" -quit 2>/dev/null || echo "${SOURCEDIR}/build")
+-fi
++SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
++BUILDDIR=${SOURCEDIR}/build
+ CONFIGDIR=config
+
+ while getopts ":b:c:" opt; do
+--
+2.33.1
+
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch
new file mode 100644
index 000000000..7a24d1554
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch
@@ -0,0 +1,138 @@
+From 4ea8ddc256df636208479a5b64bf8bdc6e413aca Mon Sep 17 00:00:00 2001
+From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
+Date: Thu, 2 Dec 2021 16:57:54 +0530
+Subject: [PATCH] Revert "tests: add pipewire env variables when running tests,
+ tidy up common_env"
+
+This reverts commit c24db9f3539f9b7ebe9e74c991cc3037f28ea22c.
+
+Upstream-Status: Inappropriate[meson version dependent]
+---
+ tests/meson.build | 31 -------------------------------
+ tests/modules/meson.build | 9 ++++++---
+ tests/wp/meson.build | 10 +++++++---
+ tests/wplua/meson.build | 15 +++++++++++----
+ 4 files changed, 24 insertions(+), 41 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 0e06568..9238d5b 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -28,37 +28,6 @@ if valgrind.found()
+ timeout_multiplier: 2)
+ endif
+
+-# The common test environment
+-common_test_env = environment({
+- 'HOME': '/invalid',
+- 'XDG_RUNTIME_DIR': '/invalid',
+- 'PIPEWIRE_RUNTIME_DIR': '/tmp',
+- 'XDG_CONFIG_HOME': meson.current_build_dir() / '.config',
+- 'XDG_STATE_HOME': meson.current_build_dir() / '.local' / 'state',
+- 'FILE_MONITOR_DIR': meson.current_build_dir() / '.local' / 'file_monitor',
+- 'WIREPLUMBER_CONFIG_DIR': '/invalid',
+- 'WIREPLUMBER_DATA_DIR': '/invalid',
+- 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / 'modules',
+- 'WIREPLUMBER_DEBUG': '7',
+-})
+-
+-spa_plugindir = spa_dep.get_variable(
+- pkgconfig: 'plugindir', internal: 'plugindir', default_value: '')
+-pipewire_moduledir = pipewire_dep.get_variable(
+- pkgconfig: 'moduledir', internal: 'moduledir', default_value: '')
+-pipewire_confdatadir = pipewire_dep.get_variable(
+- pkgconfig: 'confdatadir', internal: 'confdatadir', default_value: '')
+-
+-if spa_plugindir != ''
+- common_test_env.set('SPA_PLUGIN_DIR', spa_plugindir)
+-endif
+-if pipewire_moduledir != ''
+- common_test_env.set('PIPEWIRE_MODULE_DIR', pipewire_moduledir)
+-endif
+-if pipewire_confdatadir != ''
+- common_test_env.set('PIPEWIRE_CONFIG_DIR', pipewire_confdatadir)
+-endif
+-
+ subdir('wp')
+ subdir('wplua')
+ subdir('modules')
+diff --git a/tests/modules/meson.build b/tests/modules/meson.build
+index ffab80b..2fc46dc 100644
+--- a/tests/modules/meson.build
++++ b/tests/modules/meson.build
+@@ -1,7 +1,10 @@
+ common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
+-common_env = common_test_env
+-common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
+-common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
++common_env = environment({
++ 'G_TEST_SRCDIR': meson.current_source_dir(),
++ 'G_TEST_BUILDDIR': meson.current_build_dir(),
++ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
++ 'WIREPLUMBER_DEBUG': '7',
++})
+ common_args = [
+ '-DG_LOG_USE_STRUCTURED',
+ ]
+diff --git a/tests/wp/meson.build b/tests/wp/meson.build
+index adc9cef..e75640c 100644
+--- a/tests/wp/meson.build
++++ b/tests/wp/meson.build
+@@ -1,7 +1,11 @@
+ common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
+-common_env = common_test_env
+-common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
+-common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
++common_env = environment({
++ 'G_TEST_SRCDIR': meson.current_source_dir(),
++ 'G_TEST_BUILDDIR': meson.current_build_dir(),
++ 'XDG_CONFIG_HOME': meson.current_build_dir() / '.config',
++ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
++ 'WIREPLUMBER_DEBUG': '7',
++})
+ common_args = [
+ '-DG_LOG_USE_STRUCTURED',
+ ]
+diff --git a/tests/wplua/meson.build b/tests/wplua/meson.build
+index 128cc30..cd45c1c 100644
+--- a/tests/wplua/meson.build
++++ b/tests/wplua/meson.build
+@@ -1,13 +1,18 @@
+ common_deps = [wplua_dep, pipewire_dep, wp_dep]
+-common_env = common_test_env
+-common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
+-common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+-common_env.set('WIREPLUMBER_DATA_DIR', meson.current_source_dir())
++common_env = environment({
++ 'G_TEST_SRCDIR': meson.current_source_dir(),
++ 'G_TEST_BUILDDIR': meson.current_build_dir(),
++ 'WIREPLUMBER_CONFIG_DIR': '/invalid',
++ 'WIREPLUMBER_DATA_DIR': meson.current_source_dir(),
++ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
++ 'WIREPLUMBER_DEBUG': '7',
++})
+
+ test(
+ 'test-wplua',
+ executable('test-wplua', 'wplua.c', dependencies: common_deps),
+ env: common_env,
++ workdir : meson.current_source_dir(),
+ )
+
+ script_tester = executable('script-tester',
+@@ -20,10 +25,12 @@ test(
+ script_tester,
+ args: ['pod.lua'],
+ env: common_env,
++ workdir : meson.current_source_dir(),
+ )
+ test(
+ 'test-lua-monitor-rules',
+ script_tester,
+ args: ['monitor-rules.lua'],
+ env: common_env,
++ workdir : meson.current_source_dir(),
+ )
+--
+2.33.1
+
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
index 8daff3042..bb2380de1 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
@@ -14,9 +14,16 @@ DEPENDS = "glib-2.0 glib-2.0-native pipewire lua"
SRC_URI = "\
git://gitlab.freedesktop.org/pipewire/wireplumber.git;protocol=https;branch=master \
"
-SRCREV = "4af7e2bd68c4862bb707b62edf7557df56dad10f"
+# v0.4.7
+SRCREV = "afb177b5e0840d54dc41d02920702c3c9580ce02"
-PV = "0.4.0"
+# patches to be able to compile with lower version of meson that is available in AGL.
+SRC_URI += "\
+ file://0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch \
+ file://0002-Revert-tests-add-pipewire-env-variables-when-running.patch \
+"
+
+PV = "0.4.5"
S = "${WORKDIR}/git"
WPAPI="0.4"
@@ -35,10 +42,10 @@ PACKAGECONFIG = "\
PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd-system-service=true -Dsystemd-user-service=false,-Dsystemd=disabled -Dsystemd-system-service=false -Dsystemd-user-service=false,systemd"
-do_configure_prepend() {
+do_configure:prepend() {
# relax meson version requirement
# we only need 0.54 when building with -Dsystem-lua=false
- sed "s/meson_version : '>= 0.54.0'/meson_version : '>= 0.51.0'/" ${S}/meson.build > ${S}/tmp.build
+ sed "s/meson_version : '>= 0.56.0'/meson_version : '>= 0.53.2'/" ${S}/meson.build > ${S}/tmp.build
mv -f ${S}/tmp.build ${S}/meson.build
}
@@ -47,8 +54,8 @@ PACKAGES =+ "\
${PN}-config \
"
-SYSTEMD_SERVICE_${PN} = "wireplumber.service"
-FILES_${PN} = "\
+SYSTEMD_SERVICE:${PN} = "wireplumber.service"
+FILES:${PN} = "\
${bindir}/wireplumber \
${bindir}/wpctl \
${bindir}/wpexec \
@@ -56,17 +63,17 @@ FILES_${PN} = "\
${datadir}/wireplumber/* \
${systemd_system_unitdir}/* \
"
-RPROVIDES_${PN} += "virtual/pipewire-sessionmanager"
-RDEPENDS_${PN} += "virtual/wireplumber-config"
+RPROVIDES:${PN} += "virtual/pipewire-sessionmanager"
+RDEPENDS:${PN} += "virtual/wireplumber-config"
-FILES_lib${PN}-${WPAPI} = "\
+FILES:lib${PN}-${WPAPI} = "\
${libdir}/libwireplumber-${WPAPI}.so.* \
"
-FILES_${PN}-config += "\
+FILES:${PN}-config += "\
${sysconfdir}/wireplumber/* \
"
-CONFFILES_${PN}-config += "\
+CONFFILES:${PN}-config += "\
${sysconfdir}/wireplumber/* \
"
-RPROVIDES_${PN}-config += "virtual/wireplumber-config"
+RPROVIDES:${PN}-config += "virtual/wireplumber-config"
diff --git a/meta-pipewire/scripts/run-yocto-check-layer.sh b/meta-pipewire/scripts/run-yocto-check-layer.sh
index 15b4de0e1..894153917 100755
--- a/meta-pipewire/scripts/run-yocto-check-layer.sh
+++ b/meta-pipewire/scripts/run-yocto-check-layer.sh
@@ -20,8 +20,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= ""
# important settings imported from poky-agl.conf
# we do not import
-DISTRO_FEATURES_append = " systemd smack"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd smack"
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
EOF
diff --git a/templates/base/01_setup_pkg_revision.sh b/templates/base/01_setup_pkg_revision.sh
index 034256c7d..cba278d18 100644
--- a/templates/base/01_setup_pkg_revision.sh
+++ b/templates/base/01_setup_pkg_revision.sh
@@ -36,7 +36,7 @@ EOF
cat <<'EOF' >> $LOCALCONF
PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}"
PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}"
-BB_HASHBASE_WHITELIST_append = " PKGR PKGV"
+BB_HASHBASE_WHITELIST:append = " PKGR PKGV"
EOF
;;
value:*)
@@ -44,7 +44,7 @@ EOF
cat <<'EOF' >> $LOCALCONF
PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}"
PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}"
-BB_HASHBASE_WHITELIST_append = " PKGR PKGV"
+BB_HASHBASE_WHITELIST:append = " PKGR PKGV"
EOF
;;
none)
diff --git a/templates/base/99_local.conf.inc b/templates/base/99_local.conf.inc
index bbf1b2afa..be5dd9321 100644
--- a/templates/base/99_local.conf.inc
+++ b/templates/base/99_local.conf.inc
@@ -4,7 +4,7 @@
# ARM 32bit 'medium' compiler (armv7thf instead of armv7ve)
# (only use for CPUs <= cortex-a9 / w/o virt extension - e.g. cortex-a8)
-# AGL_FEATURES_append = " agl-medium-arm-compiler"
+# AGL_FEATURES:append = " agl-medium-arm-compiler"
######################
diff --git a/templates/base/local.conf.sample b/templates/base/local.conf.sample
index d506c8182..337321ec0 100644
--- a/templates/base/local.conf.sample
+++ b/templates/base/local.conf.sample
@@ -163,7 +163,7 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink"
# run tests against any SDK that are built. To enable this uncomment these lines.
# See classes/test{image,sdk}.bbclass for further details.
#IMAGE_CLASSES += "testimage testsdk"
-#TESTIMAGE_AUTO_qemuall = "1"
+#TESTIMAGE_AUTO:qemuall = "1"
#
# Interactive shell configuration
@@ -241,14 +241,14 @@ BB_DISKMON_DIRS ??= "\
#
# By default native qemu will build with a builtin VNC server where graphical output can be
# seen. The line below enables the SDL UI frontend too.
-PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
# By default libsdl2-native will be built, if you want to use your host's libSDL instead of
# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
#ASSUME_PROVIDED += "libsdl2-native"
# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
# a handy set of menus for controlling the emulator.
-#PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
#
# Parallelism Options
diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc
index cbf0c7d2b..319c5cbb7 100644
--- a/templates/feature/agl-ci/99_local.conf.inc
+++ b/templates/feature/agl-ci/99_local.conf.inc
@@ -1,7 +1,7 @@
-DISTRO_FEATURES_append = " AGLCI"
+DISTRO_FEATURES:append = " AGLCI"
# opencv seems to have a parallel make bug
# ...contrib/modules/xfeatures2d/test/test_features2d.cpp:51:10: fatal error: features2d/test/test_detectors_regression.impl.hpp: No such file or directory
-PARALLEL_MAKE_pn-opencv = "-j 1"
+PARALLEL_MAKE:pn-opencv = "-j 1"
AGL_HOST_PREMIRROR ?= "http://download.automotivelinux.org"
AGL_HOST_SSTATE_MIRROR ?= "http://download.automotivelinux.org"
diff --git a/templates/feature/agl-devel/README_feature_agl-devel.md b/templates/feature/agl-devel/README_feature_agl-devel.md
index 24483f95e..588bb3cdc 100644
--- a/templates/feature/agl-devel/README_feature_agl-devel.md
+++ b/templates/feature/agl-devel/README_feature_agl-devel.md
@@ -25,7 +25,7 @@ The following example shows how to activate C/C++ code
specific to agl-devel:
```yocto
-CPPFLAGS_append_agl-devel = " -DAGL_DEVEL"
+CPPFLAGS:append:agl-devel = " -DAGL_DEVEL"
```
Using this, any code enclosed in
diff --git a/templates/feature/agl-hmi-framework/50_local.conf.inc b/templates/feature/agl-hmi-framework/50_local.conf.inc
index 21fdf3abf..fdff3dbe8 100644
--- a/templates/feature/agl-hmi-framework/50_local.conf.inc
+++ b/templates/feature/agl-hmi-framework/50_local.conf.inc
@@ -1,4 +1,4 @@
# In order to enable the hmi-framework features ,
# enables the following line:
#
-AGL_FEATURES_append = " agl-hmi-framework"
+AGL_FEATURES:append = " agl-hmi-framework"
diff --git a/templates/feature/agl-ptest/90_local.conf.inc b/templates/feature/agl-ptest/90_local.conf.inc
index 4c546e70e..6341b012a 100644
--- a/templates/feature/agl-ptest/90_local.conf.inc
+++ b/templates/feature/agl-ptest/90_local.conf.inc
@@ -2,8 +2,8 @@
# Enabling ptest in image ...
OVERRIDES .= ":agl-ptest"
-DISTRO_FEATURES_append = " ptest"
-EXTRA_IMAGE_FEATURES_append = " ptest-pkgs"
-IMAGE_INSTALL_append = " lua-ptest xmlsec1-ptest libxml2-ptest"
+DISTRO_FEATURES:append = " ptest"
+EXTRA_IMAGE_FEATURES:append = " ptest-pkgs"
+IMAGE_INSTALL:append = " lua-ptest xmlsec1-ptest libxml2-ptest"
# / ptest
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index 3ceb04df7..8019022c4 100644
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -1,7 +1,7 @@
# See meta-updater/conf/distro/sota.conf.inc
INHERIT += "sota"
-DISTRO_FEATURES_append = " sota usrmerge"
-DISTRO_FEATURES_NATIVE_append = " sota"
+DISTRO_FEATURES:append = " sota usrmerge"
+DISTRO_FEATURES_NATIVE:append = " sota"
AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz"
# Netboot is not obeying usrmerge distro feature
# therefore it is not compatible with agl-sota
diff --git a/templates/feature/agl-virt/50_local.conf.inc b/templates/feature/agl-virt/50_local.conf.inc
index c15b8316b..8a7e44a71 100644
--- a/templates/feature/agl-virt/50_local.conf.inc
+++ b/templates/feature/agl-virt/50_local.conf.inc
@@ -1,3 +1,3 @@
# meta-virtualization needs the "virtualization in DISTRO_FEATURES
-DISTRO_FEATURES_append = " virtualization"
+DISTRO_FEATURES:append = " virtualization"
diff --git a/templates/feature/agl-weston-remoting/50_local.conf.inc b/templates/feature/agl-weston-remoting/50_local.conf.inc
index da1ddb3a0..63e0a984a 100644
--- a/templates/feature/agl-weston-remoting/50_local.conf.inc
+++ b/templates/feature/agl-weston-remoting/50_local.conf.inc
@@ -1 +1 @@
-DISTRO_FEATURES_append = " weston-remoting"
+DISTRO_FEATURES:append = " weston-remoting"
diff --git a/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc b/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc
index a8267ec37..d965eae6f 100644
--- a/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc
+++ b/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc
@@ -1 +1 @@
-AGL_FEATURES_append = " waltham-remoting"
+AGL_FEATURES:append = " waltham-remoting"
diff --git a/templates/machine/ebisu/50_bblayers.conf.inc b/templates/machine/ebisu/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/ebisu/50_bblayers.conf.inc
+++ b/templates/machine/ebisu/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/h3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
index 61d472ab1..25e36b019 100644
--- a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
@@ -1,4 +1,5 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/m3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/m3ulcb-kf/50_bblayers.conf.inc b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
index 61d472ab1..25e36b019 100644
--- a/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
@@ -1,4 +1,5 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"