From: Scott Murray Date: Wed, 8 May 2024 19:04:52 +0000 (-0400) Subject: agl-demo: update meta-clang comment X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=HEAD;hp=50e5f6f9ddc3da020ef76f1132f872e4bc13d759 agl-demo: update meta-clang comment Update comment in feature template documenting why meta-clang is required. Bug-AGL: SPEC-5123. Change-Id: I4f4d589de07ee0d05f1720e1f1fca2445271d5c2 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29894 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- diff --git a/conf/layer.conf b/conf/layer.conf index 8aff0f9a5..7556a8642 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,6 +14,6 @@ BBFILES_DYNAMIC += " \ aglcontainermc:${LAYERDIR}/dynamic-layers/meta-agl-ic-container/*/*/*.bbappend \ " -LAYERSERIES_COMPAT_agldemo = "kirkstone" +LAYERSERIES_COMPAT_agldemo = "scarthgap" LAYERDEPENDS_agldemo = "aglcore qt5-layer openembedded-layer networking-layer multimedia-layer flutter-layer meta-app-framework" diff --git a/recipes-connectivity/cannelloni/cannelloni_%.bbappend b/recipes-connectivity/cannelloni/cannelloni_%.bbappend deleted file mode 100644 index 4619406a6..000000000 --- a/recipes-connectivity/cannelloni/cannelloni_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'cannelloni_agldemo.inc', '', d)} diff --git a/recipes-connectivity/cannelloni/cannelloni_agldemo.inc b/recipes-connectivity/cannelloni/cannelloni_agldemo.inc deleted file mode 100644 index c83d535a0..000000000 --- a/recipes-connectivity/cannelloni/cannelloni_agldemo.inc +++ /dev/null @@ -1,2 +0,0 @@ -PV = "1.0.0+git${SRCPV}" -SRCREV = "071d2d0a2b7997d697fa1228423b329f817a237a" diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0001-dbc2val-add-installation-mechanism.patch b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0001-dbc2val-add-installation-mechanism.patch index 1e1ff5ddc..58ad32593 100644 --- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0001-dbc2val-add-installation-mechanism.patch +++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0001-dbc2val-add-installation-mechanism.patch @@ -66,7 +66,7 @@ index 0000000..65f9157 + version_config={ + "template": "{tag}", + "dev_template": "{tag}-{ccount}", -+ "dirty_template": "{tag}-{ccount}-dirty", ++ "dirty_template": "{tag}+{ccount}-dirty", + "starting_version": "0.1.0", + "version_callback": None, + "version_file": None, diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch b/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch new file mode 100644 index 000000000..0f40a7c1c --- /dev/null +++ b/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch @@ -0,0 +1,35 @@ +From 60561b755cbfbb3aa99b1a0d736cc89540636c00 Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Wed, 7 Jun 2023 21:16:30 +0000 +Subject: [PATCH] kuksa-val-server: OverlayLoader: explicitly include fstream + header + +Otherwise gcc13 now errors out: + +| .../kuksa-val-server/src/OverlayLoader.cpp: In function 'void applyOverlays(std::shared_ptr, std::vector, std::shared_ptr)': +| .../kuksa-val-server/src/OverlayLoader.cpp:70:24: error: variable 'std::ifstream is' has initializer but incomplete type +| 70 | std::ifstream is(p.generic_string()); +| | ^ + +Upstream-Status: Pending + +Signed-off-by: Denys Dmytriyenko +--- + kuksa-val-server/src/OverlayLoader.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kuksa-val-server/src/OverlayLoader.cpp b/kuksa-val-server/src/OverlayLoader.cpp +index bed9234..abd1945 100644 +--- a/kuksa-val-server/src/OverlayLoader.cpp ++++ b/kuksa-val-server/src/OverlayLoader.cpp +@@ -23,6 +23,7 @@ + /* helper fuctions to load overlays during server startup */ + + #include ++#include + #include + + #include "OverlayLoader.hpp" +-- +2.25.1 + diff --git a/recipes-connectivity/kuksa-val/kuksa-val_git.bb b/recipes-connectivity/kuksa-val/kuksa-val_git.bb index c564eabfc..64daba228 100644 --- a/recipes-connectivity/kuksa-val/kuksa-val_git.bb +++ b/recipes-connectivity/kuksa-val/kuksa-val_git.bb @@ -19,6 +19,7 @@ SRC_URI += "file://kuksa-val.service \ file://0003-Make-install-locations-configurable.patch;patchdir=.. \ file://0004-Disable-default-fetch-and-build-of-googletest.patch;patchdir=.. \ file://0005-kuksa-val-server-Add-missing-check_git-dependency.patch;patchdir=.. \ + file://0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch;patchdir=.. \ " S = "${WORKDIR}/git/kuksa-val-server" diff --git a/recipes-connectivity/ofono/files/0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch b/recipes-connectivity/ofono/files/0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch deleted file mode 100644 index 7b44e483e..000000000 --- a/recipes-connectivity/ofono/files/0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7782f8f9d9634ebeddafefedab10ba254f9cc34a Mon Sep 17 00:00:00 2001 -From: Matt Ranostay -Date: Fri, 1 Mar 2019 17:53:17 +0900 -Subject: [PATCH] provision: allow duplicate entries from mbpi_lookup_apn() - results - -Signed-off-by: Matt Ranostay ---- - plugins/provision.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/provision.c b/plugins/provision.c -index 99c299eb..aa0b05e4 100644 ---- a/plugins/provision.c -+++ b/plugins/provision.c -@@ -50,7 +50,7 @@ static int provision_get_settings(const char *mcc, const char *mnc, - - DBG("Provisioning for MCC %s, MNC %s, SPN '%s'", mcc, mnc, spn); - -- apns = mbpi_lookup_apn(mcc, mnc, FALSE, &error); -+ apns = mbpi_lookup_apn(mcc, mnc, TRUE, &error); - if (apns == NULL) { - if (error != NULL) { - ofono_error("%s", error->message); --- -2.20.1 - diff --git a/recipes-connectivity/ofono/files/ofono.conf b/recipes-connectivity/ofono/files/ofono.conf deleted file mode 100644 index e47214c76..000000000 --- a/recipes-connectivity/ofono/files/ofono.conf +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/recipes-connectivity/ofono/ofono_%.bbappend b/recipes-connectivity/ofono/ofono_%.bbappend deleted file mode 100644 index 0386aa9c9..000000000 --- a/recipes-connectivity/ofono/ofono_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'ofono_agldemo.inc', '', d)} diff --git a/recipes-connectivity/ofono/ofono_agldemo.inc b/recipes-connectivity/ofono/ofono_agldemo.inc deleted file mode 100644 index 261983539..000000000 --- a/recipes-connectivity/ofono/ofono_agldemo.inc +++ /dev/null @@ -1,11 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:append = "\ - file://ofono.conf \ - file://0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch \ - " - -do_install:append() { - install -m 0644 ${WORKDIR}/ofono.conf ${D}${sysconfdir}/dbus-1/system.d/ofono.conf -} - -SYSTEMD_AUTO_ENABLE = "enable" diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/recipes-demo/cluster-receiver/cluster-receiver_git.bb index f28abcb6f..70e660c57 100644 --- a/recipes-demo/cluster-receiver/cluster-receiver_git.bb +++ b/recipes-demo/cluster-receiver/cluster-receiver_git.bb @@ -17,7 +17,7 @@ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH} \ file://cluster-receiver.service \ " -SRCREV = "8633f9754fc0b644e45862fc3ed6f95554ce58cf" +SRCREV = "7dd7d94968d1ac2edae62c4b1797407ea8640e3c" S = "${WORKDIR}/git" diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb index d50e9dd12..e146a00d4 100644 --- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb +++ b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb @@ -19,7 +19,7 @@ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-qt-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH} \ file://qt-cluster-receiver.service \ " -SRCREV = "b5622ce91307589b03ad5d903214b47ff2277e48" +SRCREV = "b3ea52f3c9b4ff11447151f086f3c314cada148a" S = "${WORKDIR}/git" diff --git a/recipes-devtools/python/python3-cantools_37.0.7.bbappend b/recipes-devtools/python/python3-cantools_39.%.bbappend similarity index 100% rename from recipes-devtools/python/python3-cantools_37.0.7.bbappend rename to recipes-devtools/python/python3-cantools_39.%.bbappend diff --git a/recipes-devtools/python/python3-grpcio_1.45.0.bbappend b/recipes-devtools/python/python3-grpcio_1.62.1.bbappend similarity index 100% rename from recipes-devtools/python/python3-grpcio_1.45.0.bbappend rename to recipes-devtools/python/python3-grpcio_1.62.1.bbappend diff --git a/recipes-devtools/python/python3-pyqt5_5.15.1.bbappend b/recipes-devtools/python/python3-pyqt5_5.15.9.bbappend similarity index 100% rename from recipes-devtools/python/python3-pyqt5_5.15.1.bbappend rename to recipes-devtools/python/python3-pyqt5_5.15.9.bbappend diff --git a/recipes-graphics/libvncserver/libvncserver_0.9.14.bb b/recipes-graphics/libvncserver/libvncserver_0.9.14.bb deleted file mode 100644 index 32788171e..000000000 --- a/recipes-graphics/libvncserver/libvncserver_0.9.14.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "library for easy implementation of a RDP/VNC server" -HOMEPAGE = "https://libvnc.github.io" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" - -SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https" -SRCREV := "10e9eb75f73e973725dc75c373de5d89807af028" - -S = "${WORKDIR}/git" - -inherit cmake - -# ffmpeg support is not currently compatible with ffmpeg 5.0 -PACKAGECONFIG ??= " \ - 24bpp \ - filetransfer \ - gcrypt \ - gnutls \ - jpeg \ - lzo \ - png \ - pthread \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ - sdl \ - websockets \ - zlib \ -" - -PACKAGECONFIG[24bpp] = "-DWITH_24BPP=ON,-DWITH_24BPP=OFF," -PACKAGECONFIG[filetransfer] = "-DWITH_TIGHTVNC_FILETRANSFER=ON,-DWITH_TIGHTVNC_FILETRANSFER=OFF," -PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg,ffmpeg" -PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt" -PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg" -PACKAGECONFIG[ipv6] = "-DWITH_IPv6=ON,-DWITH_IPv6=OFF," -PACKAGECONFIG[lzo] = "-DWITH_LZO=ON,-DWITH_LZO=OFF,lzo" -PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng" -PACKAGECONFIG[pthread] = "-DWITH_THREADS=ON,-DWITH_THREADS=OFF," -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[sasl] = "-DWITH_SASL=ON,-DWITH_SASL=OFF,cyrus-sasl" -PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,libsdl2" -PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF," -PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" - -PACKAGE_BEFORE_PN = "libvncclient" -FILES:libvncclient = "${libdir}/libvncclient.*" - - - -EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}" diff --git a/recipes-kernel/linux/linux/can-devices.cfg b/recipes-kernel/linux/linux/can-devices.cfg index 2b4f317a8..77a8bffa2 100644 --- a/recipes-kernel/linux/linux/can-devices.cfg +++ b/recipes-kernel/linux/linux/can-devices.cfg @@ -4,7 +4,6 @@ CONFIG_CAN_SLCAN=m CONFIG_CAN_DEV=m CONFIG_CAN_CALC_BITTIMING=y -# CONFIG_CAN_LEDS is not set CONFIG_CAN_C_CAN=m CONFIG_CAN_C_CAN_PLATFORM=m # CONFIG_CAN_SJA1000 is not set @@ -20,7 +19,7 @@ CONFIG_CAN_MCP251X=m # CAN USB interfaces # # CONFIG_CAN_EMS_USB is not set -CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_ESD_USB=m CONFIG_CAN_GS_USB=m CONFIG_CAN_KVASER_USB=m CONFIG_CAN_PEAK_USB=m diff --git a/recipes-kernel/linux/linux/most_deps.cfg b/recipes-kernel/linux/linux/most_deps.cfg index 15ddbd21e..53964a594 100644 --- a/recipes-kernel/linux/linux/most_deps.cfg +++ b/recipes-kernel/linux/linux/most_deps.cfg @@ -6,4 +6,3 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=m diff --git a/recipes-kernel/linux/linux/wifi.cfg b/recipes-kernel/linux/linux/wifi.cfg index 879a6f236..e289062c0 100644 --- a/recipes-kernel/linux/linux/wifi.cfg +++ b/recipes-kernel/linux/linux/wifi.cfg @@ -2,5 +2,4 @@ CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_WLAN_VENDOR_ATH=y CONFIG_ATH9K_HTC=m -CONFIG_STAGING=y -CONFIG_R8188EU=m +CONFIG_RTL8XXXU=m diff --git a/recipes-platform/images/agl-ivi-crosssdk.inc b/recipes-platform/images/agl-ivi-crosssdk.inc index 551c03437..f9f99d8d6 100644 --- a/recipes-platform/images/agl-ivi-crosssdk.inc +++ b/recipes-platform/images/agl-ivi-crosssdk.inc @@ -18,4 +18,7 @@ TOOLCHAIN_HOST_TASK += "nativesdk-grpc nativesdk-grpc-dev" # Add gcc-sanitizers to support building applications using the SDK with # AddressSanitizer support to detect use-after-frees along with other # memory issue. -TOOLCHAIN_TARGET_TASK += "gcc-sanitizers" +TOOLCHAIN_SANITIZERS_TASKS = "gcc-sanitizers" +# gcc-sanitizers is currently (scarthgap) not supported on RISC-V +TOOLCHAIN_SANITIZERS_TASKS:riscv64 = "" +TOOLCHAIN_TARGET_TASK += "${TOOLCHAIN_SANITIZERS_TASKS}" diff --git a/recipes-qt/qt/qtwayland/0001-qwaylandintegration-Keep-previous-check-related-to-i.patch b/recipes-qt/qt/qtwayland/0001-qwaylandintegration-Keep-previous-check-related-to-i.patch index 77362dac3..b34f84d4f 100644 --- a/recipes-qt/qt/qtwayland/0001-qwaylandintegration-Keep-previous-check-related-to-i.patch +++ b/recipes-qt/qt/qtwayland/0001-qwaylandintegration-Keep-previous-check-related-to-i.patch @@ -21,7 +21,7 @@ index c53ccb78..6d3d9559 100644 } #endif -- qCDebug(lcQpaWayland) << "using input method:" << inputContext()->metaObject()->className(); +- qCDebug(lcQpaWayland) << "using input method:" << (inputContext() ? inputContext()->metaObject()->className() : ""); + bool mUsingInputContextFromCompositor = qobject_cast(mInputContext.data()); + if (mUsingInputContextFromCompositor) + qCDebug(lcQpaWayland) << "using input method:" << inputContext()->metaObject()->className(); diff --git a/recipes-support/icu/icu_70.1.bbappend b/recipes-support/icu/icu_70.1.bbappend deleted file mode 100644 index b30ade49e..000000000 --- a/recipes-support/icu/icu_70.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_70.1_agldemo.inc', '', d)} \ No newline at end of file diff --git a/recipes-support/icu/icu_74-1.bbappend b/recipes-support/icu/icu_74-1.bbappend new file mode 100644 index 000000000..cf4061e92 --- /dev/null +++ b/recipes-support/icu/icu_74-1.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_74-1_agldemo.inc', '', d)} diff --git a/recipes-support/icu/icu_70.1_agldemo.inc b/recipes-support/icu/icu_74-1_agldemo.inc similarity index 100% rename from recipes-support/icu/icu_70.1_agldemo.inc rename to recipes-support/icu/icu_74-1_agldemo.inc diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc index 37b44ec46..dee536e9e 100644 --- a/templates/feature/agl-demo/50_bblayers.conf.inc +++ b/templates/feature/agl-demo/50_bblayers.conf.inc @@ -9,3 +9,6 @@ AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia" AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" AGL_META_QT5 = "${METADIR}/external/meta-qt5" + +# Needed to build CEF and WAM +AGL_META_CLANG = "${METADIR}/external/meta-clang"