diff options
24 files changed, 412 insertions, 373 deletions
diff --git a/classes/toradex-mirrors.bbclass b/classes/toradex-mirrors.bbclass deleted file mode 100644 index 8f13e52..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 421ae75..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 = "hardknott honister kirkstone" +LAYERSERIES_COMPAT_toradex-demos = "nanbield scarthgap" 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/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-connectivity/connman/connman/0001-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/0001-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/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-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/socketcan/can-utils_git.bbappend b/recipes-devtools/socketcan/can-utils_git.bbappend deleted file mode 100644 index 96a9805..0000000 --- a/recipes-devtools/socketcan/can-utils_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -SRCREV="901c9e519d8002701eed5fc6823e0239656e38fe" 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 6e1020b..170db77 100644 --- a/recipes-graphics/gpicview/gpicview_0.2.5.bb +++ b/recipes-graphics/gpicview/gpicview_0.2.5.bb @@ -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/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 7a385c0..223eb2c 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -5,15 +5,19 @@ SRC_URI += "file://toradex-save-touchscreen-calibration.sh" PACKAGECONFIG[touchscreen-calibration] = ",," PACKAGECONFIG:append:tdx = " touchscreen-calibration" -INI_UNCOMMENT_ASSIGNMENTS:append:tdx = " \ - \\[libinput\\] \ - enable_tap=true \ -" - 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-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index f360b48..99e9cb3 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 \ @@ -33,6 +34,7 @@ RDEPENDS:packagegroup-tdx-cli = "\ USB_GADGET = " \ libusbgx \ + libusbgx-config \ libusbgx-examples \ " @@ -42,6 +44,7 @@ RRECOMMENDS:packagegroup-base-tdx-cli = "\ can-utils-cantest \ dosfstools \ e2fsprogs-mke2fs \ + exfat-utils \ iproute2 \ libgomp \ libgpiod-tools \ @@ -52,6 +55,7 @@ RRECOMMENDS:packagegroup-base-tdx-cli = "\ uhubctl \ util-linux-fstrim \ ${USB_GADGET} \ + tdx-info \ " SUMMARY:packagegroup-benchmark-tdx-cli = "Benchmarking tools" @@ -74,15 +78,18 @@ 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:append:k3 = "\ + k3conf \ +" SUMMARY:packagegroup-machine-tdx-cli = "Machine specific tools" RRECOMMENDS:packagegroup-machine-tdx-cli = "\ @@ -96,21 +103,13 @@ RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx6 = "\ 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:verdin-imx8mp = "\ - btuart \ - mwifiexap \ -" -RRECOMMENDS:packagegroup-machine-tdx-cli:mx8-generic-bsp = "\ - mwifiexap \ -" SUMMARY:packagegroup-networking-tdx-cli = "Networking specific tools" RRECOMMENDS:packagegroup-networking-tdx-cli = "\ @@ -151,6 +150,9 @@ RRECOMMENDS:packagegroup-utils-tdx-cli = "\ tdx-oak-sensors \ util-linux \ " +RRECOMMENDS:packagegroup-utils-tdx-cli:append:k3 = " \ + cpuburn-a53 \ +" RRECOMMENDS:packagegroup-utils-tdx-cli:append:mx8-generic-bsp = " \ cpuburn-a53 \ " @@ -163,6 +165,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 = "\ @@ -175,6 +183,7 @@ 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 \ diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb index 2dc48e4..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,12 +17,17 @@ 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:k3 = " \ + packagegroup-drm-utils-tdx-graphical \ +" RRECOMMENDS:packagegroup-tdx-graphical:append:mx8-nxp-bsp = " \ packagegroup-drm-utils-tdx-graphical \ " @@ -35,7 +41,7 @@ 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 \ @@ -52,7 +58,7 @@ 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: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 \ @@ -80,7 +86,7 @@ RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6q-nxp-bsp = " \ ${IMAGE_INSTALL_OPENCL_IMX} \ " RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull = "" -RRECOMMENDS_packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = "" +RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = "" RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8-nxp-bsp = " \ tinycompress \ libvdk-imx \ @@ -99,8 +105,13 @@ RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8qm-nxp-bsp = " \ libopenvx-imx \ " +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 1be5909..0d2a661 100644 --- a/recipes-images/images/tdx-reference-minimal-image.bb +++ b/recipes-images/images/tdx-reference-minimal-image.bb @@ -20,8 +20,13 @@ add_rootfs_version () { 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 f9f285b..4299e81 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -18,12 +18,14 @@ 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: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:verdin-am62 ?= "x-window-analogclock" IMAGE_INSTALL += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ @@ -31,6 +33,7 @@ IMAGE_INSTALL += " \ ${@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 \ diff --git a/recipes-multimedia/media-files/media-files_1.1.bb b/recipes-multimedia/media-files/media-files_1.1.bb deleted file mode 100644 index 3a135c0..0000000 --- a/recipes-multimedia/media-files/media-files_1.1.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] = "74420d7d46a19ec232e21059b8eefd85" -SRC_URI[sha256sum] = "8f99b76d56464bafe3cac241fc711b5739236753add55be7a88f28c870e1d013" - -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-support/gpio-tool/gpio-tool.bb b/recipes-support/gpio-tool/gpio-tool.bb index 45181a8..52d2477 100644 --- a/recipes-support/gpio-tool/gpio-tool.bb +++ b/recipes-support/gpio-tool/gpio-tool.bb @@ -24,9 +24,9 @@ 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/ } |