diff options
83 files changed, 676 insertions, 883 deletions
@@ -17,7 +17,7 @@ Dependencies ============ This layer depends on the relevant BSP layers for your machine and: -(please check http://git.toradex.com/cgit/toradex-bsp-platform.git/ to get +(please check https://git.toradex.com/cgit/toradex-bsp-platform.git/ to get the specific layer versions we used when building our binary demo images) URI: git://git.openembedded.org/bitbake @@ -68,8 +68,8 @@ I. Building the meta-toradex-demos Layer For information on how to use the modules with Linux and instructions on how to build the demo images please visit: -http://developer.toradex.com/software/linux -http://developer.toradex.com/knowledge-base/board-support-package/openembedded-(core) +https://developer.toradex.com/software/linux +https://developer.toradex.com/linux-bsp/in-depth/bsp-layers-and-reference-images-for-yocto-project-software For support, visit the Toradex Developer Community: https://www.toradex.com/community diff --git a/classes/toradex-mirrors.bbclass b/classes/toradex-mirrors.bbclass deleted file mode 100644 index 60864e7..0000000 --- a/classes/toradex-mirrors.bbclass +++ /dev/null @@ -1,14 +0,0 @@ -TORADEX_MIRROR_URL="https://artifacts.toradex.com/artifactory/tdxref-torizoncore-sources-frankfurt/${TDX_MAJOR}" - -PREMIRRORS:append () { -cvs://.*/.* ${TORADEX_MIRROR_URL} -svn://.*/.* ${TORADEX_MIRROR_URL} -git://.*/.* ${TORADEX_MIRROR_URL} -gitsm://.*/.* ${TORADEX_MIRROR_URL} -hg://.*/.* ${TORADEX_MIRROR_URL} -bzr://.*/.* ${TORADEX_MIRROR_URL} -p4://.*/.* ${TORADEX_MIRROR_URL} -osc://.*/.* ${TORADEX_MIRROR_URL} -https?$://.*/.* ${TORADEX_MIRROR_URL} -ftp://.*/.* ${TORADEX_MIRROR_URL} -} diff --git a/conf/layer.conf b/conf/layer.conf index a489ef4..56fbccb 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -20,7 +20,5 @@ LAYERDEPENDS_toradex-demos = " \ core \ yocto \ openembedded-layer gnome-layer multimedia-layer networking-layer \ - freescale-layer \ - freescale-distro \ " -LAYERSERIES_COMPAT_toradex-demos = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_toradex-demos = "nanbield scarthgap" diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.png Binary files differdeleted file mode 100644 index 50473a4..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.png Binary files differdeleted file mode 100644 index c2e560f..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.png Binary files differdeleted file mode 100644 index e91c869..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.png Binary files differdeleted file mode 100644 index 6af72d5..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend index 3c2c82c..f88e38b 100644 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend +++ b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend @@ -1,9 +1,6 @@ WALLPAPER-MACHINE = "Wallpaper_Toradex.png" -WALLPAPER-MACHINE:colibri-t20 = "Wallpaper_ColibriT20.png" -WALLPAPER-MACHINE:colibri-t30 = "Wallpaper_ColibriT30.png" -WALLPAPER-MACHINE:apalis-t30 = "Wallpaper_ApalisT30.png" -WALLPAPER-MACHINE:apalis-tk1 = "Wallpaper_ApalisTK1.png" WALLPAPER-MACHINE:colibri-imx6ull = "Wallpaper_ColibriiMX6ULL.png" +WALLPAPER-MACHINE:colibri-imx6ull-emmc = "Wallpaper_ColibriiMX6ULL.png" WALLPAPER-MACHINE:colibri-imx7-emmc = "Wallpaper_ColibriiMX7D.png" FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-themes:" diff --git a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb index 4a7af6b..034342f 100644 --- a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb +++ b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Falkon Webbrowser" HOMEPAGE = "http://www.falkon.org" SECTION = "x11" -LICENSE = "GPLv3 & LGPLv3 & MIT" +LICENSE = "GPL-3.0-only & LGPL-3.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" DEPENDS = "libxcb ki18n openssl qtbase qttools-native qtwebengine qtx11extras" diff --git a/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch b/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch new file mode 100644 index 0000000..a82dc40 --- /dev/null +++ b/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch @@ -0,0 +1,43 @@ +--- a/main.cpp 2022-11-16 15:25:11.221100107 +0100 ++++ b/main.cpp 2022-11-18 09:30:01.084064039 +0100 +@@ -1,5 +1,22 @@ + #include <QGuiApplication> + #include <QQuickView> ++#include <QScreen> ++ ++void setFullscreen(QQuickView *view, const QScreen *screen) ++{ ++ QSize screenSize = screen->size(); ++ /* If we set fullscreen and screen size is 0,0 the application crashes. ++ * Therefore, we only set fullscreen mode when the screen size is big enough. ++ * We have to set visible false before we change the window state, else it ++ * won't update correctly and we might have a title bar */ ++ if ((screenSize.height() > 1) && (screenSize.width() > 1)) { ++ view->setVisible(false); ++ view->setWindowStates(Qt::WindowFullScreen); ++ } ++ ++ /* We always need to set visible to true, else the window will not show up */ ++ view->setVisible(true); ++} + + int main(int argc, char* argv[]) + { +@@ -10,9 +27,15 @@ + + const QString lowerArgument = QString::fromLatin1(argv[1]).toLower(); + if (lowerArgument == QLatin1String("--fullscreen")) { +- view.showFullScreen(); +- } else { ++ QObject::connect(&view, &QQuickView::screenChanged, &app, [&view](QScreen *screen) { ++ setFullscreen(&view, screen); ++ }, Qt::DirectConnection); ++ ++ setFullscreen(&view, view.screen()); ++ } ++ else { + view.show(); + } ++ + return app.exec(); + } diff --git a/qt5-layer/recipes-qt/examples/cinematicexperience_1.0.bbappend b/qt5-layer/recipes-qt/examples/cinematicexperience_1.0.bbappend new file mode 100644 index 0000000..e4d42f4 --- /dev/null +++ b/qt5-layer/recipes-qt/examples/cinematicexperience_1.0.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " file://fix-fullscreen-mode.patch" diff --git a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb index 7c1e563..11bb90d 100644 --- a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb +++ b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb @@ -2,7 +2,7 @@ SUMMARY = "QEdit Text Editor" HOMEPAGE = "http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt&package=qedit&full=0" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d" DEPENDS = "qtbase qtx11extras" diff --git a/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend index 0b9a117..eb597ea 100644 --- a/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend @@ -5,7 +5,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/qt3d:" DEPENDS_GLES = "" DEPENDS_GLES:imxpxp += "virtual/libgles2 virtual/egl" DEPENDS_GLES_imgpu3d += "virtual/libgles2 virtual/egl" -DEPENDS_GLES:use-mainline-bsp += "virtual/libgles2 virtual/egl" +DEPENDS_GLES:upstream += "virtual/libgles2 virtual/egl" DEPENDS:class-target += " ${DEPENDS_GLES}" diff --git a/recipes-benchmark/cpuburn/cpuburn-a53_git.bb b/recipes-benchmark/cpuburn/cpuburn-a53_git.bb index e56e70a..fe9aa24 100644 --- a/recipes-benchmark/cpuburn/cpuburn-a53_git.bb +++ b/recipes-benchmark/cpuburn/cpuburn-a53_git.bb @@ -7,7 +7,7 @@ DL_DIR:append = "/${PN}-${PV}" # Ensure to make this available for machine which has neon COMPATIBLE_MACHINE = "(${@bb.utils.contains("TUNE_FEATURES", "aarch64", "${MACHINE}", "Invalid!", d)})" -SRC_URI = "http://hardwarebug.org/files/burn.S;name=mru \ +SRC_URI = "https://hardwarebug.org/files/burn.S;name=mru \ https://raw.githubusercontent.com/ssvb/cpuburn-arm/dd5c5ba58d2b0b23cfab4a286f9d3f5510000f20/cpuburn-a8.S;name=ssvb \ https://raw.githubusercontent.com/ssvb/cpuburn-arm/ad7e646700d14b81413297bda02fb7fe96613c3f/cpuburn-a53.S;name=ssvb53 \ " diff --git a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb b/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb deleted file mode 100644 index c9021bd..0000000 --- a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Bluetooth Audio ALSA Backend" -HOMEPAGE = "https://github.com/Arkq/bluez-alsa" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb3e99e80c5d718213f35ae1def4c106" - -SRC_URI = " \ - git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master \ - file://0001-Fix-linkage-mark-external-variable-as-extern.patch \ -" - -SRCREV = "9045edb436ea755f395a2e09e4525b5defad286a" - -SRC_URI += "file://bluez-alsa.service" - -S = "${WORKDIR}/git" - -DEPENDS += "alsa-lib bluez5 systemd glib-2.0 sbc" - -PACKAGECONFIG[aac] = "--enable-aac, --disable-aac, " -PACKAGECONFIG[aptx] = "--enable-aptx,--disable-aptx," -PACKAGECONFIG[hcitop] = "--enable-hcitop, --disable-hcitop, libbsd ncurses" - -inherit autotools pkgconfig -inherit systemd - -SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE:${PN} = "bluez-alsa.service" - -PACKAGECONFIG += "hcitop" - -do_install:append () { - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/bluez-alsa.service ${D}${base_libdir}/systemd/system -} - -FILES:${PN} += "\ - ${datadir}/alsa/alsa.conf.d/20-bluealsa.conf\ - ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.so\ - ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.so\ -" - -FILES:${PN}-staticdev += "\ - ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.a\ - ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.a\ -" diff --git a/recipes-connectivity/bluez-alsa/files/0001-Fix-linkage-mark-external-variable-as-extern.patch b/recipes-connectivity/bluez-alsa/files/0001-Fix-linkage-mark-external-variable-as-extern.patch deleted file mode 100644 index d366e18..0000000 --- a/recipes-connectivity/bluez-alsa/files/0001-Fix-linkage-mark-external-variable-as-extern.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3b7b70fbb70131adf0c0451c95b9a5313ddc8e53 Mon Sep 17 00:00:00 2001 -From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com> -Date: Sun, 9 Feb 2020 22:26:16 +0100 -Subject: [PATCH] Fix linkage - mark external variable as extern - -(cherry picked from commit 30a23dd7ce9b00c702fa48545f6b03038f9e17c6) - -Conflicts: - src/bluealsa-iface.h - src/bluez-a2dp.h - src/bluez-iface.h - src/ofono-iface.h - test/server-mock.c - test/test-ba.c - test/test-io.c - test/test-rfcomm.c - -Upstream-Status: Backport [master after tag v2.1.0] -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - src/bluez-a2dp.h | 8 ++++---- - src/bluez-iface.h | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h -index 4826a6f..715fd89 100644 ---- a/src/bluez-a2dp.h -+++ b/src/bluez-a2dp.h -@@ -17,15 +17,15 @@ - - #include "a2dp-codecs.h" - --const a2dp_sbc_t bluez_a2dp_sbc; -+extern const a2dp_sbc_t bluez_a2dp_sbc; - #if ENABLE_MP3 --const a2dp_mpeg_t bluez_a2dp_mpeg; -+extern const a2dp_mpeg_t bluez_a2dp_mpeg; - #endif - #if ENABLE_AAC --const a2dp_aac_t bluez_a2dp_aac; -+extern const a2dp_aac_t bluez_a2dp_aac; - #endif - #if ENABLE_APTX --const a2dp_aptx_t bluez_a2dp_aptx; -+extern const a2dp_aptx_t bluez_a2dp_aptx; - #endif - - #endif -diff --git a/src/bluez-iface.h b/src/bluez-iface.h -index 7d61638..a86a1bd 100644 ---- a/src/bluez-iface.h -+++ b/src/bluez-iface.h -@@ -13,7 +13,7 @@ - - #include <gio/gio.h> - --const GDBusInterfaceInfo bluez_iface_endpoint; --const GDBusInterfaceInfo bluez_iface_profile; -+extern const GDBusInterfaceInfo bluez_iface_endpoint; -+extern const GDBusInterfaceInfo bluez_iface_profile; - - #endif --- -2.20.1 - diff --git a/recipes-connectivity/bluez-alsa/files/bluez-alsa.service b/recipes-connectivity/bluez-alsa/files/bluez-alsa.service deleted file mode 100644 index 671815e..0000000 --- a/recipes-connectivity/bluez-alsa/files/bluez-alsa.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Bluetooth Audio ALSA Backend -After=bluetooth.service -Requires=bluetooth.service - -[Service] -Type=simple -ExecStart=/usr/bin/bluealsa - -[Install] -WantedBy=multi-user.target diff --git a/recipes-connectivity/connman/connman/0001-Adjust-main-configuration.patch b/recipes-connectivity/connman/connman/0001-Adjust-main-configuration.patch new file mode 100644 index 0000000..91949a2 --- /dev/null +++ b/recipes-connectivity/connman/connman/0001-Adjust-main-configuration.patch @@ -0,0 +1,41 @@ +From 0d23846576b53b6a2a8391a29d44e82bf3aed588 Mon Sep 17 00:00:00 2001 +From: Ming Liu <ming.liu@toradex.com> +Date: Tue, 28 Dec 2021 13:50:13 +0100 +Subject: [PATCH] Adjust main configuration + +- Blacklist rndis nic's, we want them handled by systemd's networkd. +- Disable background scan, to avoid significant increase in bandwidth. + +Upstream-Status: Inappropriate [Toradex specific] + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +Signed-off-by: Ming Liu <ming.liu@toradex.com> +--- + src/main.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main.conf b/src/main.conf +index 14965e1..24a17bf 100644 +--- a/src/main.conf ++++ b/src/main.conf +@@ -23,7 +23,7 @@ + # When BackgroundScanning is false, ConnMan will not perform any scan + # regardless of wifi is connected or not, unless it is requested by + # the user through a D-Bus call. +-# BackgroundScanning = true ++BackgroundScanning = false + + # Assume that service gateways also function as timeservers. + # UseGatewaysAsTimeservers = false +@@ -67,7 +67,7 @@ + # not be handled by ConnMan, if their first characters + # match any of the list entries. Default value is + # vmnet,vboxnet,virbr,ifb,ve-,vb-. +-# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb- ++NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb-,usb,rndis + + # Allow ConnMan to change the system hostname. This can + # happen for example if we receive DHCP hostname option. +-- +2.25.1 + diff --git a/recipes-connectivity/connman/connman/0003-connman-clock-ntp-client-should-not-update-time-time.patch b/recipes-connectivity/connman/connman/0001-connman-clock-ntp-client-should-not-update-time-time.patch index c570812..0f8bc47 100644 --- a/recipes-connectivity/connman/connman/0003-connman-clock-ntp-client-should-not-update-time-time.patch +++ b/recipes-connectivity/connman/connman/0001-connman-clock-ntp-client-should-not-update-time-time.patch @@ -6,6 +6,7 @@ Subject: [PATCH] connman: clock: ntp client should not update time/timezone NTP client should not update time/timezone unless otherwise stated explicitly in the settings. +Upstream-Status: Inappropriate [configuration] Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> --- src/clock.c | 4 ++-- diff --git a/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch b/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch deleted file mode 100644 index 65da8ff..0000000 --- a/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 390493e5aab8a6c859a9d14020b6b9cd09bf6f57 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Fri, 30 Dec 2016 13:43:52 +0100 -Subject: [PATCH] connman.service.in: don't start if nfs boot - -connman reconnects its NIC's. If doing a NFS boot the rootfs -connection drops and the boot will fail. -As a simple workaround do not manage the network with connman -at all. -Alternatively one could black list the network interface used -for NFS in /etc/connman/main.conf. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - src/connman.service.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/connman.service.in b/src/connman.service.in -index dab48bc..72c0c91 100644 ---- a/src/connman.service.in -+++ b/src/connman.service.in -@@ -7,6 +7,8 @@ After=dbus.service network-pre.target systemd-sysusers.service - Before=network.target multi-user.target shutdown.target - Wants=network.target - Conflicts=systemd-resolved.service -+# only if not NFS mount, connman will disconnect your rootfs otherwise! -+ConditionKernelCommandLine=!root=/dev/nfs - - [Service] - Type=dbus --- -2.12.0 - diff --git a/recipes-connectivity/connman/connman/0002-main.conf-blacklist-rndis-nic-s.patch b/recipes-connectivity/connman/connman/0002-main.conf-blacklist-rndis-nic-s.patch deleted file mode 100644 index dd6bafa..0000000 --- a/recipes-connectivity/connman/connman/0002-main.conf-blacklist-rndis-nic-s.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 38a7afa59f0edc1e4c6a49e778e6456f6cd30446 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Fri, 30 Dec 2016 13:41:47 +0100 -Subject: [PATCH 2/2] main.conf: blacklist rndis nic's - -We want them handled by systemd's networkd. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - src/main.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main.conf b/src/main.conf -index 14965e1..d7b2951 100644 ---- a/src/main.conf -+++ b/src/main.conf -@@ -67,7 +67,7 @@ - # not be handled by ConnMan, if their first characters - # match any of the list entries. Default value is - # vmnet,vboxnet,virbr,ifb,ve-,vb-. --# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb- -+NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb-,usb,rndis - - # Allow ConnMan to change the system hostname. This can - # happen for example if we receive DHCP hostname option. --- -2.13.6 - diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index 9c56db0..683a023 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -1,9 +1,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/connman:" -SRC_URI += " \ - file://0001-connman.service.in-don-t-start-if-nfs-boot.patch \ - file://0002-main.conf-blacklist-rndis-nic-s.patch \ - file://0003-connman-clock-ntp-client-should-not-update-time-time.patch \ +SRC_URI:append = " \ + file://0001-Adjust-main-configuration.patch \ + file://0001-connman-clock-ntp-client-should-not-update-time-time.patch \ " do_install:append() { diff --git a/recipes-connectivity/hostapd-example/hostapd-example/hostapd-tdx-demo-img.conf b/recipes-connectivity/hostapd-example/hostapd-example/hostapd-tdx-demo-img.conf index bc93609..f178851 100644 --- a/recipes-connectivity/hostapd-example/hostapd-example/hostapd-tdx-demo-img.conf +++ b/recipes-connectivity/hostapd-example/hostapd-example/hostapd-tdx-demo-img.conf @@ -1,7 +1,7 @@ interface=uap0 ssid=testwifi -hw_mode=a -channel=40 +hw_mode=g +channel=9 ieee80211n=1 own_ip_addr=192.168.8.1 wpa=2 diff --git a/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb b/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb deleted file mode 100644 index 874fd5f..0000000 --- a/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Wireless Central Regulatory Domain Database" -HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" -SECTION = "net" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" - -SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "0cbbdc21186c76cf58aba01b03f3dc5b" -SRC_URI[sha256sum] = "e1dfbc3b97771373077f430c3c05082fae883145b37db5b2cfd12c56676fbe7b" - -inherit bin_package allarch - -do_install() { - install -d -m0755 ${D}${nonarch_libdir}/crda - install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys - install -m 0644 regulatory.bin ${D}${nonarch_libdir}/crda/regulatory.bin - install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem - - install -m 0644 -D regulatory.db ${D}${nonarch_base_libdir}/firmware/regulatory.db - install -m 0644 regulatory.db.p7s ${D}${nonarch_base_libdir}/firmware/regulatory.db.p7s -} - -# Install static regulatory DB in /lib/firmware for kernel to load. -# This requires Linux kernel >= v4.15. -# For kernel <= v4.14, inherit the kernel_wireless_regdb.bbclass in kernel's recipe. -PACKAGES =+ "${PN}-static" -RCONFLICTS:${PN} = "${PN}-static" -RDEPENDS:${PN}-dev = "" - -FILES:${PN}-static = " \ - ${nonarch_base_libdir}/firmware/regulatory.db \ - ${nonarch_base_libdir}/firmware/regulatory.db.p7s \ -" - -# Native users might want to use the source of regulatory DB. -# This is for example used by Linux kernel <= v4.14 and kernel_wireless_regdb.bbclass. -do_install:append:class-native() { - install -m 0644 -D db.txt ${D}${libdir}/crda/db.txt -} - -RSUGGESTS:${PN} = "crda" - -BBCLASSEXTEND = "native" - diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend b/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend new file mode 100644 index 0000000..2dca5f2 --- /dev/null +++ b/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend @@ -0,0 +1,4 @@ +do_install:append () { + # Disable background scan to avoid significant increase in bandwidth + sed -i '/update_config/abgscan=""' ${D}${sysconfdir}/wpa_supplicant.conf +} diff --git a/recipes-core/base-files/base-files/fstab b/recipes-core/base-files/base-files/fstab deleted file mode 100644 index 6ccd038..0000000 --- a/recipes-core/base-files/base-files/fstab +++ /dev/null @@ -1,12 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -/dev/root / auto noatime 1 1 -/dev/boot-part /boot auto noatime,noauto 0 0 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,ptmxmode=0666,gid=5 0 0 -tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 - -# uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - diff --git a/recipes-core/base-files/base-files/wayland-env.sh b/recipes-core/base-files/base-files/wayland-env.sh deleted file mode 100644 index e351296..0000000 --- a/recipes-core/base-files/base-files/wayland-env.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - - export XDG_SESSION_TYPE=unspecified - export XDG_SESSION_CLASS=background -fi - diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index 13d7822..8faabfb 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -3,14 +3,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/base-files:" SRC_URI += " \ file://disable_systemd_coloroutput.sh \ file://x11-display-var.sh \ - file://wayland-env.sh \ " do_install:append () { install -m 0755 -d ${D}${sysconfdir}/profile.d install -m 0644 ${WORKDIR}/disable_systemd_coloroutput.sh ${D}${sysconfdir}/profile.d/ install -m 0644 ${WORKDIR}/x11-display-var.sh ${D}${sysconfdir}/profile.d/ - install -m 0644 ${WORKDIR}/wayland-env.sh ${D}${sysconfdir}/profile.d/ } BASEFILESISSUEINSTALL = "" diff --git a/recipes-core/dropbear/dropbear_%.bbappend b/recipes-core/dropbear/dropbear_%.bbappend index 0083f42..587c497 100644 --- a/recipes-core/dropbear/dropbear_%.bbappend +++ b/recipes-core/dropbear/dropbear_%.bbappend @@ -3,4 +3,4 @@ # If debug-tweaks is set in IMAGE_FEATURES then enable also weak ciphers. # With debug-tweaks we allow password less root access, enforcing strong # ciphers is pointless anyway. -PACKAGECONFIG = "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "", "disable-weak-ciphers",d)}" +PACKAGECONFIG:remove = "${@bb.utils.contains('IMAGE_FEATURES', 'debug-tweaks', 'disable-weak-ciphers', '',d)}" diff --git a/recipes-core/glibc/glibc-2.22/0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch b/recipes-core/glibc/glibc-2.22/0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch deleted file mode 100644 index dd3c217..0000000 --- a/recipes-core/glibc/glibc-2.22/0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 3cb3db5c200bb0cfdcfdfcd64e385895e47725f8 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Fri, 12 Jun 2015 13:27:55 +0200 -Subject: [PATCH] memcpy: don't use optimized for VFP/NEON versions - -Tests with the tinymembench tool on a Colibri T30 show the performance -of the standard arm based memcpy to be around 2 times faster than -__memcpy_neon or __memcpy_vfp. - -Tests on Apalis iMX6 confirm this, although running only around 1.3 times faster. ---- - sysdeps/arm/armv7/multiarch/Makefile | 3 --- - sysdeps/arm/armv7/multiarch/ifunc-impl-list.c | 20 -------------------- - sysdeps/arm/armv7/multiarch/memcpy.S | 17 ----------------- - sysdeps/arm/armv7/multiarch/memcpy_neon.S | 9 --------- - sysdeps/arm/armv7/multiarch/memcpy_vfp.S | 7 ------- - 5 files changed, 56 deletions(-) - -diff --git a/sysdeps/arm/armv7/multiarch/Makefile b/sysdeps/arm/armv7/multiarch/Makefile -index 9e1e61c21a..e69de29bb2 100644 ---- a/sysdeps/arm/armv7/multiarch/Makefile -+++ b/sysdeps/arm/armv7/multiarch/Makefile -@@ -1,3 +0,0 @@ --ifeq ($(subdir),string) --sysdep_routines += memcpy_neon memcpy_vfp memchr_neon --endif -diff --git a/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c b/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c -index 8f33156317..1d11e03290 100644 ---- a/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c -+++ b/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c -@@ -31,30 +31,10 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, - { - size_t i = 0; - -- bool use_neon = true; --#ifdef __ARM_NEON__ --# define __memcpy_neon memcpy --# define __memchr_neon memchr --#else -- use_neon = (GLRO(dl_hwcap) & HWCAP_ARM_NEON) != 0; --#endif -- --#ifndef __ARM_NEON__ -- bool use_vfp = true; --# ifdef __SOFTFP__ -- use_vfp = (GLRO(dl_hwcap) & HWCAP_ARM_VFP) != 0; --# endif --#endif -- - IFUNC_IMPL (i, name, memcpy, -- IFUNC_IMPL_ADD (array, i, memcpy, use_neon, __memcpy_neon) --#ifndef __ARM_NEON__ -- IFUNC_IMPL_ADD (array, i, memcpy, use_vfp, __memcpy_vfp) --#endif - IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_arm)); - - IFUNC_IMPL (i, name, memchr, -- IFUNC_IMPL_ADD (array, i, memchr, use_neon, __memchr_neon) - IFUNC_IMPL_ADD (array, i, memchr, 1, __memchr_noneon)); - - return i; -diff --git a/sysdeps/arm/armv7/multiarch/memcpy.S b/sysdeps/arm/armv7/multiarch/memcpy.S -index 8a53bdaf91..e1e13f8d2f 100644 ---- a/sysdeps/arm/armv7/multiarch/memcpy.S -+++ b/sysdeps/arm/armv7/multiarch/memcpy.S -@@ -23,37 +23,20 @@ - #include <rtld-global-offsets.h> - - #if IS_IN (libc) --/* Under __ARM_NEON__, memcpy_neon.S defines the name memcpy. */ --# ifndef __ARM_NEON__ - .text - ENTRY(memcpy) - .type memcpy, %gnu_indirect_function --# ifdef __SOFTFP__ - ldr r1, .Lmemcpy_arm -- tst r0, #HWCAP_ARM_VFP -- ldrne r1, .Lmemcpy_vfp --# else -- ldr r1, .Lmemcpy_vfp --# endif -- tst r0, #HWCAP_ARM_NEON -- ldrne r1, .Lmemcpy_neon - 1: - add r0, r1, pc - DO_RET(lr) - --# ifdef __SOFTFP__ - .Lmemcpy_arm: - .long C_SYMBOL_NAME(__memcpy_arm) - 1b - PC_OFS --# endif --.Lmemcpy_neon: -- .long C_SYMBOL_NAME(__memcpy_neon) - 1b - PC_OFS --.Lmemcpy_vfp: -- .long C_SYMBOL_NAME(__memcpy_vfp) - 1b - PC_OFS - - END(memcpy) - - libc_hidden_builtin_def (memcpy) --#endif /* Not __ARM_NEON__. */ - - /* These versions of memcpy are defined not to clobber any VFP or NEON - registers so they must always call the ARM variant of the memcpy code. */ -diff --git a/sysdeps/arm/armv7/multiarch/memcpy_neon.S b/sysdeps/arm/armv7/multiarch/memcpy_neon.S -index e60d1cc0e1..e69de29bb2 100644 ---- a/sysdeps/arm/armv7/multiarch/memcpy_neon.S -+++ b/sysdeps/arm/armv7/multiarch/memcpy_neon.S -@@ -1,9 +0,0 @@ --#ifdef __ARM_NEON__ --/* Under __ARM_NEON__, this file defines memcpy directly. */ --libc_hidden_builtin_def (memcpy) --#else --# define memcpy __memcpy_neon --#endif -- --#define MEMCPY_NEON --#include "memcpy_impl.S" -diff --git a/sysdeps/arm/armv7/multiarch/memcpy_vfp.S b/sysdeps/arm/armv7/multiarch/memcpy_vfp.S -index e008c041ed..e69de29bb2 100644 ---- a/sysdeps/arm/armv7/multiarch/memcpy_vfp.S -+++ b/sysdeps/arm/armv7/multiarch/memcpy_vfp.S -@@ -1,7 +0,0 @@ --/* Under __ARM_NEON__, memcpy_neon.S defines memcpy directly -- and the __memcpy_vfp code will never be used. */ --#ifndef __ARM_NEON__ --# define MEMCPY_VFP --# define memcpy __memcpy_vfp --# include "memcpy_impl.S" --#endif --- -2.12.0 - diff --git a/recipes-core/glibc/glibc_2.%.bbappend b/recipes-core/glibc/glibc_2.%.bbappend deleted file mode 100644 index 3a90e89..0000000 --- a/recipes-core/glibc/glibc_2.%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/glibc-2.22:" -#SRC_URI_append = " file://0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch" diff --git a/recipes-devtools/mmc/mmc-utils-cos_git.bb b/recipes-devtools/mmc/mmc-utils-cos_git.bb index ff91aa3..c66e6b1 100644 --- a/recipes-devtools/mmc/mmc-utils-cos_git.bb +++ b/recipes-devtools/mmc/mmc-utils-cos_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Userspace tools for MMC/SD devices (Downstream version of Chromium OS Project)" HOMEPAGE = "http://chromium.googlesource.com/chromiumos/third_party/mmc-utils.git" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" inherit update-alternatives diff --git a/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service b/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service deleted file mode 100644 index 1b71a1f..0000000 --- a/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Run pending postinsts -DefaultDependencies=no -After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount -Before=sysinit.target -ConditionPathExistsGlob=#SYSCONFDIR#/*-postinsts - -[Service] -Type=oneshot -ExecStart=#SBINDIR#/run-postinsts -ExecStartPost=#BASE_BINDIR#/systemctl --no-reload disable run-postinsts.service -RemainAfterExit=No -TimeoutSec=0 - -[Install] -WantedBy=sysinit.target diff --git a/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend b/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend deleted file mode 100644 index f8ccc1a..0000000 --- a/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/run-postinsts:" diff --git a/recipes-devtools/spidev-test/spidev-test.bb b/recipes-devtools/spidev-test/spidev-test.bb deleted file mode 100644 index 2c403e6..0000000 --- a/recipes-devtools/spidev-test/spidev-test.bb +++ /dev/null @@ -1,30 +0,0 @@ -COMPATIBLE_MACHINE = "(colibri-vf)" - -SUMMARY = "The Linux kernels spidev-test programm" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}" - -do_configure[depends] += "virtual/kernel:do_shared_workdir" -do_populate_lic[depends] += "virtual/kernel:do_shared_workdir" - -# the spidev_test.c example got moved to tools/spi/ starting with -# the v.4.5.y kernel -KERNELPATH = "tools/spi/spidev_test.c" -KERNELPATH-OLD = "Documentation/spi/spidev_test.c" - -do_compile () { - if [ -f "${STAGING_KERNEL_DIR}/${KERNELPATH}" ] - then - ${CC} ${LDFLAGS} ${STAGING_KERNEL_DIR}/${KERNELPATH} -o spidev_test - else - ${CC} ${LDFLAGS} ${STAGING_KERNEL_DIR}/${KERNELPATH-OLD} -o spidev_test - fi -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${S}/spidev_test ${D}${bindir}/ -} diff --git a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb index 8a39998..8a89f83 100644 --- a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb +++ b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME disk utility" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "avahi-ui glib-2.0 gnome-doc-utils gtk+3 intltool-native \ diff --git a/recipes-graphics/gpicview/gpicview/0001-gpicview-allow-to-build-for-gtk-wayland.patch b/recipes-graphics/gpicview/gpicview/0001-gpicview-allow-to-build-for-gtk-wayland.patch new file mode 100644 index 0000000..8cf74c1 --- /dev/null +++ b/recipes-graphics/gpicview/gpicview/0001-gpicview-allow-to-build-for-gtk-wayland.patch @@ -0,0 +1,276 @@ +From aa2f81a3e78e7da505bdab465eacce9b37b035e6 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Mon, 6 Nov 2023 10:43:46 +0000 +Subject: [PATCH] gpicview: allow to build for gtk/wayland + +For wayland gdk/gdkx.h does not work, even with xwayland. +Remove the more elaborate gf_display_get_workarea function and use the +existing fallback. +With the removal of gdk from the code also remove the dependency +check on x11 from configure. + +Upstream-Status: Inappropriate [Toradex specific] +Upstream targets X11. Removing the use of gdk would remove +functionaliy. + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + Makefile.in | 2 - + configure.ac | 4 -- + data/Makefile.in | 2 - + src/Makefile.am | 5 +- + src/Makefile.in | 7 +-- + src/working-area.c | 123 ++------------------------------------------- + 6 files changed, 6 insertions(+), 137 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 6ecf74a..cad90b7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -317,8 +317,6 @@ SHELL = @SHELL@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-X11_CFLAGS = @X11_CFLAGS@ +-X11_LIBS = @X11_LIBS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff --git a/configure.ac b/configure.ac +index 2fb2469..1591584 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,15 +56,11 @@ AC_SUBST(GTK_LIBS) + + pkg_modules="x11" + +-PKG_CHECK_MODULES(X11, [$pkg_modules]) + AC_CHECK_LIB(jpeg, jpeg_start_decompress, [], + [AC_MSG_ERROR([libjpeg not found])], -lm) + AC_CHECK_HEADER(jpeglib.h, , [AC_MSG_ERROR([libjpeg not found])]) + LIBJPEG='-ljpeg' + +-AC_SUBST(X11_CFLAGS) +-AC_SUBST(X11_LIBS) +- + # Generate po/LINGUAS on the fly rather than relying on translators + # to maintain it manually. This also overcome the problem that Transifex + # cannot add a language to po/LINGUAS if a new po file is submitted. +diff --git a/data/Makefile.in b/data/Makefile.in +index c8c142b..ea2e4ff 100644 +--- a/data/Makefile.in ++++ b/data/Makefile.in +@@ -234,8 +234,6 @@ SHELL = @SHELL@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-X11_CFLAGS = @X11_CFLAGS@ +-X11_LIBS = @X11_LIBS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 44ecb19..6c7a683 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,6 @@ + + # set the include path found by configure + gpicview_CPPFLAGS = $(all_includes) \ +- $(X11_CFLAGS) \ + $(GTK_CFLAGS) \ + $(ADDITIONAL_FLAGS) \ + -I$(top_srcdir) \ +@@ -27,7 +26,7 @@ gpicview_SOURCES = \ + + # the library search path. + # use -nodefaultlibs to prevent linking libstdc++ +-gpicview_LDADD = $(X11_LIBS) $(GTK_LIBS) -lm ++gpicview_LDADD = $(GTK_LIBS) -lm + + noinst_HEADERS = \ + glib-mem.h \ +@@ -44,6 +43,4 @@ noinst_HEADERS = \ + + noinst_PROGRAMS=xml-purge + xml_purge_SOURCES=xml-purge.c +-xml_purge_CFLAGS=@X11_CFLAGS@ +-xml_purge_LDADD=@X11_LIBS@ + +diff --git a/src/Makefile.in b/src/Makefile.in +index 24cfe1f..65fea48 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -271,8 +271,6 @@ SHELL = @SHELL@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-X11_CFLAGS = @X11_CFLAGS@ +-X11_LIBS = @X11_LIBS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +@@ -331,7 +329,6 @@ top_srcdir = @top_srcdir@ + + # set the include path found by configure + gpicview_CPPFLAGS = $(all_includes) \ +- $(X11_CFLAGS) \ + $(GTK_CFLAGS) \ + $(ADDITIONAL_FLAGS) \ + -I$(top_srcdir) \ +@@ -356,7 +353,7 @@ gpicview_SOURCES = \ + + # the library search path. + # use -nodefaultlibs to prevent linking libstdc++ +-gpicview_LDADD = $(X11_LIBS) $(GTK_LIBS) -lm ++gpicview_LDADD = $(GTK_LIBS) -lm + noinst_HEADERS = \ + glib-mem.h \ + image-list.h \ +@@ -371,8 +368,6 @@ noinst_HEADERS = \ + jhead.h + + xml_purge_SOURCES = xml-purge.c +-xml_purge_CFLAGS = @X11_CFLAGS@ +-xml_purge_LDADD = @X11_LIBS@ + all: all-am + + .SUFFIXES: +diff --git a/src/working-area.c b/src/working-area.c +index 86a1fa5..2fa9474 100644 +--- a/src/working-area.c ++++ b/src/working-area.c +@@ -23,126 +23,11 @@ + */ + + # include <gdk/gdk.h> +-# include <gdk/gdkx.h> +-# include <X11/Xlib.h> +-# include <X11/Xutil.h> +-# include <X11/Xatom.h> +- +-void get_working_area(GdkScreen* screen, GdkRectangle *rect); +- +-static gboolean gf_display_get_workarea(GdkScreen* g_screen, GdkRectangle *rect) { +- Atom xa_desktops, xa_current, xa_workarea, xa_type; +- Display *x_display; +- Window x_root; +- guint32 desktops = 0, current = 0; +- gulong *workareas, len, fill; +- guchar *data; +- gint format; +- +- GdkDisplay *g_display; +- Screen *x_screen; +- +- /* get the gdk display */ +- g_display = gdk_display_get_default(); +- if(!g_display) +- return FALSE; +- +- /* get the x display from the gdk display */ +- x_display = gdk_x11_display_get_xdisplay(g_display); +- if(!x_display) +- return FALSE; +- +- /* get the x screen from the gdk screen */ +- x_screen = gdk_x11_screen_get_xscreen(g_screen); +- if(!x_screen) +- return FALSE; +- +- /* get the root window from the screen */ +- x_root = XRootWindowOfScreen(x_screen); +- +- /* find the _NET_NUMBER_OF_DESKTOPS atom */ +- xa_desktops = XInternAtom(x_display, "_NET_NUMBER_OF_DESKTOPS", True); +- if(xa_desktops == None) +- return FALSE; +- +- /* get the number of desktops */ +- if(XGetWindowProperty(x_display, x_root, xa_desktops, 0, 1, False, +- XA_CARDINAL, &xa_type, &format, &len, &fill, +- &data) != Success) +- { +- return FALSE; +- } +- +- if(!data) +- return FALSE; +- +- desktops = *(guint32 *)data; +- XFree(data); +- +- /* find the _NET_CURRENT_DESKTOP atom */ +- xa_current = XInternAtom(x_display, "_NET_CURRENT_DESKTOP", True); +- if(xa_current == None) +- return FALSE; +- +- /* get the current desktop */ +- if(XGetWindowProperty(x_display, x_root, xa_current, 0, 1, False, +- XA_CARDINAL, &xa_type, &format, &len, &fill, +- &data) != Success) +- { +- return FALSE; +- } +- +- if(!data) +- return FALSE; +- +- current = *(guint32 *)data; +- XFree(data); +- +- /* find the _NET_WORKAREA atom */ +- xa_workarea = XInternAtom(x_display, "_NET_WORKAREA", True); +- if(xa_workarea == None) +- return FALSE; +- +- if(XGetWindowProperty(x_display, x_root, xa_workarea, 0, (glong)(4 * 32), +- False, AnyPropertyType, &xa_type, &format, &len, +- &fill, &data) != Success) +- { +- return FALSE; +- } +- +- /* make sure the type and format are good */ +- if(xa_type == None || format == 0) +- return FALSE; +- +- /* make sure we don't have any leftovers */ +- if(fill) +- return FALSE; +- +- /* make sure len divides evenly by 4 */ +- if(len % 4) +- return FALSE; +- +- /* it's good, lets use it */ +- workareas = (gulong *)(guint32 *)data; +- +- rect->x = (guint32)workareas[current * 4]; +- rect->y = (guint32)workareas[current * 4 + 1]; +- rect->width = (guint32)workareas[current * 4 + 2]; +- rect->height = (guint32)workareas[current * 4 + 3]; +- +- /* clean up our memory */ +- XFree(data); +- +- return TRUE; +-} + + void get_working_area(GdkScreen* screen, GdkRectangle *rect) + { +- if( !gf_display_get_workarea(screen, rect) ) +- { +- rect->x = 0; +- rect->y = 0; +- rect->width = gdk_screen_width(); +- rect->height = gdk_screen_height(); +- } ++ rect->x = 0; ++ rect->y = 0; ++ rect->width = gdk_screen_width(); ++ rect->height = gdk_screen_height(); + } +-- +2.35.3 + diff --git a/recipes-graphics/gpicview/gpicview/remove-gdk-x11.patch b/recipes-graphics/gpicview/gpicview/remove-gdk-x11.patch deleted file mode 100644 index a1f97b3..0000000 --- a/recipes-graphics/gpicview/gpicview/remove-gdk-x11.patch +++ /dev/null @@ -1,136 +0,0 @@ -For xwayland gdk/gdkx.h does not work. -Remove the more elaborate gf_display_get_workarea function and use only -the fallback. ---- ./src/working-area.c.orig 2016-02-20 22:38:31.000000000 +0000 -+++ ./src/working-area.c 2020-01-07 13:37:47.023817524 +0000 -@@ -23,126 +23,11 @@ - */ - - # include <gdk/gdk.h> --# include <gdk/gdkx.h> --# include <X11/Xlib.h> --# include <X11/Xutil.h> --# include <X11/Xatom.h> -- --void get_working_area(GdkScreen* screen, GdkRectangle *rect); -- --static gboolean gf_display_get_workarea(GdkScreen* g_screen, GdkRectangle *rect) { -- Atom xa_desktops, xa_current, xa_workarea, xa_type; -- Display *x_display; -- Window x_root; -- guint32 desktops = 0, current = 0; -- gulong *workareas, len, fill; -- guchar *data; -- gint format; -- -- GdkDisplay *g_display; -- Screen *x_screen; -- -- /* get the gdk display */ -- g_display = gdk_display_get_default(); -- if(!g_display) -- return FALSE; -- -- /* get the x display from the gdk display */ -- x_display = gdk_x11_display_get_xdisplay(g_display); -- if(!x_display) -- return FALSE; -- -- /* get the x screen from the gdk screen */ -- x_screen = gdk_x11_screen_get_xscreen(g_screen); -- if(!x_screen) -- return FALSE; -- -- /* get the root window from the screen */ -- x_root = XRootWindowOfScreen(x_screen); -- -- /* find the _NET_NUMBER_OF_DESKTOPS atom */ -- xa_desktops = XInternAtom(x_display, "_NET_NUMBER_OF_DESKTOPS", True); -- if(xa_desktops == None) -- return FALSE; -- -- /* get the number of desktops */ -- if(XGetWindowProperty(x_display, x_root, xa_desktops, 0, 1, False, -- XA_CARDINAL, &xa_type, &format, &len, &fill, -- &data) != Success) -- { -- return FALSE; -- } -- -- if(!data) -- return FALSE; -- -- desktops = *(guint32 *)data; -- XFree(data); -- -- /* find the _NET_CURRENT_DESKTOP atom */ -- xa_current = XInternAtom(x_display, "_NET_CURRENT_DESKTOP", True); -- if(xa_current == None) -- return FALSE; -- -- /* get the current desktop */ -- if(XGetWindowProperty(x_display, x_root, xa_current, 0, 1, False, -- XA_CARDINAL, &xa_type, &format, &len, &fill, -- &data) != Success) -- { -- return FALSE; -- } -- -- if(!data) -- return FALSE; -- -- current = *(guint32 *)data; -- XFree(data); -- -- /* find the _NET_WORKAREA atom */ -- xa_workarea = XInternAtom(x_display, "_NET_WORKAREA", True); -- if(xa_workarea == None) -- return FALSE; -- -- if(XGetWindowProperty(x_display, x_root, xa_workarea, 0, (glong)(4 * 32), -- False, AnyPropertyType, &xa_type, &format, &len, -- &fill, &data) != Success) -- { -- return FALSE; -- } -- -- /* make sure the type and format are good */ -- if(xa_type == None || format == 0) -- return FALSE; -- -- /* make sure we don't have any leftovers */ -- if(fill) -- return FALSE; -- -- /* make sure len divides evenly by 4 */ -- if(len % 4) -- return FALSE; -- -- /* it's good, lets use it */ -- workareas = (gulong *)(guint32 *)data; -- -- rect->x = (guint32)workareas[current * 4]; -- rect->y = (guint32)workareas[current * 4 + 1]; -- rect->width = (guint32)workareas[current * 4 + 2]; -- rect->height = (guint32)workareas[current * 4 + 3]; -- -- /* clean up our memory */ -- XFree(data); -- -- return TRUE; --} - - void get_working_area(GdkScreen* screen, GdkRectangle *rect) - { -- if( !gf_display_get_workarea(screen, rect) ) -- { -- rect->x = 0; -- rect->y = 0; -- rect->width = gdk_screen_width(); -- rect->height = gdk_screen_height(); -- } -+ rect->x = 0; -+ rect->y = 0; -+ rect->width = gdk_screen_width(); -+ rect->height = gdk_screen_height(); - } diff --git a/recipes-graphics/gpicview/gpicview_0.2.5.bb b/recipes-graphics/gpicview/gpicview_0.2.5.bb index 53d996f..170db77 100644 --- a/recipes-graphics/gpicview/gpicview_0.2.5.bb +++ b/recipes-graphics/gpicview/gpicview_0.2.5.bb @@ -2,7 +2,7 @@ SUMMARY = "Simple Image Viewer for X" HOMEPAGE = "http://lxde.sourceforge.net/gpicview" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "glib-2.0-native intltool-native jpeg" @@ -10,7 +10,7 @@ RDEPENDS:${PN} = "adwaita-icon-theme" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/lxde/${P}.tar.xz \ - file://remove-gdk-x11.patch \ + file://0001-gpicview-allow-to-build-for-gtk-wayland.patch \ " SRC_URI[md5sum] = "26be9b0c5a234f1afe7d83d02a4a33f4" SRC_URI[sha256sum] = "38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942" diff --git a/recipes-graphics/graphviz/files/cross_compile.patch b/recipes-graphics/graphviz/files/cross_compile.patch deleted file mode 100644 index 85042c4..0000000 --- a/recipes-graphics/graphviz/files/cross_compile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- graphviz-2.32.0/lib/gvpr/Makefile.am~ 2013-08-14 15:13:03.000000000 +0200 -+++ graphviz-2.32.0git/lib/gvpr/Makefile.am 2013-08-14 15:17:26.039087759 +0200 -@@ -46,6 +46,9 @@ - - mkdefs_SOURCES = mkdefs.c - -+mkdefs: $(mkdefs_SOURCES) -+ $(BUILD_CC) -o $@ $< -+ - gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs - ./mkdefs gdefs.h < $(top_srcdir)/lib/gvpr/gprdata - diff --git a/recipes-graphics/graphviz/graphviz_2.38.0.bb b/recipes-graphics/graphviz/graphviz_2.38.0.bb deleted file mode 100644 index fa547ed..0000000 --- a/recipes-graphics/graphviz/graphviz_2.38.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "graphical" -SUMMARY = "Graphviz - Graph Visualization Software" -HOMEPAGE = "http://www.graphviz.org" -LICENSE = "EPL-1.0" -DEPENDS = "cairo pango expat intltool-native gtk-doc gettext-native python" - -SRC_URI = " \ - http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-${PV}.tar.gz \ - file://cross_compile.patch \ -" -LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04" -SRC_URI[md5sum] = "5b6a829b2ac94efcd5fa3c223ed6d3ae" -SRC_URI[sha256sum] = "81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e" - -PR = "r1" - -FILES:${PN}-dev += " \ - /usr/lib/graphviz/*.so \ -" - -inherit autotools-brokensep pkgconfig diff --git a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb b/recipes-graphics/rdesktop/rdesktop_1.8.3.bb index f1d09c3..78faa6c 100644 --- a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb +++ b/recipes-graphics/rdesktop/rdesktop_1.8.3.bb @@ -1,7 +1,7 @@ DESCRIPTION-${PN}-client = "A remote desktop protocol client" HOMEPAGE = "http://www.rdesktop.org/" SECTION = "utils" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" require rdesktop.inc diff --git a/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch new file mode 100644 index 0000000..5590085 --- /dev/null +++ b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch @@ -0,0 +1,29 @@ +From f064b60df5ebf11a0d3e0ed632a6b989690773f6 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Mon, 21 Feb 2022 22:32:54 +0100 +Subject: [PATCH] pkgconfig: don't include ldflags + +This leaks the cross build environment. +Prevents: +| ERROR: giblib-1.2.4-r0 do_populate_sysroot: QA Issue: giblib.pc failed sanity test (tmpdir) in path ../giblib/1.2.4-r0/sysroot-destdir/usr/lib/ pkgconfig [pkgconfig] + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + giblib.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/giblib.pc.in b/giblib.pc.in +index df520ae..3049603 100644 +--- a/giblib.pc.in ++++ b/giblib.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: giblib + Description: wrapper library for imlib2, and other stuff + Version: @VERSION@ +-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@ ++Libs: -L${libdir} -lgiblib @IMLIB_LIBS@ + Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@ + +-- +2.20.1 + diff --git a/recipes-graphics/scrot/giblib_1.2.4.bb b/recipes-graphics/scrot/giblib_1.2.4.bb index 8cc6835..4dac98c 100644 --- a/recipes-graphics/scrot/giblib_1.2.4.bb +++ b/recipes-graphics/scrot/giblib_1.2.4.bb @@ -1,7 +1,7 @@ SECTION = "graphic/utils" SUMMARY = "giblib is a simple library which wraps imlib2" HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE = "BSD" +LICENSE = "MIT-feh" DEPENDS = "imlib2" @@ -9,8 +9,9 @@ MIRRORS:prepend () { } SRC_URI = " \ - http://pkgs.fedoraproject.org/repo/pkgs/giblib/giblib-${PV}.tar.gz/c810ef5389baf24882a1caca2954385e/giblib-${PV}.tar.gz \ + https://pkgs.fedoraproject.org/repo/pkgs/giblib/giblib-${PV}.tar.gz/c810ef5389baf24882a1caca2954385e/giblib-${PV}.tar.gz \ file://fix-giblib-binconfig-paths.patch \ + file://0001-pkgconfig-don-t-include-ldflags.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011" SRC_URI[md5sum] = "c810ef5389baf24882a1caca2954385e" diff --git a/recipes-graphics/scrot/imlib2_git.bb b/recipes-graphics/scrot/imlib2_git.bb index 3213b15..8abd7d7 100644 --- a/recipes-graphics/scrot/imlib2_git.bb +++ b/recipes-graphics/scrot/imlib2_git.bb @@ -1,5 +1,5 @@ SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" -LICENSE = "MIT & BSD" +LICENSE = "Imlib2" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" diff --git a/recipes-graphics/scrot/scrot_0.8.bb b/recipes-graphics/scrot/scrot_0.8.bb index 91b5638..e394658 100644 --- a/recipes-graphics/scrot/scrot_0.8.bb +++ b/recipes-graphics/scrot/scrot_0.8.bb @@ -2,7 +2,7 @@ SECTION = "graphic/utils" SUMMARY = "scrot (SCReen shOT), screen capture utility" DESCRIPTION = "scrot (SCReen shOT) is a simple commandline screen capture utility that uses imlib2 to grab and save images" HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE = "BSD" +LICENSE = "MIT-feh" RDEPENDS:${PN} = "imlib2-loaders" DEPENDS = "imlib2 giblib" @@ -11,7 +11,7 @@ MIRRORS:prepend () { } SRC_URI = " \ - http://pkgs.fedoraproject.org/repo/pkgs/scrot/scrot-${PV}.tar.gz/ccae904d225609571bdd3b03445c1e88/scrot-${PV}.tar.gz \ + https://pkgs.fedoraproject.org/repo/pkgs/scrot/scrot-${PV}.tar.gz/ccae904d225609571bdd3b03445c1e88/scrot-${PV}.tar.gz \ file://fix-scrot-include-paths.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011" diff --git a/recipes-graphics/vnc/directvnc_0.7.8.bb b/recipes-graphics/vnc/directvnc_0.7.8.bb index 42c56c5..6f82628 100644 --- a/recipes-graphics/vnc/directvnc_0.7.8.bb +++ b/recipes-graphics/vnc/directvnc_0.7.8.bb @@ -1,7 +1,7 @@ SUMMARY = "Provides a very thin VNC client for unix framebuffer systems" HOMEPAGE = "http://drinkmilk.github.com/directvnc/" SECTION = "utils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" DEPENDS = "zlib libpng jpeg directfb xproto" diff --git a/recipes-graphics/vnc/tightvnc_1.3.10.bb b/recipes-graphics/vnc/tightvnc_1.3.10.bb index 4a707b7..29435d0 100644 --- a/recipes-graphics/vnc/tightvnc_1.3.10.bb +++ b/recipes-graphics/vnc/tightvnc_1.3.10.bb @@ -1,7 +1,7 @@ SUMMARY = "A lightweight VNC viewer" HOMEPAGE = "http://www.tightvnc.com/" SECTION = "utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://../LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" DEPENDS = "virtual/libx11 zlib libxmu libxaw jpeg libxt libxext libxmu" diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc index 946b4cc..588ca4b 100644 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc +++ b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc @@ -11,21 +11,20 @@ S = "${WORKDIR}" SRC_URI = " \ file://wayland-app-launch.service.in \ - file://wayland-app-launch.sh.in \ " FILESEXTRAPATHS:prepend := "${THISDIR}/wayland-app-launch:" APPLICATION_ENVIRONMENT ??= "" do_compile () { - sed -e "s:@@wayland-application@@:${WAYLAND_APPLICATION}:" -e "s:@@initial-path@@:${INITIAL_PATH}:" wayland-app-launch.sh.in > wayland-app-launch.sh - sed -e "s:@@application-environment@@:${APPLICATION_ENVIRONMENT}:" wayland-app-launch.service.in > wayland-app-launch.service + sed -e "s:@@wayland-application@@:${WAYLAND_APPLICATION}:" \ + -e "s:@@application-environment@@:${APPLICATION_ENVIRONMENT}:" \ + wayland-app-launch.service.in > wayland-app-launch.service } do_install () { - install -d ${D}/${bindir} ${D}${systemd_unitdir}/system/ + install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/wayland-app-launch.service ${D}${systemd_unitdir}/system - install -m 0755 ${S}/wayland-app-launch.sh ${D}/${bindir} } SYSTEMD_PACKAGES = "${PN}" diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in index 4be53a4..31499c1 100644 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in +++ b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in @@ -1,14 +1,17 @@ [Unit] Description=Start a wayland application -After=weston@root.service -Requires=weston@root.service +After=weston.service +Requires=weston.service [Service] -Restart=on-failure -Type=forking +Type=simple +User=root +PAMName=login +Environment=WAYLAND_DISPLAY=/run/wayland-0 Environment=@@application-environment@@ -ExecStart=/usr/bin/wayland-app-launch.sh +ExecStart=@@wayland-application@@ +Restart=on-failure RestartSec=1 [Install] -WantedBy=multi-user.target +WantedBy=graphical.target diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in deleted file mode 100644 index 87349aa..0000000 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi -fi - -# wait for weston -while [ ! -e $XDG_RUNTIME_DIR/wayland-0 ] ; do sleep 0.1; done -sleep 1 - -cd @@initial-path@@ -@@wayland-application@@ & diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb index d11611e..73c7dd1 100644 --- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb +++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb @@ -2,8 +2,7 @@ # be launched right after weston started INITIAL_APP_PKGS ?= "qtbase-examples qtwayland" -INITIAL_PATH ?= "" -APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"' +APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl' WAYLAND_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock" require wayland-app-launch.inc diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb index bd27da8..7eff903 100644 --- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb +++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb @@ -2,8 +2,7 @@ # be launched right after weston started INITIAL_APP_PKGS ?= "cinematicexperience qtwayland" -INITIAL_PATH ?= "" -APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"' +APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl' WAYLAND_APPLICATION ?= "/usr/share/cinematicexperience-1.0/Qt5_CinematicExperience --fullscreen" require wayland-app-launch.inc diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb index b85fdf0..2e1a2b0 100644 --- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb +++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb @@ -2,8 +2,7 @@ # be launched right after weston started INITIAL_APP_PKGS ?= "qtsmarthome qtwayland" -INITIAL_PATH ?= "/usr/share/qtsmarthome-1.0/" -APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"' -WAYLAND_APPLICATION ?= "${INITIAL_PATH}/smarthome" +APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl' +WAYLAND_APPLICATION ?= "/usr/share/qtsmarthome-1.0/smarthome" require wayland-app-launch.inc diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend new file mode 100644 index 0000000..223eb2c --- /dev/null +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -0,0 +1,23 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://toradex-save-touchscreen-calibration.sh" + +PACKAGECONFIG[touchscreen-calibration] = ",," +PACKAGECONFIG:append:tdx = " touchscreen-calibration" + +do_install:append:tdx() { + if [ "${@bb.utils.contains('PACKAGECONFIG', 'touchscreen-calibration', 'yes', 'no', d)}" = "yes" ]; then + sed -i -e "s/^#\\[libinput\\]/[libinput]/g" ${D}${sysconfdir}/xdg/weston/weston.ini + + sed -i -e "/calibration_helper=/d" ${D}${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[libinput\]/a calibration_helper=${bindir}/toradex-save-touchscreen-calibration" ${D}${sysconfdir}/xdg/weston/weston.ini + + sed -i -e "/touchscreen_calibrator=/d" ${D}${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[libinput\]/a touchscreen_calibrator=true" ${D}${sysconfdir}/xdg/weston/weston.ini + + sed -i -e "/enable_tap=/d" ${D}${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[libinput\]/a enable_tap=true" ${D}${sysconfdir}/xdg/weston/weston.ini + + install -Dm0755 ${WORKDIR}/toradex-save-touchscreen-calibration.sh ${D}${bindir}/toradex-save-touchscreen-calibration + fi +} diff --git a/recipes-graphics/wayland/weston-init/toradex-save-touchscreen-calibration.sh b/recipes-graphics/wayland/weston-init/toradex-save-touchscreen-calibration.sh new file mode 100755 index 0000000..e2871fc --- /dev/null +++ b/recipes-graphics/wayland/weston-init/toradex-save-touchscreen-calibration.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$#" -ne 7 ]; then + echo "This script is to be called by weston with new touch calibration data, it requires 7 parameters." + exit 1 +fi + +echo 'ACTION=="add|change", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", ENV{LIBINPUT_CALIBRATION_MATRIX}=''"'"$2 $3 $4 $5 $6 $7"'"' > /etc/udev/rules.d/libinput.rules + +# Make udev process the new rule by triggering a "change" event: +udevadm trigger "$1" diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index 737f25a..2cd8a57 100644 --- a/recipes-images/images/packagegroup-tdx-cli.bb +++ b/recipes-images/images/packagegroup-tdx-cli.bb @@ -13,6 +13,7 @@ PACKAGES += " \ packagegroup-networking-tdx-cli \ packagegroup-utils-tdx-cli \ packagegroup-utils-large-tdx-cli \ + packagegroup-tpm2-tdx-cli \ packagegroup-wifi-tdx-cli \ packagegroup-wifi-fw-tdx-cli \ packagegroup-wifi-fw-large-tdx-cli \ @@ -31,21 +32,30 @@ RDEPENDS:packagegroup-tdx-cli = "\ packagegroup-wifi-fw-large-tdx-cli \ " +USB_GADGET = " \ + libusbgx \ + libusbgx-config \ + libusbgx-examples \ +" + SUMMARY:packagegroup-base-tdx-cli = "Recommended for any image" RRECOMMENDS:packagegroup-base-tdx-cli = "\ can-utils \ + can-utils-cantest \ dosfstools \ e2fsprogs-mke2fs \ + exfat-utils \ iproute2 \ libgomp \ libgpiod-tools \ - libsoc \ mtd-utils \ set-hostname \ u-boot-fw-utils \ udev-toradex-rules \ uhubctl \ util-linux-fstrim \ + ${USB_GADGET} \ + tdx-info \ " SUMMARY:packagegroup-benchmark-tdx-cli = "Benchmarking tools" @@ -68,46 +78,38 @@ RRECOMMENDS:packagegroup-devel-tdx-cli = "\ fio \ gdbserver \ i2c-tools \ + jq \ ldd \ less \ - perf \ serial-test \ smem \ spitools \ spidev-test \ strace \ " -RRECOMMENDS:packagegroup-devel-tdx-cli:remove:use-nxp-bsp:colibri-vf = "perf" +RRECOMMENDS:packagegroup-devel-tdx-cli:append:k3 = "\ + k3conf \ +" SUMMARY:packagegroup-machine-tdx-cli = "Machine specific tools" RRECOMMENDS:packagegroup-machine-tdx-cli = "\ " RRECOMMENDS:packagegroup-machine-tdx-cli:apalis-imx6 = "\ bmode-usb \ - gpio-export \ " RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx6 = "\ bmode-usb \ - gpio-export \ " RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx6ull = "\ bmode-usb \ mtd-utils-ubifs \ - mwifiexap \ " -RRECOMMENDS_packagegroup-machine-tdx-cli:colibri-imx6ull-emmc = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx6ull-emmc = "\ bmode-usb \ " RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx7 = "\ mtd-utils-ubifs \ " -RRECOMMENDS:packagegroup-machine-tdx-cli:mx8 = "\ - mwifiexap \ -" -RRECOMMENDS:packagegroup-machine-tdx-cli:tegra124 = "\ - hdmi-hotplug \ - kernel-modules \ -" SUMMARY:packagegroup-networking-tdx-cli = "Networking specific tools" RRECOMMENDS:packagegroup-networking-tdx-cli = "\ @@ -123,19 +125,13 @@ SUMMARY:packagegroup-utils-tdx-cli = "Useful utilities" # Entropy source daemon RANDOM_HELPER = "rng-tools" -RANDOM_HELPER:tegra124 = "haveged" - -USB_GADGET = " \ - libusbgx \ - libusbgx-examples \ -" -USB_GADGET:tegra124 = "" RRECOMMENDS:packagegroup-utils-tdx-cli = "\ alsa-utils \ alsa-utils-aplay \ alsa-utils-amixer \ - bluez-alsa \ + alsa-ucm-conf-tdx \ + bluealsa \ bzip2 \ e2fsprogs \ e2fsprogs-resize2fs \ @@ -153,14 +149,13 @@ RRECOMMENDS:packagegroup-utils-tdx-cli = "\ stress-ng \ sqlite3 \ tdx-oak-sensors \ - ${USB_GADGET} \ util-linux \ " -RRECOMMENDS:packagegroup-utils-tdx-cli:append:mx8 = " \ +RRECOMMENDS:packagegroup-utils-tdx-cli:append:k3 = " \ cpuburn-a53 \ " -RRECOMMENDS:packagegroup-utils-tdx-cli:append:tegra124 = " \ - tegrastats \ +RRECOMMENDS:packagegroup-utils-tdx-cli:append:mx8-generic-bsp = " \ + cpuburn-a53 \ " SUMMARY:packagegroup-utils-large-tdx-cli = "Useful utilities, but large footprint" @@ -171,6 +166,12 @@ RRECOMMENDS:packagegroup-utils-large-tdx-cli = "\ packagegroup-dotnet-deps \ " +SUMMARY:packagegroup-tpm2-tdx-cli = "Basic tools to work with TPM 2.0" +RRECOMMENDS:packagegroup-tpm2-tdx-cli = " \ + tpm2-tools \ + libtss2-tcti-device \ +" + SUMMARY:packagegroup-wifi-tdx-cli = "Useful Wi-Fi utilities and firmware" BACKPORTS = "" RRECOMMENDS:packagegroup-wifi-tdx-cli = "\ @@ -183,6 +184,8 @@ RRECOMMENDS:packagegroup-wifi-tdx-cli = "\ SUMMARY:packagegroup-wifi-fw-tdx-cli = "Wi-Fi firmware" RRECOMMENDS:packagegroup-wifi-fw-tdx-cli = "\ linux-firmware-ath10k \ + linux-firmware-iw416 \ + linux-firmware-nxp89xx \ linux-firmware-sd8686 \ linux-firmware-sd8688 \ linux-firmware-sd8787 \ diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb index 7363d4a..6f7ff2a 100644 --- a/recipes-images/images/packagegroup-tdx-graphical.bb +++ b/recipes-images/images/packagegroup-tdx-graphical.bb @@ -9,6 +9,7 @@ PACKAGES += " \ packagegroup-drm-utils-tdx-graphical \ packagegroup-gstreamer-tdx-graphical \ packagegroup-gpu-tdx-graphical \ + packagegroup-vulkan-tools-tdx-graphical \ packagegroup-x11-components-tdx-graphical \ packagegroup-x11-utils-tdx-graphical \ " @@ -16,13 +17,18 @@ PACKAGES += " \ RRECOMMENDS:packagegroup-tdx-graphical = " \ packagegroup-gstreamer-tdx-graphical \ packagegroup-gpu-tdx-graphical \ + ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', \ + 'packagegroup-vulkan-tools-tdx-graphical', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ bb.utils.contains('DISTRO_FEATURES', 'x11', \ 'packagegroup-x11-components-tdx-graphical \ packagegroup-x11-utils-tdx-graphical', \ '', d), d)} \ " -RRECOMMENDS:packagegroup-tdx-graphical:append:mx8 = " \ +RRECOMMENDS:packagegroup-tdx-graphical:append:k3 = " \ + packagegroup-drm-utils-tdx-graphical \ +" +RRECOMMENDS:packagegroup-tdx-graphical:append:mx8-nxp-bsp = " \ packagegroup-drm-utils-tdx-graphical \ " RRECOMMENDS:packagegroup-tdx-graphical:append:upstream = " \ @@ -35,11 +41,12 @@ RRECOMMENDS:packagegroup-drm-utils-tdx-graphical = " \ " SUMMARY:packagegroup-gstreamer-tdx-graphical = "gstreamer packages" -RRECOMMENDS:packagegroup-gstreamer-tdx-graphical = "\ +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical = " \ gstreamer1.0 \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ gstreamer1.0-plugins-bad \ + gst-examples \ " GSTREAMER_MX6QDL = " \ gstreamer1.0-plugins-base-ximagesink \ @@ -48,17 +55,16 @@ GSTREAMER_MX6QDL = " \ imx-gst1.0-plugin-gplay \ imx-gst1.0-plugin-grecorder \ " -RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6dl = " ${GSTREAMER_MX6QDL}" -RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6q = " ${GSTREAMER_MX6QDL}" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6dl-nxp-bsp = " ${GSTREAMER_MX6QDL}" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6q-nxp-bsp = " ${GSTREAMER_MX6QDL}" RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:colibri-imx6ull = "" -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical:colibri-imx6ull-emmc = "" -RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx7 = " imx-gst1.0-plugin" -RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx8 = " \ +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:colibri-imx6ull-emmc = "" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx7-nxp-bsp = " imx-gst1.0-plugin" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx8-nxp-bsp = " \ imx-gst1.0-plugin \ imx-gst1.0-plugin-gplay \ imx-gst1.0-plugin-grecorder \ packagegroup-fsl-gstreamer1.0-full \ - gst-examples \ " SUMMARY:packagegroup-gpu-utils-tdx-graphical = "Utilities for GPU (OpenGL...)" @@ -72,16 +78,16 @@ RRECOMMENDS:packagegroup-gpu-tdx-graphical = " \ IMAGE_INSTALL_GPU_MX6QDL = " \ packagegroup-fsl-gpu-libs \ " -RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6dl = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6dl-nxp-bsp = " \ ${IMAGE_INSTALL_GPU_MX6QDL} \ " -RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6q = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6q-nxp-bsp = " \ ${IMAGE_INSTALL_GPU_MX6QDL} \ ${IMAGE_INSTALL_OPENCL_IMX} \ " RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull = "" -RRECOMMENDS_packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = "" -RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8 = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = "" +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8-nxp-bsp = " \ tinycompress \ libvdk-imx \ vulkan-headers \ @@ -89,22 +95,23 @@ RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8 = " \ vulkan-tools \ ${IMAGE_INSTALL_OPENCL_IMX} \ " -RRECOMMENDS:packagegroup-gpu-tdx-graphical:remove:mx8mm = " \ - vulkan \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:remove:mx8mm-nxp-bsp = " \ + vulkan-headers \ + vulkan-loader \ + vulkan-tools \ ${IMAGE_INSTALL_OPENCL_IMX} \ " -RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8qm = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8qm-nxp-bsp = " \ libopenvx-imx \ " -RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:tegra124 = " \ - libglu \ - freeglut \ - tiff \ - xvinfo \ + +SUMMARY:packagegroup-vulkan-tools-tdx-graphical = "Vulkan tools" +RRECOMMENDS:packagegroup-vulkan-tools-tdx-graphical = " \ + vulkan-tools \ " SUMMARY:packagegroup-x11-components-tdx-graphical = "Components of X11" -RRECOMMENDS:packagegroup-x11-components-tdx-graphical = "\ +RRECOMMENDS:packagegroup-x11-components-tdx-graphical = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ bb.utils.contains('DISTRO_FEATURES', 'x11', \ 'libxcursor \ diff --git a/recipes-images/images/packagegroup-tdx-qt5.bb b/recipes-images/images/packagegroup-tdx-qt5.bb index 293caad..3d4f94d 100644 --- a/recipes-images/images/packagegroup-tdx-qt5.bb +++ b/recipes-images/images/packagegroup-tdx-qt5.bb @@ -22,7 +22,7 @@ RRECOMMENDS:${PN}:colibri-imx6ull = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtbase-examples \ " -RRECOMMENDS_${PN}:colibri-imx6ull-emmc = " \ +RRECOMMENDS:${PN}:colibri-imx6ull-emmc = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtbase-examples \ " diff --git a/recipes-images/images/tdx-reference-minimal-image.bb b/recipes-images/images/tdx-reference-minimal-image.bb index 3ac6196..0d2a661 100644 --- a/recipes-images/images/tdx-reference-minimal-image.bb +++ b/recipes-images/images/tdx-reference-minimal-image.bb @@ -14,22 +14,19 @@ IMAGE_NAME = "${MACHINE_NAME}_${IMAGE_BASENAME}" COPY_LIC_MANIFEST ?= "1" COPY_LIC_DIRS ?= "1" -# Show Tezi EULA license -TEZI_SHOW_EULA_LICENSE ?= "1" -TEZI_SHOW_EULA_LICENSE:apalis-tk1 ?= "0" -TEZI_SHOW_EULA_LICENSE:use-mainline-bsp ?= "0" -TEZI_SHOW_EULA_LICENSE:colibri-imx6:use-mainline-bsp ?= "1" -TEZI_SHOW_EULA_LICENSE:apalis-imx6:use-mainline-bsp ?= "1" - - add_rootfs_version () { printf "${DISTRO_NAME} ${DISTRO_VERSION} (${DISTRO_CODENAME}) \\\n \\\l\n" > ${IMAGE_ROOTFS}/etc/issue printf "${DISTRO_NAME} ${DISTRO_VERSION} (${DISTRO_CODENAME}) %%h\n" > ${IMAGE_ROOTFS}/etc/issue.net printf "${IMAGE_NAME}\n\n" >> ${IMAGE_ROOTFS}/etc/issue printf "${IMAGE_NAME}\n\n" >> ${IMAGE_ROOTFS}/etc/issue.net } + +add_home_root_symlink () { + ln -sf ${ROOT_HOME} ${IMAGE_ROOTFS}/home/root +} + # add the rootfs version to the welcome banner -ROOTFS_POSTPROCESS_COMMAND += " add_rootfs_version;" +ROOTFS_POSTPROCESS_COMMAND += " add_rootfs_version; add_home_root_symlink;" IMAGE_LINGUAS = "en-us" #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb index a05ae22..4299e81 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -8,21 +8,9 @@ inherit populate_sdk_qt5 #Prefix to the resulting deployable tarball name export IMAGE_BASENAME = "Reference-Multimedia-Image" -# Show Tezi EULA license -TEZI_SHOW_EULA_LICENSE ?= "1" -TEZI_SHOW_EULA_LICENSE:apalis-tk1 ?= "0" - -TEZI_SHOW_EULA_LICENSE:use-mainline-bsp ?= "0" -TEZI_SHOW_EULA_LICENSE:colibri-imx6:use-mainline-bsp ?= "1" -TEZI_SHOW_EULA_LICENSE:apalis-imx6:use-mainline-bsp ?= "1" - - -SYSTEMD_DEFAULT_TARGET = "graphical.target" - IMAGE_FEATURES += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ - '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d), d)} \ " APP_LAUNCH_WAYLAND ?= "wayland-qtdemo-launch-cinematicexperience" @@ -30,21 +18,22 @@ APP_LAUNCH_WAYLAND:colibri-imx6ull ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_WAYLAND:colibri-imx6ull-emmc ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_WAYLAND:colibri-imx7 ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_WAYLAND:colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock" -APP_LAUNCH_WAYLAND:apalis-tk1 ?= "wayland-qtdemo-launch-qtsmarthome" +APP_LAUNCH_WAYLAND:verdin-am62 ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_X11 ?= "x-window-qtcinematicexperience" APP_LAUNCH_X11:colibri-imx6ull ?= "x-window-analogclock" APP_LAUNCH_X11:colibri-imx6ull-emmc ?= "x-window-analogclock" APP_LAUNCH_X11:colibri-imx7 ?= "x-window-analogclock" APP_LAUNCH_X11:colibri-imx7-emmc ?= "x-window-analogclock" -APP_LAUNCH_X11:apalis-tk1 ?= "x-window-qtsmarthome" +APP_LAUNCH_X11:verdin-am62 ?= "x-window-analogclock" IMAGE_INSTALL += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ - 'weston weston-init weston-examples ${APP_LAUNCH_WAYLAND}', '', d)} \ + '${APP_LAUNCH_WAYLAND}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \ 'weston-xwayland xterm', \ bb.utils.contains('DISTRO_FEATURES', 'x11', '${APP_LAUNCH_X11}', '', d), d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "tpm2", "packagegroup-tpm2-tdx-cli", "",d)} \ \ packagegroup-tdx-cli \ packagegroup-tdx-graphical \ @@ -56,6 +45,7 @@ IMAGE_INSTALL += " \ less \ makedevs \ mime-support \ + net-tools \ util-linux \ v4l-utils \ \ diff --git a/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend b/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend new file mode 100644 index 0000000..e980807 --- /dev/null +++ b/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append = " bat" diff --git a/recipes-multimedia/bluealsa/bluealsa_git.bb b/recipes-multimedia/bluealsa/bluealsa_git.bb new file mode 100644 index 0000000..ab0d8bc --- /dev/null +++ b/recipes-multimedia/bluealsa/bluealsa_git.bb @@ -0,0 +1,66 @@ +SUMMARY = "Bluetooth Audio ALSA Backend" +HOMEPAGE = "https://github.com/Arkq/bluez-alsa" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8449a4f133a93f6254b496d4fb476e83" + +SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master" + +SRCREV = "dd05a1baa261b94da9ba977b5e3392c8b4dc7a5e" +PV = "4.0.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +DEPENDS += "alsa-lib bluez5 dbus glib-2.0 sbc" + +PACKAGECONFIG ??= "aplay cli hcitop ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf" +PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,fdk-aac" +PACKAGECONFIG[aplay] = "--enable-aplay,--disable-aplay" +PACKAGECONFIG[cli] = "--enable-cli,--disable-cli" +PACKAGECONFIG[coverage] = "--with-coverage,--without-coverage,lcov-native" +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" +PACKAGECONFIG[debug-time] = "--enable-debug-time,--disable-debug-time" +PACKAGECONFIG[faststream] = "--enable-faststream,--disable-faststream" +PACKAGECONFIG[hcitop] = "--enable-hcitop,--disable-hcitop,libbsd ncurses" +PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" +PACKAGECONFIG[mp3lame] = "--enable-mp3lame,--disable-mp3lame,lame" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123,mpg123" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono,ofono" +PACKAGECONFIG[payloadcheck] = "--enable-payloadcheck,--disable-payloadcheck" +PACKAGECONFIG[rfcomm] = "--enable-rfcomm,--disable-rfcomm" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir} \ + --with-systemdbluealsaargs='${SYSTEMD_BLUEALSA_ARGS}' --with-systemdbluealsaaplayargs='${SYSTEMD_BLUEALSA_APLAY_ARGS}',--disable-systemd,systemd" +PACKAGECONFIG[test] = "--enable-test,--disable-test,libcheck libsndfile1" +PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,,upower" + +inherit autotools pkgconfig systemd + +EXTRA_OECONF = " \ + --disable-aptx \ + --disable-lc3plus \ + --disable-ldac \ + --disable-manpages \ +" + +PACKAGE_BEFORE_PN = "${PN}-aplay" +RRECOMMENDS:${PN} = "${PN}-aplay" + +FILES:${PN}-aplay = "${bindir}/bluealsa-aplay" +FILES:${PN} += "${libdir}/alsa-lib/*" + +SYSTEMD_PACKAGES += "${PN}-aplay" +SYSTEMD_SERVICE:${PN} = "bluealsa.service" +SYSTEMD_SERVICE:${PN}-aplay = "bluealsa-aplay.service" + +SYSTEMD_AUTO_ENABLE:${PN}-aplay = "disable" + +# Choose bluez-alsa arguments to be used in bluealsa systemd service +# Usually could choose profiles with it: a2dp-source a2dp-sink hfp-hf hfp-ag hsp-hs hsp-ag hfp-ofono +# Enable bluez-alsa arguments by default: +SYSTEMD_BLUEALSA_ARGS ?= "-p a2dp-source -p a2dp-sink" + +# Choose bluealsa-aplay arguments to be used in bluealsa-aplay systemd service +# Defaults to be empty: +SYSTEMD_BLUEALSA_APLAY_ARGS ?= "" diff --git a/recipes-multimedia/codecgraph/codecgraph_20120114.bb b/recipes-multimedia/codecgraph/codecgraph_20120114.bb index f3b687b..8602506 100644 --- a/recipes-multimedia/codecgraph/codecgraph_20120114.bb +++ b/recipes-multimedia/codecgraph/codecgraph_20120114.bb @@ -2,7 +2,7 @@ SECTION = "multimedia" SUMMARY = "Tool to generate a graph of HDA codec config" DESCRIPTION = "Codecgraph is a tool to generate a graph based on the ALSA description of a High Definition Audio codec." HOMEPAGE = "http://helllabs.org/codecgraph/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" RDEPENDS:${PN} = "python graphviz" SRC_URI = "http://helllabs.org/codecgraph/codecgraph-${PV}.tar.gz" diff --git a/recipes-multimedia/media-files/media-files_1.0.bb b/recipes-multimedia/media-files/media-files_1.0.bb deleted file mode 100644 index 7ecae30..0000000 --- a/recipes-multimedia/media-files/media-files_1.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Media Files for tests" -LICENSE = "CC0-1.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1" - -inherit allarch bin_package - -SRC_URI = " \ - https://developer1.toradex.com/files/toradex-dev/uploads/media/Colibri/AddSW/Linux/ReleaseTest/media-files-${PV}.tar.xz \ -" -SRC_URI[md5sum] = "76482bd08f67435f34e93d44738008de" -SRC_URI[sha256sum] = "021d8261e69433221be4a3996c447411b6002c1e9b34a71c65a3bfe48b54e27d" - -S = "${WORKDIR}/media-files" diff --git a/recipes-multimedia/media-files/media-files_1.3.bb b/recipes-multimedia/media-files/media-files_1.3.bb new file mode 100644 index 0000000..c51497f --- /dev/null +++ b/recipes-multimedia/media-files/media-files_1.3.bb @@ -0,0 +1,28 @@ +SUMMARY = "Media Files for tests" +LICENSE = "CC0-1.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1" + +inherit allarch bin_package + +SRC_URI = "https://docs1.toradex.com/114780-media-files-${PV}.tar.xz" + +SRC_URI[sha256sum] = "d6a3cd2003798fec80fb8008d2e48a5fa2c581f4ae66c03cd573d33b18341e67" + +S = "${WORKDIR}/media-files" + +# Install the files to ${D}${ROOT_HOME} +# Source code of original poky function: +# https://git.yoctoproject.org/poky/plain/meta/classes-recipe/bin_package.bbclass +# The function is being modified to install it inside ROOT_HOME, since we want +# these files inside the root directory and ROOT_HOME can change. +do_install () { + # Do it carefully + [ -d "${S}" ] || exit 1 + if [ -z "$(ls -A ${S})" ]; then + bbfatal bin_package has nothing to install. Be sure the SRC_URI unpacks into S. + fi + cd ${S} + install -d ${D}${base_prefix}${ROOT_HOME} + tar --no-same-owner --exclude='./patches' --exclude='./.pc' -cpf - . \ + | tar --no-same-owner -xpf - -C ${D}${base_prefix}${ROOT_HOME} +} diff --git a/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb b/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb deleted file mode 100644 index 6ec7a03..0000000 --- a/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb +++ /dev/null @@ -1,52 +0,0 @@ -HOMEPAGE = "mediainfo.sourceforge.net" -SUMMARY = "Mediainfo is a tool to analyze multimedia files" -LICENSE = "GPLv2_modified" - -inherit autotools - -SRC_URI = "http://mediaarea.net/download/binary/mediainfo/0.7.62/MediaInfo_CLI_${PV}_GNU_FromSource.tar.bz2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/License.html;md5=7f3735d23c6ef724bbd1475e4f82edcf" - -SRC_URI[md5sum] = "ba10422974111fdff5cf1bb38410c9a1" -SRC_URI[sha256sum] = "ecdde190c9f02ab26769e590314c4841a1c182e8488f1ad8584bdfb374562564" - -S = "${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI" - -do_configure () { - #build zenlib - cd ${WORKDIR}/MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/ - my_runconf - oe_runmake - - #build media info lib - cd ${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library/ - my_runconf - oe_runmake - - #build media info - cd ${S} - oe_runconf -} - -do_install:prepend () { - #install media info - cd ${S} -} - -my_runconf() { - cfgscript="./configure" - if [ -x "$cfgscript" ] ; then - bbnote "Running $cfgscript --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir={datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir} --disable-silent-rules --disable-dependency-tracking --with-libtool-sysroot=/home/tegradev/oe-core/build/out-eglibc/sysroots/colibri-t20 $@" - set +e - ${CACHED_CONFIGUREVARS} $cfgscript --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir=${datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir} --disable-silent-rules --disable-dependency-tracking ${@append_libtool_sysroot(d)} $@ - if [ "$?" != "0" ]; then - echo "Configure failed. The contents of all config.log files follows to aid debugging" - find /home/tegradev/oe-core/build/out-eglibc/work/armv7ahf-vfp-angstrom-linux-gnueabi/mediainfo-0.7.62-r0/mediainfo-0.7.62 -name config.log -print -exec cat {} \; - bbfatal "oe_runconf failed" - fi - set -e - else - bbfatal "no configure script found at $cfgscript" - fi -} - diff --git a/recipes-multimedia/mediainfo/mediainfo_22.06.bb b/recipes-multimedia/mediainfo/mediainfo_22.06.bb new file mode 100644 index 0000000..e9bbf83 --- /dev/null +++ b/recipes-multimedia/mediainfo/mediainfo_22.06.bb @@ -0,0 +1,5 @@ +require mediainfo_22.06.inc + +DEPENDS:append = " mediainfolib" + +S = "${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI" diff --git a/recipes-multimedia/mediainfo/mediainfo_22.06.inc b/recipes-multimedia/mediainfo/mediainfo_22.06.inc new file mode 100644 index 0000000..3d5fcba --- /dev/null +++ b/recipes-multimedia/mediainfo/mediainfo_22.06.inc @@ -0,0 +1,11 @@ +HOMEPAGE = "mediainfo.sourceforge.net" +SUMMARY = "Mediainfo is a tool to analyze multimedia files" +LICENSE = "Apache-2.0|LGPL-2.1-or-later|GPL-2.0-or-later|MPL-2.0" + +inherit autotools-brokensep pkgconfig + +DEPENDS = "zlib" +SRC_URI = "https://mediaarea.net/download/binary/mediainfo/${PV}/MediaInfo_CLI_${PV}_GNU_FromSource.tar.bz2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/License.html;md5=d9af910c0a24603839b95a00d63c1ecc" + +SRC_URI[sha256sum] = "e96633cfced36e7810fc5cd0f15a83362be1f4670e0b38971d8172003dd068d3" diff --git a/recipes-multimedia/mediainfo/mediainfolib_22.06.bb b/recipes-multimedia/mediainfo/mediainfolib_22.06.bb new file mode 100644 index 0000000..b84eeda --- /dev/null +++ b/recipes-multimedia/mediainfo/mediainfolib_22.06.bb @@ -0,0 +1,5 @@ +require mediainfo_22.06.inc + +DEPENDS:append = " zenlib" + +S = "${WORKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library" diff --git a/recipes-multimedia/mediainfo/zenlib_22.06.bb b/recipes-multimedia/mediainfo/zenlib_22.06.bb new file mode 100644 index 0000000..966fb18 --- /dev/null +++ b/recipes-multimedia/mediainfo/zenlib_22.06.bb @@ -0,0 +1,3 @@ +require mediainfo_22.06.inc + +S = "${WORKDIR}/MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library" diff --git a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb b/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb index 2e63c70..610d521 100644 --- a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb +++ b/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb @@ -1,6 +1,6 @@ SUMMARY = "tinycompress library for compress audio offload in alsa" DESCRIPTION = "A library to handle compressed formats like MP3 etc" -LICENSE = "BSD-3-Clause | LGPLv2.1" +LICENSE = "BSD-3-Clause | LGPL-2.1-only" inherit autotools pkgconfig LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0" diff --git a/recipes-support/curl/curl_%.bbappend b/recipes-support/curl/curl_%.bbappend deleted file mode 100644 index 70c8849..0000000 --- a/recipes-support/curl/curl_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Use default packageconfig but .NET Core 2.0 prefers OpenSSL backend -PACKAGECONFIG:remove = "gnutls" -PACKAGECONFIG:append = " ssl" diff --git a/recipes-support/florence/florence3_0.6.3.bb b/recipes-support/florence/florence3_0.6.3.bb index d82b57c..b37fd30 100644 --- a/recipes-support/florence/florence3_0.6.3.bb +++ b/recipes-support/florence/florence3_0.6.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://florence.sourceforge.net/english.html" #NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once. -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PR = "r1" diff --git a/recipes-support/florence/florence_0.5.4.bb b/recipes-support/florence/florence_0.5.4.bb index 28f7f64..486bb9c 100644 --- a/recipes-support/florence/florence_0.5.4.bb +++ b/recipes-support/florence/florence_0.5.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://florence.sourceforge.net/english.html" #NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once. -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PR = "r1" diff --git a/recipes-support/gpio-tool/files/tegra124/gpio-tool b/recipes-support/gpio-tool/files/tegra124/gpio-tool Binary files differdeleted file mode 100755 index 56581b0..0000000 --- a/recipes-support/gpio-tool/files/tegra124/gpio-tool +++ /dev/null diff --git a/recipes-support/gpio-tool/files/tegra124m/gpio-tool b/recipes-support/gpio-tool/files/tegra124m/gpio-tool Binary files differdeleted file mode 100755 index 56581b0..0000000 --- a/recipes-support/gpio-tool/files/tegra124m/gpio-tool +++ /dev/null diff --git a/recipes-support/gpio-tool/files/vf/gpio-tool b/recipes-support/gpio-tool/files/vf/gpio-tool Binary files differdeleted file mode 100755 index 7d7d976..0000000 --- a/recipes-support/gpio-tool/files/vf/gpio-tool +++ /dev/null diff --git a/recipes-support/gpio-tool/gpio-tool.bb b/recipes-support/gpio-tool/gpio-tool.bb index 9ee6029..52d2477 100644 --- a/recipes-support/gpio-tool/gpio-tool.bb +++ b/recipes-support/gpio-tool/gpio-tool.bb @@ -5,7 +5,7 @@ PR = "r3" PACKAGE_ARCH = "${MACHINE_ARCH}" -DEPENDS = "gtk+" +DEPENDS = "glib-2.0 gtk+" SRC_URI = " \ file://gpio-tool \ @@ -13,28 +13,20 @@ SRC_URI = " \ file://gpio-tool.png \ " -PACKAGES = "${PN}" +inherit bin_package #no gnu_hash in binaries, skip QA dev-so for this package #we have symlinks ending in .so, skip QA ldflags for this package #inhibit warnings about files being stripped INSANE_SKIP:${PN} = "ldflags already-stripped" -# just don't do any configuring -do_configure() { -} - do_install() { install -d ${D}/${bindir} install -d ${D}/${datadir}/applications install -d ${D}/${datadir}/pixmaps - install -d ${D}/home/root/Desktop + install -d ${D}${ROOT_HOME}/Desktop install -m 755 ${WORKDIR}/gpio-tool ${D}/${bindir}/ install -m 644 ${WORKDIR}/gpio-tool.desktop ${D}/${datadir}/applications/ install -m 644 ${WORKDIR}/gpio-tool.png ${D}/${datadir}/pixmaps/ - ln -s ${datadir}/applications/gpio-tool.desktop ${D}/home/root/Desktop/ + ln -s ${datadir}/applications/gpio-tool.desktop ${D}${ROOT_HOME}/Desktop/ } - -FILES:${PN} += " \ - /home/root/Desktop \ -" diff --git a/recipes-support/joe/joe_4.6.bb b/recipes-support/joe/joe_4.6.bb index 674736a..ed0bf33 100644 --- a/recipes-support/joe/joe_4.6.bb +++ b/recipes-support/joe/joe_4.6.bb @@ -1,7 +1,7 @@ SECTION = "console/utils" SUMMARY = "Console text editor with good functionality, good choice for vi-haters" HOMEPAGE = "http://joe-editor.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" diff --git a/recipes-support/mcc-pingpong/mcc-pingpong/makefile-use-libs.patch b/recipes-support/mcc-pingpong/mcc-pingpong/makefile-use-libs.patch deleted file mode 100644 index 4e6b921..0000000 --- a/recipes-support/mcc-pingpong/mcc-pingpong/makefile-use-libs.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Makefile b/Makefile -index 7a1fc14..a0f8f4a 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,12 +1,12 @@ - INSTALL_PATH=$(DESTDIR)/usr/bin - --LDFLAGS+=-lmcc -+LDLIBS+=-lmcc - - all: build/mcc-pingpong - - build/mcc-pingpong: src/pingpong.c - mkdir -p build/ -- $(CC) $< -o $@ $(CFLAGS) $(LDFLAGS) -+ $(CC) $< -o $@ $(CFLAGS) $(LDLIBS) $(LDFLAGS) - - install: - mkdir -p $(INSTALL_PATH) diff --git a/recipes-support/mcc-pingpong/mcc-pingpong/update-mcc_free_buffer-call.patch b/recipes-support/mcc-pingpong/mcc-pingpong/update-mcc_free_buffer-call.patch deleted file mode 100644 index bdd00b5..0000000 --- a/recipes-support/mcc-pingpong/mcc-pingpong/update-mcc_free_buffer-call.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit c7db59e08ff1dfb30ae4aba8d6274b0cc8a0f228 -Author: Anthony Felice <tony.felice@timesys.com> -Date: Mon Apr 15 19:24:06 2013 -0400 - - Update call to mcc_free_buffer to comply with API change. - -diff --git a/src/pingpong.c b/src/pingpong.c -index 3d49fc8..5850059 100644 ---- a/src/pingpong.c -+++ b/src/pingpong.c -@@ -121,7 +121,7 @@ int main(int argc, char** argv) - return 1; - } - -- mcc_free_buffer(null, data); -+ mcc_free_buffer(data); - } - - mcc_destroy(node_num); diff --git a/recipes-support/tdx-oak-sensors/tdx-oak-sensors_0082.bb b/recipes-support/tdx-oak-sensors/tdx-oak-sensors_0082.bb index e1d1f3d..c5e09d5 100644 --- a/recipes-support/tdx-oak-sensors/tdx-oak-sensors_0082.bb +++ b/recipes-support/tdx-oak-sensors/tdx-oak-sensors_0082.bb @@ -3,7 +3,7 @@ LICENSE = "PD" S = "${WORKDIR}/OakLinux_${PV}" -SRC_URI = "http://files.toradex.com/Oak/Linux/OakLinux_${PV}.tar.bz2" +SRC_URI = "https://files.toradex.com/Oak/Linux/OakLinux_${PV}.tar.bz2" SRC_URI[md5sum] = "cedc87c056f961c15751ee899fb719d5" SRC_URI[sha256sum] = "69836dfa746422a64f6518cc9e785a7a64ca67d82f5fae0421515a59f4394929" |
