[PATCH 01/24] ovmf: submit patch upstream

[PATCH 01/24] ovmf: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-core/ovmf/ovmf/0006-reproducible.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch b/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch
index 343c21b541..846f408012 100644
--- a/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch
+++ b/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch
@@ -24,7 +24,7 @@ The patch specifically:
    is used, else the output from "GenFw XXX.bin" differs from "GenFw /long/path/XXX.bin"
    with sufficiently long paths
 
-Upstream-Status: Pending [At least some of this might be interesting to upstream]
+Upstream-Status: Submitted [https://github.com/tianocore/edk2/pull/2176]
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
-- 
2.20.1

[PATCH 02/24] mesa-demos: drop glx option and patch

[Alexander Kanavin]

As far as I can see the x11 option does the same thing.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0013-only-build-GLX-demos-if-needed.patch | 62 -------------------
 .../recipes-graphics/mesa/mesa-demos_8.4.0.bb |  4 +-
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch

diff --git a/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch b/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch
deleted file mode 100644
index e7be4dfbe1..0000000000
--- a/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 322af294390a7f4e1524c5a79312be6cbebce988 Mon Sep 17 00:00:00 2001
-From: Awais Belal <awais_belal@mentor.com>
-Date: Wed, 11 Nov 2015 17:22:12 +0500
-Subject: [PATCH] only build GLX demos if needed
-
-There are platforms that default to EGL only configurations
-in which case the GLX applications are not required
-at all. Allow the user to control generation of these
-demos as needed through a configure switch.
-
-Signed-off-by: Awais Belal <awais_belal@mentor.com>
-Upstream-Status: Pending
----
- configure.ac    | 9 +++++++++
- src/Makefile.am | 6 +++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ec7e3..1a4d96d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -132,6 +132,11 @@ if test "x$enable_glu" = xyes; then
-     DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
- fi
- 
-+AC_ARG_ENABLE([glx-demos],
-+    [AS_HELP_STRING([--enable-glx-demos],
-+        [enable GLX demos @<:@default=auto@:>@])],
-+    [glx_demos_enabled="$enableval"],
-+    [glx_demos_enabled=yes])
- AC_ARG_ENABLE([egl],
-     [AS_HELP_STRING([--enable-egl],
-         [enable EGL library @<:@default=auto@:>@])],
-@@ -325,6 +333,7 @@ AC_SUBST([WAYLAND_LIBS])
- 
- AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes")
- AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes")
-+AM_CONDITIONAL(HAVE_GLX, test "x$glx_demos_enabled" = "xyes")
- AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes")
- AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes")
- AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes")
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8b89dee..a4d7e8f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -44,8 +44,12 @@ SUBDIRS = \
- 	slang \
- 	tests \
- 	tools \
--	wgl \
-+	wgl
-+
-+if HAVE_GLX
-+SUBDIRS += \
- 	xdemos
-+endif
- 
- if HAVE_GLEW
- SUBDIRS += \
--- 
-1.9.1
-
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb
index 368af4e915..01e5b35d0e 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb
@@ -17,7 +17,6 @@ SRC_URI = "https://mesa.freedesktop.org/archive/demos/${BPN}-${PV}.tar.bz2 \
            file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \
            file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \
            file://0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch \
-           file://0013-only-build-GLX-demos-if-needed.patch \
            "
 SRC_URI[md5sum] = "6b65a02622765522176d00f553086fa3"
 SRC_URI[sha256sum] = "01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d"
@@ -27,7 +26,7 @@ inherit autotools pkgconfig features_check
 REQUIRED_DISTRO_FEATURES = "opengl x11"
 
 PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \
-                  x11 glew glu glx"
+                  x11 glew glu"
 
 # The Wayland code doesn't work with Wayland 1.0, so disable it for now
 #${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
@@ -47,7 +46,6 @@ PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayla
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11"
 PACKAGECONFIG[glew] = "--enable-glew,--disable-glew,glew"
 PACKAGECONFIG[glu] = "--enable-glu,--disable-glu,virtual/libgl"
-PACKAGECONFIG[glx] = "--enable-glx-demos,--disable-glx-demos"
 
 do_install:append() {
 	# it can be completely empty when all PACKAGECONFIG options are disabled
-- 
2.20.1

[PATCH 03/24] mesa-demos: mark glew/glu patch as non-upstreamable

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...figure-Allow-to-disable-demos-which-require-GLEW-.patch | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
index f6b59a11fe..e31827d4a3 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
@@ -6,7 +6,12 @@ Subject: [PATCH] configure: Allow to disable demos which require GLEW or GLU
 * in some systems without X11 support we don't have GLEW, but
   mesa-demos are still useful
 
-Upstream-Status: Pending
+This isn't currently appropriate for upstream submission as glew has
+been replaced with glad there; glu situation would need to be re-assesed
+when upstream makes a new release, requested here:
+https://gitlab.freedesktop.org/mesa/demos/-/issues/22
+
+Upstream-Status: Inappropriate [see above]
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 
-- 
2.20.1

[PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1

[Alexander Kanavin]

libxcvt is a new dependency (thanks Oleksandr!).

Include ${libdir}/xorg/modules/input/*.so into the main
package (if for someone separate packaging matters, please
investigate what they do).

Remove options no longer present upstream.

Remove patches available upstream; drop a chunk as well.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-xserver/xserver-xorg.inc             |  7 +--
 ...-duplicate-definitions-of-IOPortBase.patch | 24 ++-------
 ...probing-a-non-PCI-platform-device-on.patch | 34 -------------
 ...t-xtest-Initialize-array-with-braces.patch | 36 -------------
 .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -------------
 .../xserver-xorg/sdksyms-no-build-path.patch  | 50 -------------------
 ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} |  6 +--
 7 files changed, 7 insertions(+), 184 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} (77%)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index e1fc0a06dc..6a5f274046 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -28,7 +28,7 @@ inherit autotools pkgconfig
 inherit features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
-LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
+LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess libxcvt"
 DEPENDS = "xorgproto ${LIB_DEPS} font-util"
 
 # Split out some modules and extensions from the main package
@@ -78,7 +78,7 @@ RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
 RDEPENDS:${PN}-xvfb += "xkeyboard-config"
 RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
 
-FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
+FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/input/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
 FILES:${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
 FILES:${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
 FILES:${PN}-sdl = "${bindir}/Xsdl"
@@ -109,7 +109,6 @@ EXTRA_OECONF += "--with-fop=no \
                  --with-pic \
                  --disable-static \
                  --disable-record \
-                 --disable-dmx \
                  --disable-xnest \
                  --enable-xvfb \
                  --enable-composite \
@@ -118,7 +117,6 @@ EXTRA_OECONF += "--with-fop=no \
                  --sysconfdir=/etc/X11 \
                  --localstatedir=/var \
                  --with-xkb-output=/var/lib/xkb \
-                 --with-os-name=Linux \
 "
 
 OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
@@ -141,7 +139,6 @@ PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-
 PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
 PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
 PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
-PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
 
 # Xorg requires a SHA1 implementation, pick one
 XORG_CRYPTO ??= "openssl"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
index 4737040675..11d5546537 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
@@ -1,4 +1,4 @@
-From fc04acfd948ac99d04a5dc08c78f3b13bc0c5c41 Mon Sep 17 00:00:00 2001
+From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 17 Aug 2020 10:50:51 -0700
 Subject: [PATCH] Avoid duplicate definitions of IOPortBase
@@ -10,26 +10,13 @@ compiler.h:528: multiple definition of `IOPortBase';
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
- hw/xfree86/common/compiler.h            | 2 +-
  hw/xfree86/os-support/linux/lnx_video.c | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
 
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 2b2008b..c7d617e 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
- #define PORT_SIZE short
- #endif
- 
--_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
-+extern _X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
- 
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
 diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
-index 04e4509..9dc7316 100644
+index fd83022..1d0d96e 100644
 --- a/hw/xfree86/os-support/linux/lnx_video.c
 +++ b/hw/xfree86/os-support/linux/lnx_video.c
 @@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
@@ -40,6 +27,3 @@ index 04e4509..9dc7316 100644
  
  #if defined(__powerpc__)
  volatile unsigned char *ioBase = NULL;
--- 
-2.28.0
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
deleted file mode 100644
index 8b687d612d..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Fri, 26 Oct 2018 17:47:30 -0700
-Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system
- with PCI.
-
-Some Broadcom set-top-box boards have PCI busses, but the GPU is still
-probed through DT.  We would dereference a null busid here in that
-case.
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
-
-Upstream-Status: Backport [https://github.com/freedesktop/xorg-xserver/commit/e50c85f4e]
-Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
----
- hw/xfree86/common/xf86platformBus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da03..dadbac6c8 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -289,7 +289,7 @@ xf86platformProbe(void)
-     for (i = 0; i < xf86_num_platform_devices; i++) {
-         char *busid = xf86_platform_odev_attributes(i)->busid;
- 
--        if (pci && (strncmp(busid, "pci:", 4) == 0)) {
-+        if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
-             platform_find_pci_info(&xf86_platform_devices[i], busid);
-         }
- 
--- 
-2.28.0
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
deleted file mode 100644
index c0c242814b..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 1 Mar 2019 09:47:57 -0800
-Subject: [PATCH] test/xtest: Initialize array with braces
-
-Fixes an error when extra warnings are enabled, this is caught with clang
-
-test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
-    WindowRec root = {0};
-                      ^
-                      {}
-1 error generated.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/xtest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/xtest.c b/test/xtest.c
-index fc5e433..d7e6620 100644
---- a/test/xtest.c
-+++ b/test/xtest.c
-@@ -61,7 +61,7 @@ xtest_init_devices(void)
- {
-     ScreenRec screen = {0};
-     ClientRec server_client = {0};
--    WindowRec root = {0};
-+    WindowRec root = {{0}};
-     WindowOptRec optional = {0};
- 
-     /* random stuff that needs initialization */
--- 
-2.21.0
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
deleted file mode 100644
index 2ef9fa9fe4..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Thu, 20 Sep 2018 20:12:24 +0100
-Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
-
-Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
-simply get all of the CFLAGS.  Aside from completeness, this helps builds in
-sysroots as pkg-config knows what to do with --cflags but doesn't remap
-arbitrary variables.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- xorg-server.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xorg-server.m4 b/xorg-server.m4
-index 18255b91a..195bda5d8 100644
---- a/xorg-server.m4
-+++ b/xorg-server.m4
-@@ -31,7 +31,7 @@ dnl
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- 	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- 	SAVE_CFLAGS="$CFLAGS"
--	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-+	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
- 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
--- 
-2.11.0
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
deleted file mode 100644
index be198ece49..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Thu, 1 Aug 2019 15:24:51 +0100
-Subject: [PATCH] sdksyms.sh: don't embed the build path
-
-This script generates a header that has a comment containing the build path for
-no real reason.  As this source can end up deployed on targets in debug packages
-this means there is both potentially sensitive information leakage about the
-build environment, and a source of change for reproducible builds.
----
- hw/xfree86/sdksyms.sh | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
-index 39e33711d..bdf47a71a 100755
---- a/hw/xfree86/sdksyms.sh
-+++ b/hw/xfree86/sdksyms.sh
-@@ -302,13 +302,16 @@ LC_ALL=C
- export LC_ALL
- ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
- ${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
-+function basename(file) {
-+    sub(".*/", "", file)
-+    return file
-+}
- BEGIN {
-     sdk = 0;
-     print("/*");
-     print(" * These symbols are referenced to ensure they");
-     print(" * will be available in the X Server binary.");
-     print(" */");
--    printf("/* topdir=%s */\n", topdir);
-     print("_X_HIDDEN void *xorg_symbols[] = {");
- 
-     printf("sdksyms.c:") > "sdksyms.dep";
-@@ -337,7 +340,7 @@ BEGIN {
- 	# remove quotes
- 	gsub(/"/, "", $3);
- 	line = $2;
--	header = $3;
-+	header = basename($3);
- 	if (! headers[$3]) {
- 	    printf(" \\\n  %s", $3) >> "sdksyms.dep";
- 	    headers[$3] = 1;
--- 
-2.20.1
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.13.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.13.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
index 01a54070c7..5793e078ee 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.13.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
@@ -1,14 +1,10 @@
 require xserver-xorg.inc
 
 SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
-           file://pkgconfig.patch \
-           file://0001-test-xtest-Initialize-array-with-braces.patch \
-           file://sdksyms-no-build-path.patch \
            file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
-           file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \
            "
-SRC_URI[sha256sum] = "40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300"
+SRC_URI[sha256sum] = "782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.
-- 
2.20.1

[PATCH 05/24] xserver-xorg: convert from autotools to meson

[Alexander Kanavin]

Not every option was carried over, drop them accordingly.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-xserver/xserver-xorg.inc             | 55 ++++++++-----------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 6a5f274046..4a7048aced 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -23,7 +23,7 @@ CVE_PRODUCT = "xorg-server"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools pkgconfig
+inherit meson pkgconfig
 
 inherit features_check
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -105,50 +105,39 @@ FILES:${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
 FILES:${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
 FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so"
 
-EXTRA_OECONF += "--with-fop=no \
-                 --with-pic \
-                 --disable-static \
-                 --disable-record \
-                 --disable-xnest \
-                 --enable-xvfb \
-                 --enable-composite \
-                 --without-dtrace \
-                 --with-int10=x86emu \
-                 --sysconfdir=/etc/X11 \
-                 --localstatedir=/var \
-                 --with-xkb-output=/var/lib/xkb \
+EXTRA_OEMESON += " \
+                 -Dxnest=false \
+                 -Dxvfb=true \
+                 -Ddtrace=false \
+                 -Dint10=x86emu \
+                 -Dxkb_output_dir=/var/lib/xkb \
 "
 
-OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
+OPENGL_PKGCONFIGS = "dri glx glamor dri3"
 PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-logind', '', d)} \
 "
 
-PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
-PACKAGECONFIG[dga] = "--enable-dga,--disable-dga"
-PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa"
-PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2"
-# DRI3 requires xshmfence to also be enabled
-PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3"
-PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11"
-PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl"
-PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
-PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
-PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
-PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
-PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
-PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
+PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev"
+PACKAGECONFIG[dga] = "-Ddga=true,-Ddga=false"
+PACKAGECONFIG[dri] = "-Ddri1=true,-Ddri1=false,virtual/mesa"
+PACKAGECONFIG[dri2] = "-Ddri2=true,-Ddri2=false"
+PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false"
+PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11"
+PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl"
+PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
+PACKAGECONFIG[systemd-logind] = "-Dsystemd_logind=true,-Dsystemd_logind=false,dbus,"
+PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false"
 
 # Xorg requires a SHA1 implementation, pick one
 XORG_CRYPTO ??= "openssl"
-PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
-PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
-PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
+PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl"
+PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle"
+PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt"
 
 do_install:append () {
 	# Its assumed base-files creates this for us
-	rmdir ${D}${localstatedir}/log/
         sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5
 }
 
-- 
2.20.1

[PATCH 06/24] rust: update 1.56.0 -> 1.56.1

[Alexander Kanavin]

This update includes fixes for the 'trojan source' vulnerability:
https://blog.rust-lang.org/2021/11/01/Rust-1.56.1.html

Drop two unused patches.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 ...56.0.bb => cargo-cross-canadian_1.56.1.bb} |  0
 .../{cargo_1.56.0.bb => cargo_1.56.1.bb}      |  0
 .../rust/files/riscv-march.patch              | 73 -------------------
 meta/recipes-devtools/rust/files/rv64gc.patch | 37 ----------
 ...ibstd-rs_1.56.0.bb => libstd-rs_1.56.1.bb} |  0
 ....56.0.bb => rust-cross-canadian_1.56.1.bb} |  0
 ...t-cross_1.56.0.bb => rust-cross_1.56.1.bb} |  0
 ...-llvm-allow-env-override-of-exe-path.patch |  1 +
 ...ust-llvm_1.56.0.bb => rust-llvm_1.56.1.bb} |  0
 meta/recipes-devtools/rust/rust-snapshot.inc  | 16 ++--
 meta/recipes-devtools/rust/rust-source.inc    |  2 +-
 ...bb => rust-tools-cross-canadian_1.56.1.bb} |  0
 .../rust/{rust_1.56.0.bb => rust_1.56.1.bb}   |  0
 14 files changed, 11 insertions(+), 120 deletions(-)
 rename meta/recipes-devtools/cargo/{cargo-cross-canadian_1.56.0.bb => cargo-cross-canadian_1.56.1.bb} (100%)
 rename meta/recipes-devtools/cargo/{cargo_1.56.0.bb => cargo_1.56.1.bb} (100%)
 delete mode 100644 meta/recipes-devtools/rust/files/riscv-march.patch
 delete mode 100644 meta/recipes-devtools/rust/files/rv64gc.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.56.0.bb => libstd-rs_1.56.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.56.0.bb => rust-cross-canadian_1.56.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-cross_1.56.0.bb => rust-cross_1.56.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.56.0.bb => rust-llvm_1.56.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-tools-cross-canadian_1.56.0.bb => rust-tools-cross-canadian_1.56.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust_1.56.0.bb => rust_1.56.1.bb} (100%)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 609f2fd0eb..d5167ee9ad 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -27,7 +27,7 @@ GOVERSION ?= "1.16%"
 # This can not use wildcards like 8.0.% since it is also used in mesa to denote
 # llvm version being used, so always bump it with llvm recipe version bump
 LLVMVERSION ?= "12.0.1"
-RUSTVERSION ?= "1.56.0"
+RUSTVERSION ?= "1.56.1"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian_1.56.0.bb b/meta/recipes-devtools/cargo/cargo-cross-canadian_1.56.1.bb
similarity index 100%
rename from meta/recipes-devtools/cargo/cargo-cross-canadian_1.56.0.bb
rename to meta/recipes-devtools/cargo/cargo-cross-canadian_1.56.1.bb
diff --git a/meta/recipes-devtools/cargo/cargo_1.56.0.bb b/meta/recipes-devtools/cargo/cargo_1.56.1.bb
similarity index 100%
rename from meta/recipes-devtools/cargo/cargo_1.56.0.bb
rename to meta/recipes-devtools/cargo/cargo_1.56.1.bb
diff --git a/meta/recipes-devtools/rust/files/riscv-march.patch b/meta/recipes-devtools/rust/files/riscv-march.patch
deleted file mode 100644
index a10b3a4d93..0000000000
--- a/meta/recipes-devtools/rust/files/riscv-march.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Add suppor for riscv64 and riscv32 musl targets
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---- a/vendor/cc/src/lib.rs
-+++ b/vendor/cc/src/lib.rs
-@@ -2361,6 +2361,7 @@ impl Build {
-                 "riscv-none-embed",
-             ]),
-             "riscv64gc-unknown-linux-gnu" => Some("riscv64-linux-gnu"),
-+            "riscv64gc-unknown-linux-musl" => Some("riscv64-linux-musl"),
-             "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"),
-             "sparc-unknown-linux-gnu" => Some("sparc-linux-gnu"),
-             "sparc64-unknown-linux-gnu" => Some("sparc64-linux-gnu"),
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -641,9 +641,11 @@ supported_targets! {
-     ("riscv32imc-unknown-none-elf", riscv32imc_unknown_none_elf),
-     ("riscv32imac-unknown-none-elf", riscv32imac_unknown_none_elf),
-     ("riscv32gc-unknown-linux-gnu", riscv32gc_unknown_linux_gnu),
-+    ("riscv32gc-unknown-linux-musl", riscv32gc_unknown_linux_musl),
-     ("riscv64imac-unknown-none-elf", riscv64imac_unknown_none_elf),
-     ("riscv64gc-unknown-none-elf", riscv64gc_unknown_none_elf),
-     ("riscv64gc-unknown-linux-gnu", riscv64gc_unknown_linux_gnu),
-+    ("riscv64gc-unknown-linux-musl", riscv64gc_unknown_linux_musl),
- 
-     ("aarch64-unknown-none", aarch64_unknown_none),
-     ("aarch64-unknown-none-softfloat", aarch64_unknown_none_softfloat),
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/riscv32gc_unknown_linux_musl.rs
-@@ -0,0 +1,19 @@
-+use crate::spec::{CodeModel, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+    Target {
-+        llvm_target: "riscv32-unknown-linux-musl".to_string(),
-+        pointer_width: 32,
-+        data_layout: "e-m:e-p:32:32-i64:64-n32-S128".to_string(),
-+        arch: "riscv32".to_string(),
-+        options: TargetOptions {
-+            unsupported_abis: super::riscv_base::unsupported_abis(),
-+            code_model: Some(CodeModel::Medium),
-+            cpu: "generic-rv32".to_string(),
-+            features: "+m,+a,+f,+d,+c".to_string(),
-+            llvm_abiname: "ilp32d".to_string(),
-+            max_atomic_width: Some(32),
-+            ..super::linux_musl_base::opts()
-+        },
-+    }
-+}
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
-@@ -0,0 +1,19 @@
-+use crate::spec::{CodeModel, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+    Target {
-+        llvm_target: "riscv64-unknown-linux-musl".to_string(),
-+        pointer_width: 64,
-+        data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".to_string(),
-+        arch: "riscv64".to_string(),
-+        options: TargetOptions {
-+            unsupported_abis: super::riscv_base::unsupported_abis(),
-+            code_model: Some(CodeModel::Medium),
-+            cpu: "generic-rv64".to_string(),
-+            features: "+m,+a,+f,+d,+c".to_string(),
-+            llvm_abiname: "lp64d".to_string(),
-+            max_atomic_width: Some(64),
-+            ..super::linux_musl_base::opts()
-+        },
-+    }
-+}
diff --git a/meta/recipes-devtools/rust/files/rv64gc.patch b/meta/recipes-devtools/rust/files/rv64gc.patch
deleted file mode 100644
index aab1e18453..0000000000
--- a/meta/recipes-devtools/rust/files/rv64gc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/vendor/cc-1.0.60/.cargo-checksum.json
-+++ b/vendor/cc-1.0.60/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{"Cargo.lock":"30b9e23f97015aea3eed3e17c6d76d565c2924efec8bdae64c899080847afe89","Cargo.toml":"f6f22b69df3df57c58373cdee72b22218ffa030bc375b36632660037dd72c866","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"51405d284d2e0620db62c655c652fc0ec84f20c1cb30529227355c9575a9e6dd","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"903c5f2f5dd0cc7d04f99f605a95e6abde8b38156fd4e73eefc58493f55a4e5a","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"52afe8554f577c87841c48ddee3ba7ffe70a00129e1d6eeb2ec0efb3d2b9aa11","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"16274867f23871e9b07614eda4c7344da13d1751fed63d4f633857e40be86394","tests/test.rs":"65c073e0e2cf4aa0433066102788e9f57442719e6f32f5ad5248aa7132bb4597"},"package":"ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"}
-\ No newline at end of file
-+{"files":{"Cargo.lock":"30b9e23f97015aea3eed3e17c6d76d565c2924efec8bdae64c899080847afe89","Cargo.toml":"f6f22b69df3df57c58373cdee72b22218ffa030bc375b36632660037dd72c866","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"51405d284d2e0620db62c655c652fc0ec84f20c1cb30529227355c9575a9e6dd","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"2788af2bdf425f267b33bc524f3e627851b52422e38f480a7e39eb834264fd73","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"52afe8554f577c87841c48ddee3ba7ffe70a00129e1d6eeb2ec0efb3d2b9aa11","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"16274867f23871e9b07614eda4c7344da13d1751fed63d4f633857e40be86394","tests/test.rs":"65c073e0e2cf4aa0433066102788e9f57442719e6f32f5ad5248aa7132bb4597"},"package":"ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"}
---- a/vendor/cc-1.0.60/src/lib.rs
-+++ b/vendor/cc-1.0.60/src/lib.rs
-@@ -1639,14 +1639,17 @@ impl Build {
-                     let mut parts = target.split('-');
-                     if let Some(arch) = parts.next() {
-                         let arch = &arch[5..];
--                        cmd.args.push(("-march=rv".to_owned() + arch).into());
-                         if target.contains("linux") && arch.starts_with("64") {
-+                            cmd.args.push(("-march=rv64gc").into());
-                             cmd.args.push("-mabi=lp64d".into());
-                         } else if target.contains("linux") && arch.starts_with("32") {
-+                            cmd.args.push(("-march=rv32gc").into());
-                             cmd.args.push("-mabi=ilp32d".into());
-                         } else if arch.starts_with("64") {
-+                            cmd.args.push(("-march=rv".to_owned() + arch).into());
-                             cmd.args.push("-mabi=lp64".into());
-                         } else {
-+                            cmd.args.push(("-march=rv".to_owned() + arch).into());
-                             cmd.args.push("-mabi=ilp32".into());
-                         }
-                         cmd.args.push("-mcmodel=medany".into());
-@@ -2332,6 +2335,9 @@ impl Build {
-                 "riscv-none-embed",
-             ]),
-             "riscv64gc-unknown-linux-gnu" => Some("riscv64-linux-gnu"),
-+            "riscv32gc-unknown-linux-gnu" => Some("riscv32-linux-gnu"),
-+            "riscv64gc-unknown-linux-musl" => Some("riscv64-linux-musl"),
-+            "riscv32gc-unknown-linux-musl" => Some("riscv32-linux-musl"),
-             "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"),
-             "sparc-unknown-linux-gnu" => Some("sparc-linux-gnu"),
-             "sparc64-unknown-linux-gnu" => Some("sparc64-linux-gnu"),
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.56.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.56.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.56.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.56.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.56.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.56.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.56.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.56.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross_1.56.0.bb b/meta/recipes-devtools/rust/rust-cross_1.56.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross_1.56.0.bb
rename to meta/recipes-devtools/rust/rust-cross_1.56.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch b/meta/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch
index 943c2118bb..9be26677a9 100644
--- a/meta/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch
+++ b/meta/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch
@@ -8,6 +8,7 @@ return the libraries, include directories, etc. from inside the sysroot rather
 than from the native sysroot. Thus provide an env override for calling
 llvm-config from a target sysroot.
 
+Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Martin Kelly <mkelly@xevo.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.56.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.56.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.56.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.56.1.bb
diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc
index 18e98d70a0..3418a2e0ba 100644
--- a/meta/recipes-devtools/rust/rust-snapshot.inc
+++ b/meta/recipes-devtools/rust/rust-snapshot.inc
@@ -2,17 +2,17 @@
 ## snapshot info is taken from rust/src/stage0.txt
 ## TODO: find a way to add additional SRC_URIs based on the contents of an
 ##       earlier SRC_URI.
-RS_VERSION = "1.56.0"
-CARGO_VERSION = "1.56.0"
+RS_VERSION = "1.56.1"
+CARGO_VERSION = "1.56.1"
 
 # TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "f693e4f41a959d62528e0043b0b010c4815fb9f5887267ae34ff8b860f8ec4ae"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "2a5f919e2036496c02ab4707a5eb8bd8a4ce6ea589e01cb39f25d213a26dcdfe"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "f972125810d2db7df2e0af56d9f6a3dcdacc52d983bdf0ca17309b45fc44209b"
+SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "b01011cbb5503c456ecc6a557a38e099994b8497df545c661ce8fd48c5beadc6"
+SRC_URI[rustc-snapshot-x86_64.sha256sum] = "a7001d1218b62d377cab15522d1b1c376b073c05f7d0ff32cf278871a5eeda3d"
+SRC_URI[cargo-snapshot-x86_64.sha256sum] = "dfed65a50e2b58b6807c1fb6f8afa7abd5c3b22c682d505721d615823687c708"
 
-SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "3cd1c69c618e5efaf578a156c2a950c93964f9b47ba4d705d5700bdc64880231"
-SRC_URI[rustc-snapshot-aarch64.sha256sum] = "0d2491a59f697d2ea52fc429b8d4665acb5f79b0e16703f3604b61b8aa68d1c4"
-SRC_URI[cargo-snapshot-aarch64.sha256sum] = "9d97cd655845572846c058577f68ea74b6111f8ea7649db308f786475f764a09"
+SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "a83416d15354e4dfa1c1e4a756282c6be7169679f2b04eca82ed34e2116b93f0"
+SRC_URI[rustc-snapshot-aarch64.sha256sum] = "77aec6a8c5f3d33941c79a48cda3bb08878c23dd1947dc027dfe5c4da41305b3"
+SRC_URI[cargo-snapshot-aarch64.sha256sum] = "3d263eb1871b5d6ca4b198b9611925923e9353e1f5c2becf8c7b784298e88743"
 
 SRC_URI += " \
     https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc
index 326a592544..e197604716 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -1,5 +1,5 @@
 SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
-SRC_URI[rust.sha256sum] = "f13468889833c88e744ad579c5d8fbb7ecb53216159b54481a90e5dcdaa9e320"
+SRC_URI[rust.sha256sum] = "61fdcc8bc2530ee18f91318347e09b7cc07e9ca04b1c627c135ecc8dcb8f2ac5"
 
 RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
 
diff --git a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.56.0.bb b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.56.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-tools-cross-canadian_1.56.0.bb
rename to meta/recipes-devtools/rust/rust-tools-cross-canadian_1.56.1.bb
diff --git a/meta/recipes-devtools/rust/rust_1.56.0.bb b/meta/recipes-devtools/rust/rust_1.56.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.56.0.bb
rename to meta/recipes-devtools/rust/rust_1.56.1.bb
-- 
2.20.1

[PATCH 07/24] libgpg-error: update 1.42 -> 1.43

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libgpg-error/libgpg-error/fix-cross.patch | 28 -------------------
 .../libgpg-error/libgpg-error/pkgconfig.patch | 17 +++++------
 ...gpg-error_1.42.bb => libgpg-error_1.43.bb} |  3 +-
 3 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.42.bb => libgpg-error_1.43.bb} (92%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch b/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
deleted file mode 100644
index ae424cdb9a..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: David Michael <fedora.dm0@gmail.com>
-Date: Fri, 26 Mar 2021 07:06:50 +0000 (+0900)
-Subject: build: Fix generation of lock-obj-pub.native.h for cross build.
-X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=33593864cd54143db594c4237bba41e14179061c
-
-build: Fix generation of lock-obj-pub.native.h for cross build.
-
-* src/gen-lock-obj.sh: Capture echo output with quotes.
-
-Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
-Signed-off-by: David Michael <fedora.dm0@gmail.com>
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
-
-diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
-index a710f0c..258eec6 100755
---- a/src/gen-lock-obj.sh
-+++ b/src/gen-lock-obj.sh
-@@ -38,7 +38,7 @@
- #     AWK=gawk ./gen-lock-obj.sh
- #
- 
--if test -n `echo -n`; then
-+if test -n "`echo -n`"; then
-     ECHO_C='\c'
-     ECHO_N=''
- else
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index aea8eba5fa..ff15759309 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
@@ -1,4 +1,4 @@
-From 62651c5c7b4a391f16dbe1b09c6e220efe5c8a35 Mon Sep 17 00:00:00 2001
+From 52aae746760ce5b88e61ce994f5055e4ce809821 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 29 Mar 2018 15:12:17 +0800
 Subject: [PATCH] support pkgconfig
@@ -14,14 +14,14 @@ Signed-off-by: Armin Kuster <akuster808@gmail.com>
 Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
 
 ---
- src/gpg-error.m4 | 159 +----------------------------------------------
- 1 file changed, 3 insertions(+), 156 deletions(-)
+ src/gpg-error.m4 | 160 +----------------------------------------------
+ 1 file changed, 3 insertions(+), 157 deletions(-)
 
 diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
-index d910754..76f045c 100644
+index 56a5d07..28920ae 100644
 --- a/src/gpg-error.m4
 +++ b/src/gpg-error.m4
-@@ -27,156 +27,12 @@ dnl is added to the gpg_config_script_warn variable.
+@@ -27,157 +27,12 @@ dnl is added to the gpg_config_script_warn variable.
  dnl
  AC_DEFUN([AM_PATH_GPG_ERROR],
  [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -63,7 +63,7 @@ index d910754..76f045c 100644
 -  min_gpg_error_version=ifelse([$1], ,1.33,$1)
 -  ok=no
 -
--  AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
+-  AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
 -  if test "$GPGRT_CONFIG" != "no"; then
 -    # Determine gpgrt_libdir
 -    #
@@ -78,7 +78,8 @@ index d910754..76f045c 100644
 -    #   Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
 -    # It is assumed that CC is specified to the one of host on cross build.
 -    if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
--          sed -n -e "/^libraries/{s/libraries: =//;s/:/\n/gp}"); then
+-          sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
+-/g;p;}"); then
 -      # From the output of -print-search-dirs, select valid pkgconfig dirs.
 -      libdir_candidates=$(for dir in $libdir_candidates; do
 -        if p=$(cd $dir 2>/dev/null && pwd); then
@@ -181,7 +182,7 @@ index d910754..76f045c 100644
      fi
      if test x"$gpg_error_config_host" != xnone ; then
        if test x"$gpg_error_config_host" != x"$host" ; then
-@@ -192,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
+@@ -193,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
        fi
      fi
    else
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
similarity index 92%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.42.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
index 04f5760b76..fe3824b8e0 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
@@ -17,11 +17,10 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
            file://0001-Do-not-fail-when-testing-config-scripts.patch \
-           file://fix-cross.patch \
            file://0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch \
            "
 
-SRC_URI[sha256sum] = "fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23"
+SRC_URI[sha256sum] = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.20.1

[PATCH 08/24] kexec-tools: update 2.0.22 -> 2.0.23

[Alexander Kanavin]

Drop patch as problem fixed upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...exec-ppc.c-correct-double-definition.patch | 23 -------------------
 ...-tools_2.0.22.bb => kexec-tools_2.0.23.bb} |  3 +--
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.22.bb => kexec-tools_2.0.23.bb} (94%)

diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch
deleted file mode 100644
index 6aeebc3939..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ba2fb5baf6b0a8c882ac32301dd7a8d16de0dcf6 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Sun, 27 Dec 2020 23:39:29 +0100
-Subject: [PATCH] kexec/arch/ppc/kexec-ppc.c: correct double definition error
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- kexec/arch/ppc/kexec-ppc.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c
-index 03bec36..5b3e244 100644
---- a/kexec/arch/ppc/kexec-ppc.c
-+++ b/kexec/arch/ppc/kexec-ppc.c
-@@ -35,7 +35,6 @@ unsigned long long initrd_base = 0, initrd_size = 0;
- unsigned long long ramdisk_base = 0, ramdisk_size = 0;
- unsigned int rtas_base, rtas_size;
- int max_memory_ranges;
--const char *ramdisk;
- 
- /*
-  * Reads the #address-cells and #size-cells on this platform.
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
similarity index 94%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
index 95ff5e6ef8..22a9498a7b 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
@@ -19,10 +19,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
            file://0005-Disable-PIE-during-link.patch \
            file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \
            file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
-           file://0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch \
            "
 
-SRC_URI[sha256sum] = "40623d4321be2865ef9ea2cd6ec998d31dcf93d0f74353cbd3aa06d8821e3e41"
+SRC_URI[sha256sum] = "c7dcc59f5b66004d9d91264324e20e0387ea263dbb449708fbf84a4e5ff7decc"
 
 inherit autotools update-rc.d systemd
 
-- 
2.20.1

[PATCH 09/24] socat: upgrade 1.7.4.1 -> 1.7.4.2

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../socat/{socat_1.7.4.1.bb => socat_1.7.4.2.bb}               | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-connectivity/socat/{socat_1.7.4.1.bb => socat_1.7.4.2.bb} (92%)

diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.1.bb b/meta/recipes-connectivity/socat/socat_1.7.4.2.bb
similarity index 92%
rename from meta/recipes-connectivity/socat/socat_1.7.4.1.bb
rename to meta/recipes-connectivity/socat/socat_1.7.4.2.bb
index 1ad5f15b93..0edde6a2e4 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.4.1.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.4.2.bb
@@ -12,8 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
 "
 
-SRC_URI[md5sum] = "36cad050ecf4981ab044c3fbd75c643f"
-SRC_URI[sha256sum] = "3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9"
+SRC_URI[sha256sum] = "6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763"
 
 inherit autotools
 
-- 
2.20.1

[PATCH 10/24] python3-hypothesis: upgrade 6.24.0 -> 6.24.2

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...ython3-hypothesis_6.24.0.bb => python3-hypothesis_6.24.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hypothesis_6.24.0.bb => python3-hypothesis_6.24.2.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.24.0.bb b/meta/recipes-devtools/python/python3-hypothesis_6.24.2.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.24.0.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.24.2.bb
index 50f7e01061..ef45ddb6c6 100644
--- a/meta/recipes-devtools/python/python3-hypothesis_6.24.0.bb
+++ b/meta/recipes-devtools/python/python3-hypothesis_6.24.2.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
     file://test_rle.py \
     "
 
-SRC_URI[sha256sum] = "ef53bd1c4756436be2e8d4a2e16f6f5ffbca7acbe8041e6872aea16176ff3806"
+SRC_URI[sha256sum] = "4030f88ae0a8d3339a41dd7589c78d3ba0a3a270f729c12aceddaea7c60b224b"
 
 RDEPENDS:${PN} += " \
     python3-attrs \
-- 
2.20.1

[PATCH 11/24] python3-numpy: upgrade 1.21.3 -> 1.21.4

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../{python3-numpy_1.21.3.bb => python3-numpy_1.21.4.bb}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python-numpy/{python3-numpy_1.21.3.bb => python3-numpy_1.21.4.bb} (96%)

diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.21.3.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.21.4.bb
similarity index 96%
rename from meta/recipes-devtools/python-numpy/python3-numpy_1.21.3.bb
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.21.4.bb
index 4a289c2c7b..8988a5bc39 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.21.3.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.21.4.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
            file://0001-numpy-core-Define-RISCV-32-support.patch \
            file://run-ptest \
 "
-SRC_URI[sha256sum] = "d0bba24083c01ae43457514d875f10d9ce4c1125d55b1e2573277b2410f2d068"
+SRC_URI[sha256sum] = "5d412381aa489b8be82ac5c6a9e99c3eb3f754245ad3f90ab5c339d92f25fb47"
 
 UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
-- 
2.20.1

[PATCH 12/24] python3-packaging: upgrade 21.0 -> 21.2

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...dbf19e2b76ab025efc11208bd50e09e8223e.patch | 37 +++++++++++++++++++
 ...ging_21.0.bb => python3-packaging_21.2.bb} |  4 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch
 rename meta/recipes-devtools/python/{python3-packaging_21.0.bb => python3-packaging_21.2.bb} (69%)

diff --git a/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch b/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch
new file mode 100644
index 0000000000..42b1dc133f
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch
@@ -0,0 +1,37 @@
+From 8cb9dbf19e2b76ab025efc11208bd50e09e8223e Mon Sep 17 00:00:00 2001
+From: Moyiz <8603313+moyiz@users.noreply.github.com>
+Date: Tue, 2 Nov 2021 21:42:53 +0200
+Subject: [PATCH] Revert pyparsing constraint (#482)
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ setup.py                   | 2 +-
+ tests/test_requirements.py | 4 +++-
+ 4 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index c6a1caec..419aa284 100644
+--- a/setup.py
++++ b/setup.py
+@@ -48,7 +48,7 @@
+     author=about["__author__"],
+     author_email=about["__email__"],
+     python_requires=">=3.6",
+-    install_requires=["pyparsing>=2.0.2,<3"],  # Needed to avoid issue #91
++    install_requires=["pyparsing>=2.0.2"],  # Needed to avoid issue #91
+     classifiers=[
+         "Development Status :: 5 - Production/Stable",
+         "Intended Audience :: Developers",
+diff --git a/tests/test_requirements.py b/tests/test_requirements.py
+index 8cc45687..f2c209c4 100644
+--- a/tests/test_requirements.py
++++ b/tests/test_requirements.py
+@@ -192,4 +192,6 @@ def test_sys_platform_linux_in(self):
+     def test_parseexception_error_msg(self):
+         with pytest.raises(InvalidRequirement) as e:
+             Requirement("toto 42")
+-        assert "Expected stringEnd" in str(e.value)
++        assert "Expected stringEnd" in str(e.value) or (
++            "Expected string_end" in str(e.value)  # pyparsing>=3.0.0
++        )
diff --git a/meta/recipes-devtools/python/python3-packaging_21.0.bb b/meta/recipes-devtools/python/python3-packaging_21.2.bb
similarity index 69%
rename from meta/recipes-devtools/python/python3-packaging_21.0.bb
rename to meta/recipes-devtools/python/python3-packaging_21.2.bb
index f20f8886a4..5e9541082f 100644
--- a/meta/recipes-devtools/python/python3-packaging_21.0.bb
+++ b/meta/recipes-devtools/python/python3-packaging_21.2.bb
@@ -3,7 +3,9 @@ HOMEPAGE = "https://github.com/pypa/packaging"
 LICENSE = "Apache-2.0 | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91"
 
-SRC_URI[sha256sum] = "7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"
+SRC_URI[sha256sum] = "096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"
+
+SRC_URI += "file://8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch"
 
 inherit pypi setuptools3
 
-- 
2.20.1

[PATCH 13/24] python3-pbr: upgrade 5.6.0 -> 5.7.0

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/python/python3-pbr_5.6.0.bb | 4 ----
 meta/recipes-devtools/python/python3-pbr_5.7.0.bb | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-pbr_5.6.0.bb
 create mode 100644 meta/recipes-devtools/python/python3-pbr_5.7.0.bb

diff --git a/meta/recipes-devtools/python/python3-pbr_5.6.0.bb b/meta/recipes-devtools/python/python3-pbr_5.6.0.bb
deleted file mode 100644
index 132e6e52b6..0000000000
--- a/meta/recipes-devtools/python/python3-pbr_5.6.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-inherit setuptools3
-require python-pbr.inc
-
-SRC_URI[sha256sum] = "42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd"
diff --git a/meta/recipes-devtools/python/python3-pbr_5.7.0.bb b/meta/recipes-devtools/python/python3-pbr_5.7.0.bb
new file mode 100644
index 0000000000..12aeb7e8fa
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pbr_5.7.0.bb
@@ -0,0 +1,4 @@
+inherit setuptools3
+require python-pbr.inc
+
+SRC_URI[sha256sum] = "4651ca1445e80f2781827305de3d76b3ce53195f2227762684eb08f17bc473b7"
-- 
2.20.1

[PATCH 14/24] python3-py: upgrade 1.10.0 -> 1.11.0

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../python/{python3-py_1.10.0.bb => python3-py_1.11.0.bb}       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-py_1.10.0.bb => python3-py_1.11.0.bb} (80%)

diff --git a/meta/recipes-devtools/python/python3-py_1.10.0.bb b/meta/recipes-devtools/python/python3-py_1.11.0.bb
similarity index 80%
rename from meta/recipes-devtools/python/python3-py_1.10.0.bb
rename to meta/recipes-devtools/python/python3-py_1.11.0.bb
index 8225c6b6c8..f8be3935e5 100644
--- a/meta/recipes-devtools/python/python3-py_1.10.0.bb
+++ b/meta/recipes-devtools/python/python3-py_1.11.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://py.readthedocs.io/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9"
 
-SRC_URI[sha256sum] = "21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"
+SRC_URI[sha256sum] = "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"
 
 DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
 
-- 
2.20.1

[PATCH 15/24] python3-setuptools: upgrade 58.3.0 -> 58.5.3

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../0001-conditionally-do-not-fetch-code-by-easy_install.patch  | 2 +-
 ...ython3-setuptools_58.3.0.bb => python3-setuptools_58.5.3.bb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-setuptools_58.3.0.bb => python3-setuptools_58.5.3.bb} (94%)

diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
index 46546ebba6..c5d6c64eda 100644
--- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
+++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
@@ -1,4 +1,4 @@
-From 58b614411867a31cf5f9684a45fe519b8e4f3e7b Mon Sep 17 00:00:00 2001
+From dd77d2f4486079380235ed0466d2eab110f7bdc5 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 17 Jul 2018 10:13:38 +0800
 Subject: [PATCH] conditionally do not fetch code by easy_install
diff --git a/meta/recipes-devtools/python/python3-setuptools_58.3.0.bb b/meta/recipes-devtools/python/python3-setuptools_58.5.3.bb
similarity index 94%
rename from meta/recipes-devtools/python/python3-setuptools_58.3.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_58.5.3.bb
index 47107ba61d..ddc3fca354 100644
--- a/meta/recipes-devtools/python/python3-setuptools_58.3.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_58.5.3.bb
@@ -13,7 +13,7 @@ SRC_URI += "\
     file://0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch \
 "
 
-SRC_URI[sha256sum] = "b0c2461641b58fe30e11d4c3dfba316c513bdf9ec85f9fed0c871c678447205e"
+SRC_URI[sha256sum] = "dae6b934a965c8a59d6d230d3867ec408bb95e73bd538ff77e71fedf1eaca729"
 
 DEPENDS += "${PYTHON_PN}"
 
-- 
2.20.1

[PATCH 16/24] python3-pyparsing: update 3.0.4 -> 3.0.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{python3-pyparsing_3.0.4.bb => python3-pyparsing_3.0.5.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pyparsing_3.0.4.bb => python3-pyparsing_3.0.5.bb} (85%)

diff --git a/meta/recipes-devtools/python/python3-pyparsing_3.0.4.bb b/meta/recipes-devtools/python/python3-pyparsing_3.0.5.bb
similarity index 85%
rename from meta/recipes-devtools/python/python3-pyparsing_3.0.4.bb
rename to meta/recipes-devtools/python/python3-pyparsing_3.0.5.bb
index a862345e09..6f2c7f6cd9 100644
--- a/meta/recipes-devtools/python/python3-pyparsing_3.0.4.bb
+++ b/meta/recipes-devtools/python/python3-pyparsing_3.0.5.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pyparsing.wikispaces.com/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1"
 
-SRC_URI[sha256sum] = "e0df773d7fa2240322daae7805626dfc5f2d5effb34e1a7be2702c99cfb9f6b1"
+SRC_URI[sha256sum] = "9329d1c1b51f0f76371c4ded42c5ec4cc0be18456b22193e0570c2da98ed288b"
 
 UPSTREAM_CHECK_REGEX = "pyparsing-(?P<pver>.*)\.tar"
 
-- 
2.20.1

[PATCH 17/24] vulkan-samples: update to latest revision

[Alexander Kanavin]

Mark as incompatible with 32 bit x86: there are several failures
and I do not think anyone is interested in vulkan on that platform.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index c1ffc7ecde..613ed592c6 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -11,12 +11,13 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;prot
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "d2187278cb6632ce35920575832eb6f6e2b2e46c"
+SRCREV = "ae6e4a3712cebde49a29e5996a3bd2f403566890"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = 'vulkan'
+COMPATIBLE_HOST:x86 = "null"
 
 inherit cmake features_check
 
-- 
2.20.1

[PATCH 18/24] gnu-config: update to latest revision

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index 794e39546c..6b025fce2c 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -9,8 +9,8 @@ DEPENDS:class-native = "hostperl-runtime-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-SRCREV = "805517123cbfe33d17c989a18e78c5789fab0437"
-PV = "20210722+git${SRCPV}"
+SRCREV = "191bcb948f7191c36eefe634336f5fc5c0c4c2be"
+PV = "20211108+git${SRCPV}"
 
 SRC_URI = "git://git.savannah.gnu.org/config.git;branch=master \
            file://gnu-configize.in"
-- 
2.20.1

[PATCH 19/24] libgpg-error: mark patch as non-upstreamable

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index ff15759309..6b9b623b54 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
@@ -3,7 +3,7 @@ From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 29 Mar 2018 15:12:17 +0800
 Subject: [PATCH] support pkgconfig
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [gnupg upstream will not take this, it has been tried with other components]
 
 Rebase to 1.28
 
-- 
2.20.1

[PATCH 20/24] valgrind: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../valgrind/valgrind/0004-Fix-out-of-tree-builds.patch         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
index 06b19b07c4..9a25b67961 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
@@ -12,7 +12,7 @@ RP 2013/03/23
 
 Patch refreshed for valgrind-3.14.0.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=445211]
 
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
-- 
2.20.1

[PATCH 21/24] meson: upgrade 0.59.2 -> 0.60.1

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/meson/meson.inc         |  2 +-
 ...-not-manipulate-the-environment-when.patch | 53 +++++++++----------
 .../meson/meson/disable-rpath-handling.patch  | 14 ++---
 .../{meson_0.59.2.bb => meson_0.60.1.bb}      |  0
 ...on_0.59.2.bb => nativesdk-meson_0.60.1.bb} |  0
 5 files changed, 33 insertions(+), 36 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.59.2.bb => meson_0.60.1.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.59.2.bb => nativesdk-meson_0.60.1.bb} (100%)

diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 174ebd9f31..f383ad9f74 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,7 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0002-Support-building-allarch-recipes-again.patch \
            file://0001-is_debianlike-always-return-False.patch \
            "
-SRC_URI[sha256sum] = "13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49"
+SRC_URI[sha256sum] = "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13"
 
 UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
index fdadc6869b..86abfa9d52 100644
--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
@@ -1,4 +1,4 @@
-From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00 2001
+From dd5b4a200cd2fdf7fef627c4b6752f90c00b863a Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 19 Nov 2018 14:24:26 +0100
 Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -8,36 +8,31 @@ Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 ---
- mesonbuild/modules/python.py | 12 ------------
- 1 file changed, 12 deletions(-)
+ mesonbuild/modules/python.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 422155b..aaf5844 100644
+index f479ab9..b934bc6 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
-                 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
-                 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
- 
--                os.environ.pop('PKG_CONFIG_PATH', None)
--
--                if pkg_libdir:
--                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
--
-                 try:
-                     self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
-                     mlog.debug(f'Found "{pkg_name}" via pkgconfig lookup in LIBPC ({pkg_libdir})')
-@@ -83,13 +78,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir})')
-                     mlog.debug(e)
- 
--                if old_pkg_path is not None:
--                    os.environ['PKG_CONFIG_PATH'] = old_pkg_path
--
--                if old_pkg_libdir is not None:
--                    os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir
--                else:
--                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
-             else:
-                 mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir}), this is likely due to a relocated python installation')
+@@ -239,10 +239,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
+         # If python-X.Y.pc exists in LIBPC, we will try to use it
+         def wrap_in_pythons_pc_dir(name: str, env: 'Environment', kwargs: T.Dict[str, T.Any],
+                                    installation: 'PythonInstallation') -> 'ExternalDependency':
+-            old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None)
+-            old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None)
+-            if pkg_libdir:
+-                os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
+             try:
+                 return PythonPkgConfigDependency(name, env, kwargs, installation)
+             finally:
+@@ -251,8 +247,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
+                         os.environ[name] = value
+                     elif name in os.environ:
+                         del os.environ[name]
+-                set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir)
+-                set_env('PKG_CONFIG_PATH', old_pkg_path)
++                pass
  
+         candidates.extend([
+             functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation),
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
index 7c766c61b0..7aaed8b4a3 100644
--- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
+++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
@@ -1,4 +1,4 @@
-From 27bbd3c9d8d86de545fcf6608564a14571c98a61 Mon Sep 17 00:00:00 2001
+From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Fri, 23 Nov 2018 15:28:28 +0000
 Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -10,26 +10,28 @@ is a specific directive to do something differently in the project.
 RP 2018/11/23
 
 Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
-
 ---
  mesonbuild/minstall.py | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index 212568a..06366d4 100644
+index 7d0da13..17d50db 100644
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -653,8 +653,11 @@ class Installer:
+@@ -718,8 +718,11 @@ class Installer:
              if file_copied:
                  self.did_install_something = True
                  try:
 -                    self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
--                                         install_name_mappings, verbose=False)
+-                                   install_name_mappings, verbose=False)
 +                    if install_rpath:
 +                        self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
-+                                           install_name_mappings, verbose=False)
++                                       install_name_mappings, verbose=False)
 +                    else:
 +                        print("RPATH changes at install time disabled")
                  except SystemExit as e:
                      if isinstance(e.code, int) and e.code == 0:
                          pass
+-- 
+2.20.1
+
diff --git a/meta/recipes-devtools/meson/meson_0.59.2.bb b/meta/recipes-devtools/meson/meson_0.60.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.59.2.bb
rename to meta/recipes-devtools/meson/meson_0.60.1.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.59.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.59.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
-- 
2.20.1

[PATCH 22/24] shared-mime-info: fix meson 0.60 builds

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...tom-itstool-to-builtin-msgfmt-for-cr.patch | 70 +++++++++++++++++++
 .../shared-mime-info/shared-mime-info_git.bb  |  4 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/shared-mime-info/files/0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch

diff --git a/meta/recipes-support/shared-mime-info/files/0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch b/meta/recipes-support/shared-mime-info/files/0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
new file mode 100644
index 0000000000..d09013bb3c
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/files/0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
@@ -0,0 +1,70 @@
+From 5ca815cb79f64fab9cbb428b95a861fc0c30c116 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Mon, 8 Nov 2021 18:22:47 -0500
+Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
+ translated XML
+
+gettext upstream has supported this for a very long time, and using it
+means we don't need to jump through hoops to run ninja inside ninja in
+order to generate the .mo files for itstool.
+
+Although meson 0.60.0 added support for real targets for the built .mo
+files, this changed the rules for output filenames, breaking the script.
+But msgfmt does not care, and anyways comes with builtin meson functions
+for convenient use.
+
+Fixes #170
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/162]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ data/freedesktop_generate.sh | 12 ------------
+ data/meson.build             | 16 +++++-----------
+ 2 files changed, 5 insertions(+), 23 deletions(-)
+ delete mode 100755 data/freedesktop_generate.sh
+
+diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
+deleted file mode 100755
+index ff13e75..0000000
+--- a/data/freedesktop_generate.sh
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#!/bin/sh -e
+-
+-src_root="$1"
+-build_root="$2"
+-
+-ninja -C "${build_root}" shared-mime-info-gmo
+-
+-itstool \
+-    --its "${src_root}/data/its/shared-mime-info.its" \
+-    --join "${src_root}/data/freedesktop.org.xml.in" \
+-    -o "${build_root}/data/freedesktop.org.xml" \
+-    "${build_root}/po/"*".gmo"
+diff --git a/data/meson.build b/data/meson.build
+index 263567d..c5696f2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,18 +1,12 @@
+ 
+ install_man('update-mime-database.1')
+ 
+-freedesktop_org_xml = custom_target('freedesktop.org.xml',
+-    input : files(
+-        'freedesktop.org.xml.in',
+-        'its/shared-mime-info.its',
+-        'its/shared-mime-info.loc',
+-    ),
++freedesktop_org_xml = i18n.merge_file(
++    input: 'freedesktop.org.xml.in',
+     output: 'freedesktop.org.xml',
+-    command: [
+-        find_program('freedesktop_generate.sh'),
+-        meson.source_root(),
+-        meson.build_root()
+-    ],
++    data_dirs: '.',
++    po_dir: '../po',
++    type: 'xml',
+     install: true,
+     install_dir: get_option('datadir') / 'mime' / 'packages',
+ )
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
index 2dca36a7df..69f147ebce 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native"
 
-SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master"
+SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master \
+           file://0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch \
+           "
 SRCREV = "18e558fa1c8b90b86757ade09a4ba4d6a6cf8f70"
 PV = "2.1"
 S = "${WORKDIR}/git"
-- 
2.20.1

[PATCH 23/24] webkitgtk: submit patches upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-FindGObjectIntrospection.cmake-prefix-variables-obta.patch | 2 +-
 .../webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch  | 2 +-
 .../0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch       | 2 +-
 ...1-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | 2 +-
 .../recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
index fae3b0b2e5..54d34b1c69 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
@@ -4,7 +4,7 @@ Date: Tue, 27 Oct 2015 16:02:19 +0200
 Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
  from pkg-config with PKG_CONFIG_SYSROOT_DIR
 
-Upstream-Status: Pending [review on oe-core list]
+Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232933]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  Source/cmake/FindGObjectIntrospection.cmake | 1 +
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch
index e4c7d77ccd..09256951f4 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch
@@ -16,7 +16,7 @@ Subject: [PATCH] Fix build without opengl-or-es
   but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was enabled only inside
   if (USE_OPENGL_OR_ES)
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232934]
 ---
  .../DrawingAreaProxyCoordinatedGraphics.cpp                 | 2 +-
  .../DrawingAreaProxyCoordinatedGraphics.h                   | 2 +-
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
index 0c31c5fa21..e06607ba2b 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 29 Aug 2016 16:38:11 +0300
 Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232935]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 ---
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
index 3e03aa968c..9e2bf09dd7 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
 g-ir-compiler is using a C compiler internally, so it needs to set
 the proper flags for it.
 
-Upstream-Status: Pending [review on oe-core list]
+Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232936]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 ---
diff --git a/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch b/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch
index aa11c131d2..907d36c4cd 100644
--- a/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch
@@ -3,7 +3,7 @@ From: Alberto Garcia <berto@igalia.com>
 Date: Sun, 25 Apr 2021 18:45:13 +0000
 Subject: [PATCH] Reduce memory usage when not using the Gold linker
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232938]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 ---
-- 
2.20.1

[PATCH 24/24] webkitgtk: remove unneeded patch

[Alexander Kanavin]

The file is already included just three lines below.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../webkit/webkitgtk/include_xutil.patch      | 34 -------------------
 meta/recipes-sato/webkit/webkitgtk_2.34.1.bb  |  1 -
 2 files changed, 35 deletions(-)
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/include_xutil.patch

diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
deleted file mode 100644
index e7a4cc25ad..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2cc9d445b4c8eb70c2ab6c1723dfd208218f103e Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 6 Nov 2020 04:38:13 +0100
-Subject: [PATCH] webkitgtk: fix build with x11 enabled
-
-Since
-https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4
-it uses XVisualInfo which is defined in Xutil.h
-
-Without this the build fails with:
-webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: 'XVisualInfo' was not declared in this scope; did you mean 'VisualID'?
-  132 |     XVisualInfo visualTemplate;
-      |     ^~~~~~~~~~~
-      |     VisualID
-
-Upstream-Status: Pending
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
- Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-index bad56eba..fc141f98 100644
---- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-@@ -31,6 +31,7 @@
- #if PLATFORM(X11)
- #include <X11/Xatom.h>
- #include <X11/Xlib.h>
-+#include <X11/Xutil.h>
- #include <X11/extensions/Xcomposite.h>
- #if PLATFORM(GTK)
- #include <X11/Xutil.h>
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb
index 4e2562df14..7a942e9cb5 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb
@@ -15,7 +15,6 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
            file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
            file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \
-           file://include_xutil.patch \
            file://reduce-memory-overheads.patch \
            file://musl-lower-stack-usage.patch \
            file://0001-Fix-build-without-opengl-or-es.patch \
-- 
2.20.1

Re: [PATCH 06/24] rust: update 1.56.0 -> 1.56.1

[Khem Raj]

On Wed, Nov 10, 2021 at 11:39 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> This update includes fixes for the 'trojan source' vulnerability:
> https://blog.rust-lang.org/2021/11/01/Rust-1.56.1.html
>
> Drop two unused patches.

this is fine, these patches are already upstreamed in rust compiler. I
think some portion of it is still required for rv32/musl
standard library but it will be a different patch. So its fine to delete them.

>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/conf/distro/include/tcmode-default.inc   |  2 +-
>  ...56.0.bb => cargo-cross-canadian_1.56.1.bb} |  0
>  .../{cargo_1.56.0.bb => cargo_1.56.1.bb}      |  0
>  .../rust/files/riscv-march.patch              | 73 -------------------
>  meta/recipes-devtools/rust/files/rv64gc.patch | 37 ----------
>  ...ibstd-rs_1.56.0.bb => libstd-rs_1.56.1.bb} |  0
>  ....56.0.bb => rust-cross-canadian_1.56.1.bb} |  0
>  ...t-cross_1.56.0.bb => rust-cross_1.56.1.bb} |  0
>  ...-llvm-allow-env-override-of-exe-path.patch |  1 +
>  ...ust-llvm_1.56.0.bb => rust-llvm_1.56.1.bb} |  0
>  meta/recipes-devtools/rust/rust-snapshot.inc  | 16 ++--
>  meta/recipes-devtools/rust/rust-source.inc    |  2 +-
>  ...bb => rust-tools-cross-canadian_1.56.1.bb} |  0
>  .../rust/{rust_1.56.0.bb => rust_1.56.1.bb}   |  0
>  14 files changed, 11 insertions(+), 120 deletions(-)
>  rename meta/recipes-devtools/cargo/{cargo-cross-canadian_1.56.0.bb => cargo-cross-canadian_1.56.1.bb} (100%)
>  rename meta/recipes-devtools/cargo/{cargo_1.56.0.bb => cargo_1.56.1.bb} (100%)
>  delete mode 100644 meta/recipes-devtools/rust/files/riscv-march.patch
>  delete mode 100644 meta/recipes-devtools/rust/files/rv64gc.patch
>  rename meta/recipes-devtools/rust/{libstd-rs_1.56.0.bb => libstd-rs_1.56.1.bb} (100%)
>  rename meta/recipes-devtools/rust/{rust-cross-canadian_1.56.0.bb => rust-cross-canadian_1.56.1.bb} (100%)
>  rename meta/recipes-devtools/rust/{rust-cross_1.56.0.bb => rust-cross_1.56.1.bb} (100%)
>  rename meta/recipes-devtools/rust/{rust-llvm_1.56.0.bb => rust-llvm_1.56.1.bb} (100%)
>  rename meta/recipes-devtools/rust/{rust-tools-cross-canadian_1.56.0.bb => rust-tools-cross-canadian_1.56.1.bb} (100%)
>  rename meta/recipes-devtools/rust/{rust_1.56.0.bb => rust_1.56.1.bb} (100%)
>
> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> index 609f2fd0eb..d5167ee9ad 100644
> --- a/meta/conf/distro/include/tcmode-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -27,7 +27,7 @@ GOVERSION ?= "1.16%"
>  # This can not use wildcards like 8.0.% since it is also used in mesa to denote
>  # llvm version being used, so always bump it with llvm recipe version bump
>  LLVMVERSION ?= "12.0.1"
> -RUSTVERSION ?= "1.56.0"
> +RUSTVERSION ?= "1.56.1"
>
>  PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
>  PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
> diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian_1.56.0.bb b/meta/recipes-devtools/cargo/cargo-cross-canadian_1.56.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/cargo/cargo-cross-canadian_1.56.0.bb
> rename to meta/recipes-devtools/cargo/cargo-cross-canadian_1.56.1.bb
> diff --git a/meta/recipes-devtools/cargo/cargo_1.56.0.bb b/meta/recipes-devtools/cargo/cargo_1.56.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/cargo/cargo_1.56.0.bb
> rename to meta/recipes-devtools/cargo/cargo_1.56.1.bb
> diff --git a/meta/recipes-devtools/rust/files/riscv-march.patch b/meta/recipes-devtools/rust/files/riscv-march.patch
> deleted file mode 100644
> index a10b3a4d93..0000000000
> --- a/meta/recipes-devtools/rust/files/riscv-march.patch
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -Add suppor for riscv64 and riscv32 musl targets
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> ---- a/vendor/cc/src/lib.rs
> -+++ b/vendor/cc/src/lib.rs
> -@@ -2361,6 +2361,7 @@ impl Build {
> -                 "riscv-none-embed",
> -             ]),
> -             "riscv64gc-unknown-linux-gnu" => Some("riscv64-linux-gnu"),
> -+            "riscv64gc-unknown-linux-musl" => Some("riscv64-linux-musl"),
> -             "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"),
> -             "sparc-unknown-linux-gnu" => Some("sparc-linux-gnu"),
> -             "sparc64-unknown-linux-gnu" => Some("sparc64-linux-gnu"),
> ---- a/compiler/rustc_target/src/spec/mod.rs
> -+++ b/compiler/rustc_target/src/spec/mod.rs
> -@@ -641,9 +641,11 @@ supported_targets! {
> -     ("riscv32imc-unknown-none-elf", riscv32imc_unknown_none_elf),
> -     ("riscv32imac-unknown-none-elf", riscv32imac_unknown_none_elf),
> -     ("riscv32gc-unknown-linux-gnu", riscv32gc_unknown_linux_gnu),
> -+    ("riscv32gc-unknown-linux-musl", riscv32gc_unknown_linux_musl),
> -     ("riscv64imac-unknown-none-elf", riscv64imac_unknown_none_elf),
> -     ("riscv64gc-unknown-none-elf", riscv64gc_unknown_none_elf),
> -     ("riscv64gc-unknown-linux-gnu", riscv64gc_unknown_linux_gnu),
> -+    ("riscv64gc-unknown-linux-musl", riscv64gc_unknown_linux_musl),
> -
> -     ("aarch64-unknown-none", aarch64_unknown_none),
> -     ("aarch64-unknown-none-softfloat", aarch64_unknown_none_softfloat),
> ---- /dev/null
> -+++ b/compiler/rustc_target/src/spec/riscv32gc_unknown_linux_musl.rs
> -@@ -0,0 +1,19 @@
> -+use crate::spec::{CodeModel, Target, TargetOptions};
> -+
> -+pub fn target() -> Target {
> -+    Target {
> -+        llvm_target: "riscv32-unknown-linux-musl".to_string(),
> -+        pointer_width: 32,
> -+        data_layout: "e-m:e-p:32:32-i64:64-n32-S128".to_string(),
> -+        arch: "riscv32".to_string(),
> -+        options: TargetOptions {
> -+            unsupported_abis: super::riscv_base::unsupported_abis(),
> -+            code_model: Some(CodeModel::Medium),
> -+            cpu: "generic-rv32".to_string(),
> -+            features: "+m,+a,+f,+d,+c".to_string(),
> -+            llvm_abiname: "ilp32d".to_string(),
> -+            max_atomic_width: Some(32),
> -+            ..super::linux_musl_base::opts()
> -+        },
> -+    }
> -+}
> ---- /dev/null
> -+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
> -@@ -0,0 +1,19 @@
> -+use crate::spec::{CodeModel, Target, TargetOptions};
> -+
> -+pub fn target() -> Target {
> -+    Target {
> -+        llvm_target: "riscv64-unknown-linux-musl".to_string(),
> -+        pointer_width: 64,
> -+        data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".to_string(),
> -+        arch: "riscv64".to_string(),
> -+        options: TargetOptions {
> -+            unsupported_abis: super::riscv_base::unsupported_abis(),
> -+            code_model: Some(CodeModel::Medium),
> -+            cpu: "generic-rv64".to_string(),
> -+            features: "+m,+a,+f,+d,+c".to_string(),
> -+            llvm_abiname: "lp64d".to_string(),
> -+            max_atomic_width: Some(64),
> -+            ..super::linux_musl_base::opts()
> -+        },
> -+    }
> -+}
> diff --git a/meta/recipes-devtools/rust/files/rv64gc.patch b/meta/recipes-devtools/rust/files/rv64gc.patch
> deleted file mode 100644
> index aab1e18453..0000000000
> --- a/meta/recipes-devtools/rust/files/rv64gc.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> ---- a/vendor/cc-1.0.60/.cargo-checksum.json
> -+++ b/vendor/cc-1.0.60/.cargo-checksum.json
> -@@ -1 +1 @@
> --{"files":{"Cargo.lock":"30b9e23f97015aea3eed3e17c6d76d565c2924efec8bdae64c899080847afe89","Cargo.toml":"f6f22b69df3df57c58373cdee72b22218ffa030bc375b36632660037dd72c866","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"51405d284d2e0620db62c655c652fc0ec84f20c1cb30529227355c9575a9e6dd","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"903c5f2f5dd0cc7d04f99f605a95e6abde8b38156fd4e73eefc58493f55a4e5a","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"52afe8554f577c87841c48ddee3ba7ffe70a00129e1d6eeb2ec0efb3d2b9aa11","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"16274867f23871e9b07614eda4c7344da13d1751fed63d4f633857e40be86394","tests/test.rs":"65c073e0e2cf4aa0433066102788e9f57442719e6f32f5ad5248aa7132bb4597"},"package":"ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"}
> -\ No newline at end of file
> -+{"files":{"Cargo.lock":"30b9e23f97015aea3eed3e17c6d76d565c2924efec8bdae64c899080847afe89","Cargo.toml":"f6f22b69df3df57c58373cdee72b22218ffa030bc375b36632660037dd72c866","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"51405d284d2e0620db62c655c652fc0ec84f20c1cb30529227355c9575a9e6dd","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"2788af2bdf425f267b33bc524f3e627851b52422e38f480a7e39eb834264fd73","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"52afe8554f577c87841c48ddee3ba7ffe70a00129e1d6eeb2ec0efb3d2b9aa11","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"16274867f23871e9b07614eda4c7344da13d1751fed63d4f633857e40be86394","tests/test.rs":"65c073e0e2cf4aa0433066102788e9f57442719e6f32f5ad5248aa7132bb4597"},"package":"ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"}
> ---- a/vendor/cc-1.0.60/src/lib.rs
> -+++ b/vendor/cc-1.0.60/src/lib.rs
> -@@ -1639,14 +1639,17 @@ impl Build {
> -                     let mut parts = target.split('-');
> -                     if let Some(arch) = parts.next() {
> -                         let arch = &arch[5..];
> --                        cmd.args.push(("-march=rv".to_owned() + arch).into());
> -                         if target.contains("linux") && arch.starts_with("64") {
> -+                            cmd.args.push(("-march=rv64gc").into());
> -                             cmd.args.push("-mabi=lp64d".into());
> -                         } else if target.contains("linux") && arch.starts_with("32") {
> -+                            cmd.args.push(("-march=rv32gc").into());
> -                             cmd.args.push("-mabi=ilp32d".into());
> -                         } else if arch.starts_with("64") {
> -+                            cmd.args.push(("-march=rv".to_owned() + arch).into());
> -                             cmd.args.push("-mabi=lp64".into());
> -                         } else {
> -+                            cmd.args.push(("-march=rv".to_owned() + arch).into());
> -                             cmd.args.push("-mabi=ilp32".into());
> -                         }
> -                         cmd.args.push("-mcmodel=medany".into());
> -@@ -2332,6 +2335,9 @@ impl Build {
> -                 "riscv-none-embed",
> -             ]),
> -             "riscv64gc-unknown-linux-gnu" => Some("riscv64-linux-gnu"),
> -+            "riscv32gc-unknown-linux-gnu" => Some("riscv32-linux-gnu"),
> -+            "riscv64gc-unknown-linux-musl" => Some("riscv64-linux-musl"),
> -+            "riscv32gc-unknown-linux-musl" => Some("riscv32-linux-musl"),
> -             "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"),
> -             "sparc-unknown-linux-gnu" => Some("sparc-linux-gnu"),
> -             "sparc64-unknown-linux-gnu" => Some("sparc64-linux-gnu"),
> diff --git a/meta/recipes-devtools/rust/libstd-rs_1.56.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.56.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/rust/libstd-rs_1.56.0.bb
> rename to meta/recipes-devtools/rust/libstd-rs_1.56.1.bb
> diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.56.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.56.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/rust/rust-cross-canadian_1.56.0.bb
> rename to meta/recipes-devtools/rust/rust-cross-canadian_1.56.1.bb
> diff --git a/meta/recipes-devtools/rust/rust-cross_1.56.0.bb b/meta/recipes-devtools/rust/rust-cross_1.56.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/rust/rust-cross_1.56.0.bb
> rename to meta/recipes-devtools/rust/rust-cross_1.56.1.bb
> diff --git a/meta/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch b/meta/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch
> index 943c2118bb..9be26677a9 100644
> --- a/meta/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch
> +++ b/meta/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch
> @@ -8,6 +8,7 @@ return the libraries, include directories, etc. from inside the sysroot rather
>  than from the native sysroot. Thus provide an env override for calling
>  llvm-config from a target sysroot.
>
> +Upstream-Status: Inappropriate [oe-core specific]
>  Signed-off-by: Martin Kelly <mkelly@xevo.com>
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>  ---
> diff --git a/meta/recipes-devtools/rust/rust-llvm_1.56.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.56.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/rust/rust-llvm_1.56.0.bb
> rename to meta/recipes-devtools/rust/rust-llvm_1.56.1.bb
> diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc
> index 18e98d70a0..3418a2e0ba 100644
> --- a/meta/recipes-devtools/rust/rust-snapshot.inc
> +++ b/meta/recipes-devtools/rust/rust-snapshot.inc
> @@ -2,17 +2,17 @@
>  ## snapshot info is taken from rust/src/stage0.txt
>  ## TODO: find a way to add additional SRC_URIs based on the contents of an
>  ##       earlier SRC_URI.
> -RS_VERSION = "1.56.0"
> -CARGO_VERSION = "1.56.0"
> +RS_VERSION = "1.56.1"
> +CARGO_VERSION = "1.56.1"
>
>  # TODO: Add hashes for other architecture toolchains as well. Make a script?
> -SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "f693e4f41a959d62528e0043b0b010c4815fb9f5887267ae34ff8b860f8ec4ae"
> -SRC_URI[rustc-snapshot-x86_64.sha256sum] = "2a5f919e2036496c02ab4707a5eb8bd8a4ce6ea589e01cb39f25d213a26dcdfe"
> -SRC_URI[cargo-snapshot-x86_64.sha256sum] = "f972125810d2db7df2e0af56d9f6a3dcdacc52d983bdf0ca17309b45fc44209b"
> +SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "b01011cbb5503c456ecc6a557a38e099994b8497df545c661ce8fd48c5beadc6"
> +SRC_URI[rustc-snapshot-x86_64.sha256sum] = "a7001d1218b62d377cab15522d1b1c376b073c05f7d0ff32cf278871a5eeda3d"
> +SRC_URI[cargo-snapshot-x86_64.sha256sum] = "dfed65a50e2b58b6807c1fb6f8afa7abd5c3b22c682d505721d615823687c708"
>
> -SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "3cd1c69c618e5efaf578a156c2a950c93964f9b47ba4d705d5700bdc64880231"
> -SRC_URI[rustc-snapshot-aarch64.sha256sum] = "0d2491a59f697d2ea52fc429b8d4665acb5f79b0e16703f3604b61b8aa68d1c4"
> -SRC_URI[cargo-snapshot-aarch64.sha256sum] = "9d97cd655845572846c058577f68ea74b6111f8ea7649db308f786475f764a09"
> +SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "a83416d15354e4dfa1c1e4a756282c6be7169679f2b04eca82ed34e2116b93f0"
> +SRC_URI[rustc-snapshot-aarch64.sha256sum] = "77aec6a8c5f3d33941c79a48cda3bb08878c23dd1947dc027dfe5c4da41305b3"
> +SRC_URI[cargo-snapshot-aarch64.sha256sum] = "3d263eb1871b5d6ca4b198b9611925923e9353e1f5c2becf8c7b784298e88743"
>
>  SRC_URI += " \
>      https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
> diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc
> index 326a592544..e197604716 100644
> --- a/meta/recipes-devtools/rust/rust-source.inc
> +++ b/meta/recipes-devtools/rust/rust-source.inc
> @@ -1,5 +1,5 @@
>  SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
> -SRC_URI[rust.sha256sum] = "f13468889833c88e744ad579c5d8fbb7ecb53216159b54481a90e5dcdaa9e320"
> +SRC_URI[rust.sha256sum] = "61fdcc8bc2530ee18f91318347e09b7cc07e9ca04b1c627c135ecc8dcb8f2ac5"
>
>  RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
>
> diff --git a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.56.0.bb b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.56.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/rust/rust-tools-cross-canadian_1.56.0.bb
> rename to meta/recipes-devtools/rust/rust-tools-cross-canadian_1.56.1.bb
> diff --git a/meta/recipes-devtools/rust/rust_1.56.0.bb b/meta/recipes-devtools/rust/rust_1.56.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/rust/rust_1.56.0.bb
> rename to meta/recipes-devtools/rust/rust_1.56.1.bb
> --
> 2.20.1
>

Re: [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1

[Khem Raj]

lgtm

On Wed, Nov 10, 2021 at 11:39 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> libxcvt is a new dependency (thanks Oleksandr!).
>
> Include ${libdir}/xorg/modules/input/*.so into the main
> package (if for someone separate packaging matters, please
> investigate what they do).
>
> Remove options no longer present upstream.
>
> Remove patches available upstream; drop a chunk as well.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../xorg-xserver/xserver-xorg.inc             |  7 +--
>  ...-duplicate-definitions-of-IOPortBase.patch | 24 ++-------
>  ...probing-a-non-PCI-platform-device-on.patch | 34 -------------
>  ...t-xtest-Initialize-array-with-braces.patch | 36 -------------
>  .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -------------
>  .../xserver-xorg/sdksyms-no-build-path.patch  | 50 -------------------
>  ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} |  6 +--
>  7 files changed, 7 insertions(+), 184 deletions(-)
>  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
>  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
>  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
>  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
>  rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} (77%)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index e1fc0a06dc..6a5f274046 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -28,7 +28,7 @@ inherit autotools pkgconfig
>  inherit features_check
>  REQUIRED_DISTRO_FEATURES = "x11"
>
> -LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
> +LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess libxcvt"
>  DEPENDS = "xorgproto ${LIB_DEPS} font-util"
>
>  # Split out some modules and extensions from the main package
> @@ -78,7 +78,7 @@ RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
>  RDEPENDS:${PN}-xvfb += "xkeyboard-config"
>  RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
>
> -FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
> +FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/input/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
>  FILES:${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
>  FILES:${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
>  FILES:${PN}-sdl = "${bindir}/Xsdl"
> @@ -109,7 +109,6 @@ EXTRA_OECONF += "--with-fop=no \
>                   --with-pic \
>                   --disable-static \
>                   --disable-record \
> -                 --disable-dmx \
>                   --disable-xnest \
>                   --enable-xvfb \
>                   --enable-composite \
> @@ -118,7 +117,6 @@ EXTRA_OECONF += "--with-fop=no \
>                   --sysconfdir=/etc/X11 \
>                   --localstatedir=/var \
>                   --with-xkb-output=/var/lib/xkb \
> -                 --with-os-name=Linux \
>  "
>
>  OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
> @@ -141,7 +139,6 @@ PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-
>  PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
>  PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
>  PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
> -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
>
>  # Xorg requires a SHA1 implementation, pick one
>  XORG_CRYPTO ??= "openssl"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
> index 4737040675..11d5546537 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
> @@ -1,4 +1,4 @@
> -From fc04acfd948ac99d04a5dc08c78f3b13bc0c5c41 Mon Sep 17 00:00:00 2001
> +From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Mon, 17 Aug 2020 10:50:51 -0700
>  Subject: [PATCH] Avoid duplicate definitions of IOPortBase
> @@ -10,26 +10,13 @@ compiler.h:528: multiple definition of `IOPortBase';
>
>  Upstream-Status: Pending
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
>  ---
> - hw/xfree86/common/compiler.h            | 2 +-
>   hw/xfree86/os-support/linux/lnx_video.c | 1 +
> - 2 files changed, 2 insertions(+), 1 deletion(-)
> + 1 file changed, 1 insertion(+)
>
> -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
> -index 2b2008b..c7d617e 100644
> ---- a/hw/xfree86/common/compiler.h
> -+++ b/hw/xfree86/common/compiler.h
> -@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
> - #define PORT_SIZE short
> - #endif
> -
> --_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
> -+extern _X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
> -
> - static __inline__ void
> - outb(unsigned PORT_SIZE port, unsigned char val)
>  diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
> -index 04e4509..9dc7316 100644
> +index fd83022..1d0d96e 100644
>  --- a/hw/xfree86/os-support/linux/lnx_video.c
>  +++ b/hw/xfree86/os-support/linux/lnx_video.c
>  @@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
> @@ -40,6 +27,3 @@ index 04e4509..9dc7316 100644
>
>   #if defined(__powerpc__)
>   volatile unsigned char *ioBase = NULL;
> ---
> -2.28.0
> -
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
> deleted file mode 100644
> index 8b687d612d..0000000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001
> -From: Eric Anholt <eric@anholt.net>
> -Date: Fri, 26 Oct 2018 17:47:30 -0700
> -Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system
> - with PCI.
> -
> -Some Broadcom set-top-box boards have PCI busses, but the GPU is still
> -probed through DT.  We would dereference a null busid here in that
> -case.
> -
> -Signed-off-by: Eric Anholt <eric@anholt.net>
> -
> -Upstream-Status: Backport [https://github.com/freedesktop/xorg-xserver/commit/e50c85f4e]
> -Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
> ----
> - hw/xfree86/common/xf86platformBus.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
> -index cef47da03..dadbac6c8 100644
> ---- a/hw/xfree86/common/xf86platformBus.c
> -+++ b/hw/xfree86/common/xf86platformBus.c
> -@@ -289,7 +289,7 @@ xf86platformProbe(void)
> -     for (i = 0; i < xf86_num_platform_devices; i++) {
> -         char *busid = xf86_platform_odev_attributes(i)->busid;
> -
> --        if (pci && (strncmp(busid, "pci:", 4) == 0)) {
> -+        if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
> -             platform_find_pci_info(&xf86_platform_devices[i], busid);
> -         }
> -
> ---
> -2.28.0
> -
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
> deleted file mode 100644
> index c0c242814b..0000000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 1 Mar 2019 09:47:57 -0800
> -Subject: [PATCH] test/xtest: Initialize array with braces
> -
> -Fixes an error when extra warnings are enabled, this is caught with clang
> -
> -test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
> -    WindowRec root = {0};
> -                      ^
> -                      {}
> -1 error generated.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - test/xtest.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/test/xtest.c b/test/xtest.c
> -index fc5e433..d7e6620 100644
> ---- a/test/xtest.c
> -+++ b/test/xtest.c
> -@@ -61,7 +61,7 @@ xtest_init_devices(void)
> - {
> -     ScreenRec screen = {0};
> -     ClientRec server_client = {0};
> --    WindowRec root = {0};
> -+    WindowRec root = {{0}};
> -     WindowOptRec optional = {0};
> -
> -     /* random stuff that needs initialization */
> ---
> -2.21.0
> -
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
> deleted file mode 100644
> index 2ef9fa9fe4..0000000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
> -From: Ross Burton <ross.burton@intel.com>
> -Date: Thu, 20 Sep 2018 20:12:24 +0100
> -Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
> -
> -Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
> -simply get all of the CFLAGS.  Aside from completeness, this helps builds in
> -sysroots as pkg-config knows what to do with --cflags but doesn't remap
> -arbitrary variables.
> -
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> ----
> - xorg-server.m4 | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/xorg-server.m4 b/xorg-server.m4
> -index 18255b91a..195bda5d8 100644
> ---- a/xorg-server.m4
> -+++ b/xorg-server.m4
> -@@ -31,7 +31,7 @@ dnl
> - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
> -       AC_REQUIRE([PKG_PROG_PKG_CONFIG])
> -       SAVE_CFLAGS="$CFLAGS"
> --      CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
> -+      CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
> -       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
> - #include "xorg-server.h"
> - #if !defined $1
> ---
> -2.11.0
> -
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
> deleted file mode 100644
> index be198ece49..0000000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
> -From: Ross Burton <ross.burton@intel.com>
> -Date: Thu, 1 Aug 2019 15:24:51 +0100
> -Subject: [PATCH] sdksyms.sh: don't embed the build path
> -
> -This script generates a header that has a comment containing the build path for
> -no real reason.  As this source can end up deployed on targets in debug packages
> -this means there is both potentially sensitive information leakage about the
> -build environment, and a source of change for reproducible builds.
> ----
> - hw/xfree86/sdksyms.sh | 7 +++++--
> - 1 file changed, 5 insertions(+), 2 deletions(-)
> -
> -diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
> -index 39e33711d..bdf47a71a 100755
> ---- a/hw/xfree86/sdksyms.sh
> -+++ b/hw/xfree86/sdksyms.sh
> -@@ -302,13 +302,16 @@ LC_ALL=C
> - export LC_ALL
> - ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
> - ${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
> -+function basename(file) {
> -+    sub(".*/", "", file)
> -+    return file
> -+}
> - BEGIN {
> -     sdk = 0;
> -     print("/*");
> -     print(" * These symbols are referenced to ensure they");
> -     print(" * will be available in the X Server binary.");
> -     print(" */");
> --    printf("/* topdir=%s */\n", topdir);
> -     print("_X_HIDDEN void *xorg_symbols[] = {");
> -
> -     printf("sdksyms.c:") > "sdksyms.dep";
> -@@ -337,7 +340,7 @@ BEGIN {
> -       # remove quotes
> -       gsub(/"/, "", $3);
> -       line = $2;
> --      header = $3;
> -+      header = basename($3);
> -       if (! headers[$3]) {
> -           printf(" \\\n  %s", $3) >> "sdksyms.dep";
> -           headers[$3] = 1;
> ---
> -2.20.1
> -
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.13.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
> similarity index 77%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.13.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
> index 01a54070c7..5793e078ee 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.13.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
> @@ -1,14 +1,10 @@
>  require xserver-xorg.inc
>
>  SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
> -           file://pkgconfig.patch \
> -           file://0001-test-xtest-Initialize-array-with-braces.patch \
> -           file://sdksyms-no-build-path.patch \
>             file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
>             file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
> -           file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \
>             "
> -SRC_URI[sha256sum] = "40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300"
> +SRC_URI[sha256sum] = "782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755"
>
>  # These extensions are now integrated into the server, so declare the migration
>  # path for in-place upgrades.
> --
> 2.20.1
>

Re: [OE-core] [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1

[Richard Purdie]

On Wed, 2021-11-10 at 20:39 +0100, Alexander Kanavin wrote:
> libxcvt is a new dependency (thanks Oleksandr!).
> 
> Include ${libdir}/xorg/modules/input/*.so into the main
> package (if for someone separate packaging matters, please
> investigate what they do).
> 
> Remove options no longer present upstream.
> 
> Remove patches available upstream; drop a chunk as well.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../xorg-xserver/xserver-xorg.inc             |  7 +--
>  ...-duplicate-definitions-of-IOPortBase.patch | 24 ++-------
>  ...probing-a-non-PCI-platform-device-on.patch | 34 -------------
>  ...t-xtest-Initialize-array-with-braces.patch | 36 -------------
>  .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -------------
>  .../xserver-xorg/sdksyms-no-build-path.patch  | 50 -------------------
>  ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} |  6 +--
>  7 files changed, 7 insertions(+), 184 deletions(-)
>  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
>  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
>  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
>  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
>  rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} (77%)
> 

I think there is some dependency issue:

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4349

but I'm wondering why this only showed up on this rebuild and not previously
too...

Cheers,

Richard

Re: [OE-core] [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1

[Richard Purdie]

On Thu, 2021-11-11 at 10:26 +0000, Richard Purdie via lists.openembedded.org
wrote:
> On Wed, 2021-11-10 at 20:39 +0100, Alexander Kanavin wrote:
> > libxcvt is a new dependency (thanks Oleksandr!).
> > 
> > Include ${libdir}/xorg/modules/input/*.so into the main
> > package (if for someone separate packaging matters, please
> > investigate what they do).
> > 
> > Remove options no longer present upstream.
> > 
> > Remove patches available upstream; drop a chunk as well.
> > 
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  .../xorg-xserver/xserver-xorg.inc             |  7 +--
> >  ...-duplicate-definitions-of-IOPortBase.patch | 24 ++-------
> >  ...probing-a-non-PCI-platform-device-on.patch | 34 -------------
> >  ...t-xtest-Initialize-array-with-braces.patch | 36 -------------
> >  .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -------------
> >  .../xserver-xorg/sdksyms-no-build-path.patch  | 50 -------------------
> >  ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} |  6 +--
> >  7 files changed, 7 insertions(+), 184 deletions(-)
> >  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
> >  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
> >  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
> >  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
> >  rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} (77%)
> > 
> 
> I think there is some dependency issue:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4349
> 
> but I'm wondering why this only showed up on this rebuild and not previously
> too...

Sorry, it did and the buildbot UI let me miss it, it also failed here:

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4344

Cheers,

Richard

Re: [OE-core] [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 2222 bytes --]

Patch already sent ;)

Alex

On Thu, 11 Nov 2021 at 11:27, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Thu, 2021-11-11 at 10:26 +0000, Richard Purdie via
> lists.openembedded.org
> wrote:
> > On Wed, 2021-11-10 at 20:39 +0100, Alexander Kanavin wrote:
> > > libxcvt is a new dependency (thanks Oleksandr!).
> > >
> > > Include ${libdir}/xorg/modules/input/*.so into the main
> > > package (if for someone separate packaging matters, please
> > > investigate what they do).
> > >
> > > Remove options no longer present upstream.
> > >
> > > Remove patches available upstream; drop a chunk as well.
> > >
> > > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > > ---
> > >  .../xorg-xserver/xserver-xorg.inc             |  7 +--
> > >  ...-duplicate-definitions-of-IOPortBase.patch | 24 ++-------
> > >  ...probing-a-non-PCI-platform-device-on.patch | 34 -------------
> > >  ...t-xtest-Initialize-array-with-braces.patch | 36 -------------
> > >  .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -------------
> > >  .../xserver-xorg/sdksyms-no-build-path.patch  | 50 -------------------
> > >  ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} |  6 +--
> > >  7 files changed, 7 insertions(+), 184 deletions(-)
> > >  delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
> > >  delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
> > >  delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
> > >  delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
> > >  rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb
> => xserver-xorg_21.1.1.bb} (77%)
> > >
> >
> > I think there is some dependency issue:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4349
> >
> > but I'm wondering why this only showed up on this rebuild and not
> previously
> > too...
>
> Sorry, it did and the buildbot UI let me miss it, it also failed here:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4344
>
> Cheers,
>
> Richard
>
>
>

[-- Attachment #2: Type: text/html, Size: 3580 bytes --]

Re: [OE-core] [PATCH 21/24] meson: upgrade 0.59.2 -> 0.60.1

[Khem Raj]

seeing a bunch of packages fail common error seems to be

meson.build:1:0: ERROR: Unknown options: "introspection"

list is here

https://errors.yoctoproject.org/Errors/Build/135855/

On Wed, Nov 10, 2021 at 11:40 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> From: Alexander Kanavin <alex.kanavin@gmail.com>
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/recipes-devtools/meson/meson.inc         |  2 +-
>  ...-not-manipulate-the-environment-when.patch | 53 +++++++++----------
>  .../meson/meson/disable-rpath-handling.patch  | 14 ++---
>  .../{meson_0.59.2.bb => meson_0.60.1.bb}      |  0
>  ...on_0.59.2.bb => nativesdk-meson_0.60.1.bb} |  0
>  5 files changed, 33 insertions(+), 36 deletions(-)
>  rename meta/recipes-devtools/meson/{meson_0.59.2.bb => meson_0.60.1.bb} (100%)
>  rename meta/recipes-devtools/meson/{nativesdk-meson_0.59.2.bb => nativesdk-meson_0.60.1.bb} (100%)
>
> diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
> index 174ebd9f31..f383ad9f74 100644
> --- a/meta/recipes-devtools/meson/meson.inc
> +++ b/meta/recipes-devtools/meson/meson.inc
> @@ -15,7 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
>             file://0002-Support-building-allarch-recipes-again.patch \
>             file://0001-is_debianlike-always-return-False.patch \
>             "
> -SRC_URI[sha256sum] = "13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49"
> +SRC_URI[sha256sum] = "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13"
>
>  UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
>  UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
> diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> index fdadc6869b..86abfa9d52 100644
> --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> @@ -1,4 +1,4 @@
> -From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00 2001
> +From dd5b4a200cd2fdf7fef627c4b6752f90c00b863a Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Mon, 19 Nov 2018 14:24:26 +0100
>  Subject: [PATCH] python module: do not manipulate the environment when calling
> @@ -8,36 +8,31 @@ Upstream-Status: Inappropriate [oe-core specific]
>  Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>
>  ---
> - mesonbuild/modules/python.py | 12 ------------
> - 1 file changed, 12 deletions(-)
> + mesonbuild/modules/python.py | 7 +------
> + 1 file changed, 1 insertion(+), 6 deletions(-)
>
>  diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
> -index 422155b..aaf5844 100644
> +index f479ab9..b934bc6 100644
>  --- a/mesonbuild/modules/python.py
>  +++ b/mesonbuild/modules/python.py
> -@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
> -                 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
> -                 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
> -
> --                os.environ.pop('PKG_CONFIG_PATH', None)
> --
> --                if pkg_libdir:
> --                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
> --
> -                 try:
> -                     self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
> -                     mlog.debug(f'Found "{pkg_name}" via pkgconfig lookup in LIBPC ({pkg_libdir})')
> -@@ -83,13 +78,6 @@ class PythonDependency(ExternalDependency):
> -                     mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir})')
> -                     mlog.debug(e)
> -
> --                if old_pkg_path is not None:
> --                    os.environ['PKG_CONFIG_PATH'] = old_pkg_path
> --
> --                if old_pkg_libdir is not None:
> --                    os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir
> --                else:
> --                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
> -             else:
> -                 mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir}), this is likely due to a relocated python installation')
> +@@ -239,10 +239,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
> +         # If python-X.Y.pc exists in LIBPC, we will try to use it
> +         def wrap_in_pythons_pc_dir(name: str, env: 'Environment', kwargs: T.Dict[str, T.Any],
> +                                    installation: 'PythonInstallation') -> 'ExternalDependency':
> +-            old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None)
> +-            old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None)
> +-            if pkg_libdir:
> +-                os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
> +             try:
> +                 return PythonPkgConfigDependency(name, env, kwargs, installation)
> +             finally:
> +@@ -251,8 +247,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
> +                         os.environ[name] = value
> +                     elif name in os.environ:
> +                         del os.environ[name]
> +-                set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir)
> +-                set_env('PKG_CONFIG_PATH', old_pkg_path)
> ++                pass
>
> +         candidates.extend([
> +             functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation),
> diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
> index 7c766c61b0..7aaed8b4a3 100644
> --- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
> +++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
> @@ -1,4 +1,4 @@
> -From 27bbd3c9d8d86de545fcf6608564a14571c98a61 Mon Sep 17 00:00:00 2001
> +From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 Mon Sep 17 00:00:00 2001
>  From: Richard Purdie <richard.purdie@linuxfoundation.org>
>  Date: Fri, 23 Nov 2018 15:28:28 +0000
>  Subject: [PATCH] meson: Disable rpath stripping at install time
> @@ -10,26 +10,28 @@ is a specific directive to do something differently in the project.
>  RP 2018/11/23
>
>  Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
> -
>  ---
>   mesonbuild/minstall.py | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
>  diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
> -index 212568a..06366d4 100644
> +index 7d0da13..17d50db 100644
>  --- a/mesonbuild/minstall.py
>  +++ b/mesonbuild/minstall.py
> -@@ -653,8 +653,11 @@ class Installer:
> +@@ -718,8 +718,11 @@ class Installer:
>               if file_copied:
>                   self.did_install_something = True
>                   try:
>  -                    self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
> --                                         install_name_mappings, verbose=False)
> +-                                   install_name_mappings, verbose=False)
>  +                    if install_rpath:
>  +                        self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
> -+                                           install_name_mappings, verbose=False)
> ++                                       install_name_mappings, verbose=False)
>  +                    else:
>  +                        print("RPATH changes at install time disabled")
>                   except SystemExit as e:
>                       if isinstance(e.code, int) and e.code == 0:
>                           pass
> +--
> +2.20.1
> +
> diff --git a/meta/recipes-devtools/meson/meson_0.59.2.bb b/meta/recipes-devtools/meson/meson_0.60.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/meson_0.59.2.bb
> rename to meta/recipes-devtools/meson/meson_0.60.1.bb
> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.59.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/nativesdk-meson_0.59.2.bb
> rename to meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
> --
> 2.20.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158105): https://lists.openembedded.org/g/openembedded-core/message/158105
> Mute This Topic: https://lists.openembedded.org/mt/86965718/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [PATCH 05/24] xserver-xorg: convert from autotools to meson

[Zoltan Boszormenyi]

2021. 11. 10. 20:39 keltezéssel, Alexander Kanavin írta:
> Not every option was carried over, drop them accordingly.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   .../xorg-xserver/xserver-xorg.inc             | 55 ++++++++-----------
>   1 file changed, 22 insertions(+), 33 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 6a5f274046..4a7048aced 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -23,7 +23,7 @@ CVE_PRODUCT = "xorg-server"
>   
>   S = "${WORKDIR}/${XORG_PN}-${PV}"
>   
> -inherit autotools pkgconfig
> +inherit meson pkgconfig
>   
>   inherit features_check
>   REQUIRED_DISTRO_FEATURES = "x11"
> @@ -105,50 +105,39 @@ FILES:${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
>   FILES:${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
>   FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so"
>   
> -EXTRA_OECONF += "--with-fop=no \
> -                 --with-pic \
> -                 --disable-static \
> -                 --disable-record \
> -                 --disable-xnest \
> -                 --enable-xvfb \
> -                 --enable-composite \
> -                 --without-dtrace \
> -                 --with-int10=x86emu \
> -                 --sysconfdir=/etc/X11 \
> -                 --localstatedir=/var \
> -                 --with-xkb-output=/var/lib/xkb \
> +EXTRA_OEMESON += " \
> +                 -Dxnest=false \
> +                 -Dxvfb=true \
> +                 -Ddtrace=false \
> +                 -Dint10=x86emu \
> +                 -Dxkb_output_dir=/var/lib/xkb \
>   "
>   
> -OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
> +OPENGL_PKGCONFIGS = "dri glx glamor dri3"
>   PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \
>                      ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
> -                   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \
> +                   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-logind', '', d)} \
>   "
>   
> -PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
> -PACKAGECONFIG[dga] = "--enable-dga,--disable-dga"
> -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa"
> -PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2"
> -# DRI3 requires xshmfence to also be enabled
> -PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3"
> -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11"
> -PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl"
> -PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
> -PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
> -PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
> -PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
> -PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
> -PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
> +PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev"
> +PACKAGECONFIG[dga] = "-Ddga=true,-Ddga=false"
> +PACKAGECONFIG[dri] = "-Ddri1=true,-Ddri1=false,virtual/mesa"
> +PACKAGECONFIG[dri2] = "-Ddri2=true,-Ddri2=false"
> +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false"
> +PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11"
> +PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl"
> +PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
> +PACKAGECONFIG[systemd-logind] = "-Dsystemd_logind=true,-Dsystemd_logind=false,dbus,"
> +PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false"
>   
>   # Xorg requires a SHA1 implementation, pick one
>   XORG_CRYPTO ??= "openssl"
> -PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
> -PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
> -PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
> +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl"
> +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle"
> +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt"
>   
>   do_install:append () {
>   	# Its assumed base-files creates this for us
> -	rmdir ${D}${localstatedir}/log/

The comment is related to the presence of /var/log and
now it doesn't make sense after removing the above line.
Please remove the comment, too.

>           sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5
>   }
>   
> 
> 
> 
> 
> 

Re: [OE-core] [PATCH 05/24] xserver-xorg: convert from autotools to meson

[Richard Purdie]

On Mon, 2021-11-15 at 07:15 +0100, Zoltan Boszormenyi via lists.openembedded.org
wrote:
> 2021. 11. 10. 20:39 keltezéssel, Alexander Kanavin írta:
> > 
> >   # Xorg requires a SHA1 implementation, pick one
> >   XORG_CRYPTO ??= "openssl"
> > -PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
> > -PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
> > -PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
> > +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl"
> > +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle"
> > +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt"
> >   
> >   do_install:append () {
> >   	# Its assumed base-files creates this for us
> > -	rmdir ${D}${localstatedir}/log/
> 
> The comment is related to the presence of /var/log and
> now it doesn't make sense after removing the above line.
> Please remove the comment, too.
> 
> >           sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5
> >   }
> >   

It is gone:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=657f71e1f5cf8a9f385b1748d99cb6d531511626

Cheers,

Richard