From 95051638dc19a49384ee8f0f9f1b468df49aca54 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 1 May 2024 15:11:07 -0400 Subject: [PATCH 01/10] meta-agl-bsp: update meta-virtualization bbappends Rename the meta-virtualization dynamically applied bbappends to handle the newer versions in YP 5.0 / scarthgap. To some degree these changes are placeholders to facilitate building the IC EG container demo images, as the configuration for that pulls in meta-virtualization. The virtio support related changes the bbappends apply here need to be reworked to be actually workable for the KVM demo images and potential downstream users. Bug-AGL: SPEC-5123 Change-Id: I473fa4a64837cedd704f8fb2e7cbd52fa2114d21 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29879 ci-image-build: Jenkins Job builder account Reviewed-by: Naoto YAMAGUCHI Tested-by: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller ci-image-boot-test: Jenkins Job builder account --- .../recipes-graphics/mesa/{mesa_22.%.bbappend => mesa_24.%.bbappend} | 0 .../linux/{linux-yocto_5.15.bbappend => linux-yocto_6.6.bbappend} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/{mesa_22.%.bbappend => mesa_24.%.bbappend} (100%) rename meta-agl-bsp/virtualization-layer/recipes-kernel/linux/{linux-yocto_5.15.bbappend => linux-yocto_6.6.bbappend} (100%) diff --git a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_22.%.bbappend b/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend similarity index 100% rename from meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_22.%.bbappend rename to meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.15.bbappend b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_6.6.bbappend similarity index 100% rename from meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.15.bbappend rename to meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_6.6.bbappend -- 2.16.6 From 8918747564a0f224284e7408c14c06a70170fcdd Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 8 May 2024 14:57:44 -0400 Subject: [PATCH 02/10] meta-agl-bsp: refresh mesa virgl patch Refresh the mesa patch applied dynamically when meta-virtualization is being used so it applies cleanly. It is still unknown if the patch is required for the KVM demo, but fixing it up is required to have the IC EG container demos to build. Bug-AGL: SPEC-5123 Change-Id: Ib1c8b623d78ca0453d3418e565dbe86bdc344fb5 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29898 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- ...irgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa/0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch b/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa/0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch index 8bc102c92..d27696056 100644 --- a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa/0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch +++ b/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa/0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch @@ -1,7 +1,8 @@ -From 39dea63ebce2764c683c8c2eddbb10cf07a970c4 Mon Sep 17 00:00:00 2001 +From 737ccb36c0faf275037e5e96a263c89a44886ddd Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 19 Dec 2022 11:51:28 +0200 Subject: [PATCH] virgl/virgl_driinfo.h.in: Disable by default emulated BGRA + and swizzling Workaround in place for virtio aarch64 to avoid graphical artefacts when @@ -16,10 +17,10 @@ Signed-off-by: Marius Vlad 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/virgl/virgl_driinfo.h.in b/src/gallium/drivers/virgl/virgl_driinfo.h.in -index f57e5880965..1c06f932c5c 100644 +index ec688f5..244021e 100644 --- a/src/gallium/drivers/virgl/virgl_driinfo.h.in +++ b/src/gallium/drivers/virgl/virgl_driinfo.h.in -@@ -8,7 +8,7 @@ +@@ -8,8 +8,8 @@ // 5. Implement the tweak in virglrenderer DRI_CONF_SECTION_MISCELLANEOUS DRI_CONF_FORMAT_L8_SRGB_ENABLE_READBACK(false) @@ -28,7 +29,8 @@ index f57e5880965..1c06f932c5c 100644 + DRI_CONF_GLES_EMULATE_BGRA(false) + DRI_CONF_GLES_APPLY_BGRA_DEST_SWIZZLE(false) DRI_CONF_GLES_SAMPLES_PASSED_VALUE(1024, 1, 400000000) - DRI_CONF_SECTION_END + + /* -- -2.35.1 +2.30.2 -- 2.16.6 From c05762b781b5fb7b4f6139ea1a6d5a9b9d72de7a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 8 May 2024 14:59:37 -0400 Subject: [PATCH 03/10] agl-selinux: pull in meta-clang Make pulling in meta-clang for the agl-selinx feature explicit, to avoid dependency issues from the uutils-coreutils recipe in meta-oe. This fixes building when configured with just the "agl-ic-container" feature without "agl-demo". Bug-AGL: SPEC-5123 Change-Id: Ie775b2e3ceb081448fc8b772f9686ad4dfbb45dc Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29899 ci-image-boot-test: Jenkins Job builder account ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account --- templates/feature/agl-selinux/50_bblayers.conf.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/feature/agl-selinux/50_bblayers.conf.inc b/templates/feature/agl-selinux/50_bblayers.conf.inc index b17e292e9..392b70099 100644 --- a/templates/feature/agl-selinux/50_bblayers.conf.inc +++ b/templates/feature/agl-selinux/50_bblayers.conf.inc @@ -1,5 +1,8 @@ AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" +# Needed to satisfy uutils-coreutils DEPENDS when using SELinux +AGL_META_CLANG = "${METADIR}/external/meta-clang" + BBLAYERS =+ " \ ${METADIR}/external/meta-selinux \ " -- 2.16.6 From 44aca959440ec33f9ad0faaad9db3f3f77d4dfc1 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 21 May 2024 10:00:00 -0400 Subject: [PATCH 04/10] meta-agl-bsp: fix up unmatched build Changes: - Remove U-Boot patch and associated bbappend that were required to build with kirkstone, they are no longer required. - Remove LAYERSERIES_COMPAT tweak that was being done to the meta-sifive layer as it is no longer required. Bug-AGL: SPEC-5145 Change-Id: Id729fe08d8b5e962636bbfa2db9538c40afabda5 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29907 ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- ...0001-WIP-Make-BSP-work-under-YP-kirkstone.patch | 46 ---------------------- .../u-boot/u-boot-sifive_2023.07.02.bbappend | 3 -- templates/machine/unmatched/50_bblayers.conf.inc | 4 -- 3 files changed, 53 deletions(-) delete mode 100644 meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch delete mode 100644 meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/u-boot-sifive_2023.07.02.bbappend diff --git a/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch b/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch deleted file mode 100644 index 7fce516f0..000000000 --- a/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 57575ce80a96411bce828be6fc84ebd2ed003810 Mon Sep 17 00:00:00 2001 -From: Jan-Simon Moeller -Date: Tue, 12 Sep 2023 22:50:28 +0200 -Subject: [PATCH] [WIP] Make BSP work under YP kirkstone - -This fixes build issues when using the layer with YP 'kirkstone' branch. - -check-config.sh can be solved differently as well. -binman/control.py needs a little investigation - -Upstream-Status: Inappropriate -Signed-off-by: Jan-Simon Moeller ---- - scripts/check-config.sh | 2 +- - tools/binman/control.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/check-config.sh b/scripts/check-config.sh -index cc1c9a54d9..633c69eb76 100755 ---- a/scripts/check-config.sh -+++ b/scripts/check-config.sh -@@ -57,7 +57,7 @@ if [ -s ${new_adhoc} ]; then - echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig" - echo >&2 "file and add a 'config' or 'menuconfig' option." - # Don't delete the temporary files in case they are useful -- exit 1 -+ exit 0 - else - rm ${suspects} ${ok} ${new_adhoc} - fi -diff --git a/tools/binman/control.py b/tools/binman/control.py -index 47aac207b4..3d013dea17 100644 ---- a/tools/binman/control.py -+++ b/tools/binman/control.py -@@ -8,7 +8,7 @@ - from collections import OrderedDict - import glob - import os --import pkg_resources -+#import pkg_resources - import re - - import sys --- -2.35.3 - diff --git a/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/u-boot-sifive_2023.07.02.bbappend b/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/u-boot-sifive_2023.07.02.bbappend deleted file mode 100644 index 30bf957cf..000000000 --- a/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/u-boot-sifive_2023.07.02.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI:append = " file://0001-WIP-Make-BSP-work-under-YP-kirkstone.patch " diff --git a/templates/machine/unmatched/50_bblayers.conf.inc b/templates/machine/unmatched/50_bblayers.conf.inc index 03565bafd..bf78285b5 100644 --- a/templates/machine/unmatched/50_bblayers.conf.inc +++ b/templates/machine/unmatched/50_bblayers.conf.inc @@ -1,6 +1,2 @@ # This is the original place, but we need to tweak layer.conf BBLAYERS =+ "${METADIR}/bsp/meta-sifive" - -# For now, tweak the layer's compatibility to allow using with kirkstone, -# since we know it works without major issues. -LAYERSERIES_COMPAT_meta-sifive:append = " kirkstone" -- 2.16.6 From 0eaae108c492112a6657eb17a26fa2b0bafc82a1 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 21 May 2024 10:13:35 -0400 Subject: [PATCH 05/10] meta-agl-bsp: fix up raspberrypi5 build Changes: - Add meta-lts-mixins_u-boot layer to BBLAYERS for raspberrypi5 to get U-Boot v2024.04. - Add required configuration to make the newer U-Boot buildable to the raspberrypi5 machine configuration. The tweaks to re-enable U-Boot were sourced from the commits in this meta-raspberrypi PR: https://github.com/agherzan/meta-raspberrypi/pull/1304 If those get merged our configuration can be simplified. - Add required LICENSE_FLAGS_ACCEPTED tweak to raspberrypi5 machine configuration (copied from raspberrypi4). - Remove obsolete Xen tweaks from the raspberrypi4 and raspberrypi5 machine configurations. Bug-AGL: SPEC-5144 Change-Id: If02e0cc7baada46f4a9db305d3babe5b4a6784ff Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29908 ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_raspberrypi4.inc | 12 --------- meta-agl-bsp/conf/include/agl_raspberrypi5.inc | 29 +++++++++++----------- .../machine/raspberrypi5/50_bblayers.conf.inc | 5 +++- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc index 4ba7ff0f6..998ffedc8 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc @@ -21,17 +21,5 @@ IMAGE_INSTALL:append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux- # Psplash causes crash on first boot on RPi IMAGE_FEATURES:remove = "splash" -# Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES:append = " sota" - -# Add xen build, if the xen feature activated -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)}" - -# Add xen-raspberry binary to boot files -IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('AGL_XEN_WANTED','1', 'xen-${MACHINE}', '',d)}" - #DISPLAY CONFIGURATION WESTON_DISPLAYS:raspberrypi4 = " hdmi-a-1-90 hdmi-a-2-90" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc index a0e675956..212c9ff1b 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc @@ -4,8 +4,16 @@ GPU_MEM = "256" # Add CMA to the kernel arguments for SOTA OSTREE_KERNEL_ARGS:sota:append = " cma=256M" -# use u-boot always (RPi5 U-boot is not ready yet) -RPI_USE_U_BOOT = "0" +# use u-boot always +RPI_USE_U_BOOT = "1" + +# Re-enable U-Boot for raspberrypi5 here until upstream is fixed. +# Note that this assumes the use of scarthgap/u-boot meta-lts-mixins +# branch. +UBOOT_MACHINE = "rpi_arm64_config" +COMPATIBLE_MACHINE:pn-u-boot:forcevariable = "" +KERNEL_IMAGETYPE_UBOOT ?= "Image" +KERNEL_BOOTCMD ?= "booti" # Use UART for serial console ENABLE_UART ?= "1" @@ -13,22 +21,13 @@ ENABLE_UART ?= "1" # For libomxil #LICENSE_FLAGS_ACCEPTED = "commercial" -IMAGE_INSTALL:append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb " +# For linux-firmware-rpidistro +LICENSE_FLAGS_ACCEPTED += "synaptics-killswitch" + +IMAGE_INSTALL:append = " kernel-modules create-combined-dtb " # Psplash causes crash on first boot on RPi IMAGE_FEATURES:remove = "splash" -# Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES:append = " sota" - -# Add xen build, if the xen feature activated -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)}" - -# Add xen-raspberry binary to boot files -IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('AGL_XEN_WANTED','1', 'xen-${MACHINE}', '',d)}" - #DISPLAY CONFIGURATION WESTON_DISPLAYS:raspberrypi5 = " hdmi-a-1-90 hdmi-a-2-90" diff --git a/templates/machine/raspberrypi5/50_bblayers.conf.inc b/templates/machine/raspberrypi5/50_bblayers.conf.inc index 2e677dd8a..d225d627b 100644 --- a/templates/machine/raspberrypi5/50_bblayers.conf.inc +++ b/templates/machine/raspberrypi5/50_bblayers.conf.inc @@ -1 +1,4 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-raspberrypi" +BBLAYERS =+ " \ + ${METADIR}/bsp/meta-raspberrypi \ + ${METADIR}/bsp/meta-lts-mixins_u-boot \ +" -- 2.16.6 From fdafcbbfbc82a0f6935d19f1b5a3872416b83224 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 16 May 2024 19:10:18 -0400 Subject: [PATCH 06/10] weston-ini-conf: (re)move Weston remoting support Remove the support for generating configuration for the Weston remoting feature based on the weston-remoting DISTRO_FEATURE from our weston-ini-conf recipe and bbappend. Handling this has been moved from meta-agl-core to meta-agl-demo. As well, the agl-weston-remoting setup feature dependency on agl-demo has been removed as it is no longer required. Bug-AGL: SPEC-5138 Change-Id: I5a5e58dd9097e940d3925bf60ce4e1283d6529b9 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29902 ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller (cherry picked from commit 6919021006da1d42af9d588afded43ad35df8fcf) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29865 --- .../recipes-graphics/wayland/weston-ini-conf.bb | 38 ++++++---------------- .../wayland/weston-ini-conf.bbappend | 2 -- .../wayland/weston-ini-conf/remote-output.cfg.in | 5 --- templates/feature/agl-weston-remoting/included.dep | 1 - 4 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in delete mode 100644 templates/feature/agl-weston-remoting/included.dep 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 0611ec5b4..574f89f2b 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -13,7 +13,6 @@ SRC_URI = " \ file://hdmi-a-2-90.cfg \ file://hdmi-a-2-180.cfg \ file://hdmi-a-2-270.cfg \ - file://remote-output.cfg.in \ file://virtual-0.cfg \ file://virtual-90.cfg \ file://virtual-180.cfg \ @@ -36,18 +35,6 @@ WESTON_FRAGMENTS = "core shell grpc-proxy ${WESTON_DISPLAYS}" # On-target weston.ini directory weston_ini_dir = "${sysconfdir}/xdg/weston" -# Options for the user to change in local.conf -# e.g. REMOTING_OUTPUT_MODE = "1080x1488" -REMOTING_OUTPUT_MODE ??= "640x720@30" -REMOTING_OUTPUT_HOST ??= "192.168.10.3" -REMOTING_OUTPUT_PORT ??= "5005" - -do_configure() { - sed -e "s#host=.*#host=${REMOTING_OUTPUT_HOST}#" \ - -e "s#port=.*#port=${REMOTING_OUTPUT_PORT}#" \ - ${WORKDIR}/remote-output.cfg.in > ${WORKDIR}/remote-output.cfg -} - do_compile() { # Put all of our cfg files together for a default portrait # orientation configuration @@ -109,47 +96,42 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini" 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" +# landscape +PACKAGE_BEFORE_PN += "${PN}-landscape" FILES:${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape" - RPROVIDES:${PN}-landscape = "weston-ini" -RCONFLICTS:${PN}-landscape = "${PN}" ALTERNATIVE:${PN}-landscape = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape" +ALTERNATIVE_PRIORITY_${PN}-landscape = "20" -PACKAGE_BEFORE_PN += "${PN}-landscape-inverted" +# landscape-inverted +PACKAGE_BEFORE_PN += "${PN}-landscape-inverted" FILES:${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" - 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" +ALTERNATIVE_PRIORITY_${PN}-landscape-inverted = "25" -# no activation by default +# no-activate, no activation by default PACKAGE_BEFORE_PN += "${PN}-no-activate" - FILES:${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate" - RPROVIDES:${PN}-no-activate = "weston-ini" -RCONFLICTS:${PN}-no-activate = "${PN}" ALTERNATIVE:${PN}-no-activate = "weston.ini" ALTERNATIVE_TARGET_${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate" +ALTERNATIVE_PRIORITY_${PN}-no-activate = "21" -# landscape, no activation by default +# landscape-no-activate, no activation by default PACKAGE_BEFORE_PN += "${PN}-landscape-no-activate" - FILES:${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate" - RPROVIDES:${PN}-landscape-no-activate = "weston-ini" -RCONFLICTS:${PN}-landscape-no-activate = "${PN}" ALTERNATIVE:${PN}-landscape-no-activate = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate" +ALTERNATIVE_PRIORITY_${PN}-landscape-no-activate = "26" # This is a settings-only package, we do not need a development package # (and its fixed dependency to ${PN} being installed) 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 746bde339..b6095f2fa 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -2,8 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PACKAGE_ARCH = "${MACHINE_ARCH}" -WESTON_DISPLAYS:append = "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", " remote-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. diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in deleted file mode 100644 index 940cbdd0c..000000000 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in +++ /dev/null @@ -1,5 +0,0 @@ -[remote-output] -name=remote-1 -mode=640x720@30 -host=192.168.10.3 -port=5005 diff --git a/templates/feature/agl-weston-remoting/included.dep b/templates/feature/agl-weston-remoting/included.dep deleted file mode 100644 index 82639da07..000000000 --- a/templates/feature/agl-weston-remoting/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-demo -- 2.16.6 From 1942a6d111f7af71b36f41dd935992c63ea041a6 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 23 May 2024 11:32:52 -0400 Subject: [PATCH 07/10] meta-agl-bsp: add bbbappends to fix abseil-cpp RISC-V issue Add dynamically applied abseil-cpp and python3-grpcio bbappends to add backport of the upstream abseil-cpp fix for RISC-V platforms getting SIGILLs. These can be removed when the patches get into upstream meta-oe. Bug-AGL: SPEC-5120 Change-Id: Ib4a918abb3ab57d3ef09dd8729702d0f47d21daa Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29913 ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- ...-unscaledcycleclock-remove-RISC-V-support.patch | 82 ++++++++++++++++++++++ .../abseil-cpp/abseil-cpp_20240116.2.bbappend | 3 + ...-unscaledcycleclock-remove-RISC-V-support.patch | 82 ++++++++++++++++++++++ .../python/python3-grpcio_1.62.%.bbappend | 3 + 4 files changed, 170 insertions(+) create mode 100644 meta-agl-bsp/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch create mode 100644 meta-agl-bsp/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bbappend create mode 100644 meta-agl-bsp/openembedded-layer/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch create mode 100644 meta-agl-bsp/openembedded-layer/recipes-devtools/python/python3-grpcio_1.62.%.bbappend diff --git a/meta-agl-bsp/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-agl-bsp/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch new file mode 100644 index 000000000..461df7a60 --- /dev/null +++ b/meta-agl-bsp/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch @@ -0,0 +1,82 @@ +From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001 +From: aurel32 +Date: Fri, 22 Mar 2024 14:21:13 -0700 +Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support + +Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644 + +Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear. + +The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2]. + +Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units. + +This fixes the testsuite on riscv64, tested on a VisionFive 2 board. + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 +[2] https://github.com/abseil/abseil-cpp/pull/1631 +Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1 + +Merging this change closes #1644 + +COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71 +PiperOrigin-RevId: 618286262 +Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652 + +Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d] +[Adapted to apply on top of meta-oe's patch stack] +Signed-off-by: Scott Murray +--- + absl/base/internal/unscaledcycleclock.cc | 12 ------------ + absl/base/internal/unscaledcycleclock_config.h | 5 ++--- + 2 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc +index f11fecb3..103b4f6a 100644 +--- a/absl/base/internal/unscaledcycleclock.cc ++++ b/absl/base/internal/unscaledcycleclock.cc +@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() { + return aarch64_timer_frequency; + } + +-#elif defined(__riscv) +- +-int64_t UnscaledCycleClock::Now() { +- int64_t virtual_timer_value; +- asm volatile("rdcycle %0" : "=r"(virtual_timer_value)); +- return virtual_timer_value; +-} +- +-double UnscaledCycleClock::Frequency() { +- return base_internal::NominalCPUFrequency(); +-} +- + #elif defined(_M_IX86) || defined(_M_X64) + + #pragma intrinsic(__rdtsc) +diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h +index 5e232c1a..83552fc5 100644 +--- a/absl/base/internal/unscaledcycleclock_config.h ++++ b/absl/base/internal/unscaledcycleclock_config.h +@@ -22,7 +22,6 @@ + // The following platforms have an implementation of a hardware counter. + #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ +- defined(__riscv) || \ + defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 + #else +@@ -54,8 +53,8 @@ + #if ABSL_USE_UNSCALED_CYCLECLOCK + // This macro can be used to test if UnscaledCycleClock::Frequency() + // is NominalCPUFrequency() on a particular platform. +-#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \ +- defined(_M_IX86) || defined(_M_X64)) ++#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ ++ defined(_M_X64)) + #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY + #endif + #endif +-- +2.44.0 + diff --git a/meta-agl-bsp/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bbappend b/meta-agl-bsp/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bbappend new file mode 100644 index 000000000..2bf47126f --- /dev/null +++ b/meta-agl-bsp/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch" diff --git a/meta-agl-bsp/openembedded-layer/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-agl-bsp/openembedded-layer/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch new file mode 100644 index 000000000..82f15f88c --- /dev/null +++ b/meta-agl-bsp/openembedded-layer/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch @@ -0,0 +1,82 @@ +From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001 +From: aurel32 +Date: Fri, 22 Mar 2024 14:21:13 -0700 +Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support + +Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644 + +Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear. + +The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2]. + +Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units. + +This fixes the testsuite on riscv64, tested on a VisionFive 2 board. + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 +[2] https://github.com/abseil/abseil-cpp/pull/1631 +Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1 + +Merging this change closes #1644 + +COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71 +PiperOrigin-RevId: 618286262 +Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652 + +Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d] +[Adapted to apply on top of meta-oe's patch stack] +Signed-off-by: Scott Murray +--- + .../absl/base/internal/unscaledcycleclock.cc | 12 ------------ + .../absl/base/internal/unscaledcycleclock_config.h | 5 ++--- + 2 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +index f11fecb..103b4f6 100644 +--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc ++++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() { + return aarch64_timer_frequency; + } + +-#elif defined(__riscv) +- +-int64_t UnscaledCycleClock::Now() { +- int64_t virtual_timer_value; +- asm volatile("rdcycle %0" : "=r"(virtual_timer_value)); +- return virtual_timer_value; +-} +- +-double UnscaledCycleClock::Frequency() { +- return base_internal::NominalCPUFrequency(); +-} +- + #elif defined(_M_IX86) || defined(_M_X64) + + #pragma intrinsic(__rdtsc) +diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h +index 5e232c1..83552fc 100644 +--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h ++++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h +@@ -22,7 +22,6 @@ + // The following platforms have an implementation of a hardware counter. + #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ +- defined(__riscv) || \ + defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 + #else +@@ -54,8 +53,8 @@ + #if ABSL_USE_UNSCALED_CYCLECLOCK + // This macro can be used to test if UnscaledCycleClock::Frequency() + // is NominalCPUFrequency() on a particular platform. +-#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \ +- defined(_M_IX86) || defined(_M_X64)) ++#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ ++ defined(_M_X64)) + #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY + #endif + #endif +-- +2.44.0 + diff --git a/meta-agl-bsp/openembedded-layer/recipes-devtools/python/python3-grpcio_1.62.%.bbappend b/meta-agl-bsp/openembedded-layer/recipes-devtools/python/python3-grpcio_1.62.%.bbappend new file mode 100644 index 000000000..2bf47126f --- /dev/null +++ b/meta-agl-bsp/openembedded-layer/recipes-devtools/python/python3-grpcio_1.62.%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch" -- 2.16.6 From 86c341137a6646f172fcba9b21f280c5a080be5e Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Mon, 27 May 2024 18:23:34 +0200 Subject: [PATCH 08/10] Document r/o and r/w PRserv and HASHserv in the templates This adds sections for the PRserv and HASHserv in the local.conf templates (for r/o upstream). Also we add comments to the r/w part that is reserved for CI. Change-Id: Id39b11bc9664b441f5dcae3646259401b5d9a6aa Signed-off-by: Jan-Simon Moeller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29945 Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- meta-agl-core/conf/templates/base/local.conf.sample | 12 +++++++++++- templates/feature/agl-ci/99_local.conf.inc | 6 ++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/meta-agl-core/conf/templates/base/local.conf.sample b/meta-agl-core/conf/templates/base/local.conf.sample index be49ed00d..5e9de61b3 100644 --- a/meta-agl-core/conf/templates/base/local.conf.sample +++ b/meta-agl-core/conf/templates/base/local.conf.sample @@ -279,9 +279,15 @@ PACKAGECONFIG:append:pn-qemu-system-native = " sdl" # # A shared hash equivalent server can be set with ":" format # +# local only #BB_HASHSERVE = "auto" #BB_SIGNATURE_HANDLER = "OEEquivHash" - +# +# online/upstream r/o +#AGL_HOST_HASHSERV = "prserv.automotivelinux.org" +#BB_SIGNATURE_HANDLER = "OEEquivHash" +#BB_HASHSERVE = "auto" +#BB_HASHSERVE_UPSTREAM = "${AGL_HOST_HASHSERV}:8888" # The network based PR service host and port # Uncomment the following lines to enable PRservice. @@ -289,6 +295,10 @@ PACKAGECONFIG:append:pn-qemu-system-native = " sdl" # start local PRService. # Set to other values to use remote PRService. #PRSERV_HOST = "localhost:0" +# +# r/o upstream prserv +#AGL_HOST_PRSERV = "prserv.automotivelinux.org" +#PRSERV_HOST = "prserv.automotivelinux.org:8686" # Archive the source and put them to ${DEPLOY_DIR}/sources/. diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc index c12cd1717..af1724adb 100644 --- a/templates/feature/agl-ci/99_local.conf.inc +++ b/templates/feature/agl-ci/99_local.conf.inc @@ -24,10 +24,12 @@ INHERIT += "buildstats-summary" #AGL_HOST_PRSERV ?= "10.30.72.18" #AGL_HOST_HASHSERV ?= "10.30.72.18" -#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383" +# r/w hashserv +#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8787" #BB_SIGNATURE_HANDLER = "OEEquivHash" -#PRSERV_HOST = "${AGL_HOST_PRSERV}:8181" +# r/w prserv +#PRSERV_HOST = "${AGL_HOST_PRSERV}:8585" IMAGE_INSTALL:append = " curl" -- 2.16.6 From 2bec309d4322df3316f166f51ce6d6fd93f7131d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 29 May 2024 12:23:03 -0400 Subject: [PATCH 09/10] meta-agl-core: update images in conf-notes.txt Update image list in conf-notes.txt to reflect naming rework and recent clean up. Bug-AGL: SPEC-5138 Change-Id: I2a2ff55bacee8b8c53abb413935d76328cc22621 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29954 ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-core/conf/templates/base/conf-notes.txt | 31 +++++++++--------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/meta-agl-core/conf/templates/base/conf-notes.txt b/meta-agl-core/conf/templates/base/conf-notes.txt index 09ae72647..2e77ae5bf 100644 --- a/meta-agl-core/conf/templates/base/conf-notes.txt +++ b/meta-agl-core/conf/templates/base/conf-notes.txt @@ -6,30 +6,21 @@ Common targets are: * agl-image-minimal-crosssdk (crosssdk for ^^) * agl-image-weston (minimal filesystem with weston) + * agl-image-compositor (minimal filesystem with AGL compositor) - meta-agl-demo: (IVI demo with UI) - with 'agl-demo' - * agl-image-ivi (base for IVI targets) - * agl-image-ivi-crosssdk (sdk for ^^) + * agl-ivi-image (base for IVI targets) + * agl-ivi-image-crosssdk (sdk for ^^) - * agl-image-graphical-qt5 (weston plus qt5 framework libs) - * agl-image-graphical-qt5-crosssdk (sdk for ^^) + * agl-ivi-demo-qt (IVI Qt demo image) + * agl-ivi-demo-qt-crosssdk (sdk for ^^) + * agl-ivi-demo-flutter (IVI Flutter demo image) + * agl-ivi-demo-html5 (IVI HTML5 demo image) - * agl-image-graphical-html5 (weston plus chromium for html5) - - * agl-image-cluster (minimal image with APIs for cluster) - * agl-image-cluster-qt5 (image with QT5 and APIs for cluster) - - * agl-image-telematics (image with APIs for telematics) - - * agl-demo-platform (* default IVI demo target *) - * agl-demo-platform-crosssdk (sdk for ^^) - - * agl-cluster-demo-platform (cluster demo image) - * agl-cluster-demo-platform-crosssdk (sdk for ^^) - * agl-cluster-demo-qtcompositor (cluster demo using own compositor) - - * agl-telematics-demo-platform (telematics demo image) - * agl-telematics-demo-platform-crosssdk (sdk for ^^) + * agl-cluster-demo-qt (cluster Qt demo image) + * agl-cluster-demo-flutter (cluster Flutter demo image) + * agl-telematics-demo (telematics demo image) + * agl-gateway-demo (gateway demo image) -- 2.16.6 From 72db0487778e4f1be390fdf2ca1a8816bc9a80d2 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Fri, 31 May 2024 11:45:36 +0200 Subject: [PATCH 10/10] Prepare Royal Ricefish Milestone 1 Update the distro manifest file. Bug-AGL: SPEC-5154 Change-Id: I9b01ab24c97033ba53b69bba1a1a36ff6d8d0bd5 Signed-off-by: Jan-Simon Moeller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29959 --- meta-agl-core/conf/distro/poky-agl.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index 266a06d70..73c9a48f6 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -11,7 +11,7 @@ DISTRO_NAME = "Automotive Grade Linux" # Release flags DISTRO_CODENAME = "ricefish" AGL_BRANCH = "master" -AGLVERSION = "17.90.0" +AGLVERSION = "17.91.0" # switch devel/release #AGLRELEASETYPE ?= "agldevelopment" @@ -29,8 +29,8 @@ DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace(' # reproducible builds: # Set the desired timestamps # E.g. update for (major) releases -export SOURCE_DATE_EPOCH = "1706800000" -REPRODUCIBLE_TIMESTAMP_ROOTFS = "1706800000" +export SOURCE_DATE_EPOCH = "1718000000" +REPRODUCIBLE_TIMESTAMP_ROOTFS = "1718000000" # SDK -- 2.16.6