[PATCH 01/55] insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only)

[PATCH 01/55] insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only)

[Alexander Kanavin]

This was done in a selftest, but that is too late and creates
friction in integration as errors are not seen until autobuilder fails.

Bonus fix: SUMMARY check wasn't even working, as in the absence
of one set in the recipe there is a default value set from bitbake.conf.

I left DESCRIPTION check out for now, as many recipes don't actually
have it, and it's set from SUMMARY (plus a dot) if absent.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/classes-global/insane.bbclass         | 26 ++++++++++++++++
 meta/lib/oeqa/selftest/cases/distrodata.py | 36 ----------------------
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass
index 8788f58fc5b..632f738c86d 100644
--- a/meta/classes-global/insane.bbclass
+++ b/meta/classes-global/insane.bbclass
@@ -34,6 +34,7 @@ WARN_QA ?= " libdir xorg-driver-abi buildpaths \
             missing-update-alternatives native-last missing-ptest \
             license-exists license-no-generic license-syntax license-format \
             license-incompatible license-file-missing obsolete-license \
+            missing-metadata \
             "
 ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \
             perms dep-cmp pkgvarcheck perm-config perm-line perm-link \
@@ -1473,6 +1474,28 @@ python do_qa_unpack() {
     unpack_check_src_uri(d.getVar('PN'), d)
 }
 
+python do_qa_fetch() {
+    def test_missing_metadata(d):
+        fn = d.getVar("FILE")
+        if not '/meta/recipes-' in fn:
+            # We are only interested in OE-Core
+            return
+        pn = d.getVar('BPN')
+        srcfile = d.getVar('SRC_URI').split()
+        # Check that SUMMARY is not the same as the default from bitbake.conf
+        if d.getVar('SUMMARY') == d.expand("${PN} version ${PV}-${PR}"):
+            oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a SUMMARY. Please add an entry.".format(pn, fn), d)
+        if not d.getVar('HOMEPAGE'):
+            if srcfile and srcfile[0].startswith('file') or not d.getVar('SRC_URI'):
+                # We are only interested in recipes SRC_URI fetched from external sources
+                pass
+            else:
+                oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a HOMEPAGE. Please add an entry.".format(pn, fn), d)
+
+    test_missing_metadata(d)
+    oe.qa.exit_if_errors(d)
+}
+
 # Check for patch fuzz
 do_patch[postfuncs] += "do_qa_patch "
 
@@ -1484,6 +1507,9 @@ do_configure[postfuncs] += "do_qa_configure "
 # Check does S exist.
 do_unpack[postfuncs] += "do_qa_unpack"
 
+# Check basic recipe metadata (e.g. SUMMARY/HOMEPAGE/RECIPE_MAINTAINER)
+do_fetch[postfuncs] += "do_qa_fetch"
+
 python () {
     import re
     
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index c83a3a7bd67..fd262fe3c9e 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -39,42 +39,6 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re
 """ + "\n".join(regressed_successes)
         self.assertTrue(len(regressed_failures) == 0 and len(regressed_successes) == 0, msg)
 
-    def test_missing_homepg(self):
-        """
-        Summary:     Test for oe-core recipes that don't have a HOMEPAGE or DESCRIPTION
-        Expected:    All oe-core recipes should have a DESCRIPTION entry
-        Expected:    All oe-core recipes should have a HOMEPAGE entry except for recipes that are not fetched from external sources.
-        Product:     oe-core
-        """
-        with bb.tinfoil.Tinfoil() as tinfoil:
-            tinfoil.prepare(config_only=False)
-            no_description = []
-            no_homepage = []
-            for fn in tinfoil.all_recipe_files(variants=False):
-                if not '/meta/recipes-' in fn:
-                    # We are only interested in OE-Core
-                    continue
-                rd = tinfoil.parse_recipe_file(fn, appends=False)
-                pn = rd.getVar('BPN')
-                srcfile = rd.getVar('SRC_URI').split()
-                #Since DESCRIPTION defaults to SUMMARY if not set, we are only interested in recipes without DESCRIPTION or SUMMARY
-                if not (rd.getVar('SUMMARY') or rd.getVar('DESCRIPTION')):
-                    no_description.append((pn, fn))
-                if not rd.getVar('HOMEPAGE'):
-                    if srcfile and srcfile[0].startswith('file') or not rd.getVar('SRC_URI'):
-                        # We are only interested in recipes SRC_URI fetched from external sources
-                        continue
-                    no_homepage.append((pn, fn))
-        if no_homepage:
-            self.fail("""
-The following recipes do not have a HOMEPAGE. Please add an entry for HOMEPAGE in the recipe.
-""" + "\n".join(['%s (%s)' % i for i in no_homepage]))
-
-        if no_description:
-            self.fail("""
-The following recipes do not have a DESCRIPTION. Please add an entry for DESCRIPTION in the recipe.
-""" + "\n".join(['%s (%s)' % i for i in no_description]))
-
     def test_maintainers(self):
         """
         Summary:     Test that oe-core recipes have a maintainer and entries in maintainers list have a recipe
-- 
2.30.2

[PATCH 02/55] insane.bbclass: add a RECIPE_MAINTAINER check (oe-core recipes only)

[Alexander Kanavin]

Absent maintainer entries are as well a frequent source of friction, as they are checked
only in selftest, and so aren't revealed until autobuilder runs.

The selftest is retained as it also checks for obsolete entries in maintainers.inc
(not possible to do in insane class).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/classes-global/insane.bbclass | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass
index 632f738c86d..50f60337cc4 100644
--- a/meta/classes-global/insane.bbclass
+++ b/meta/classes-global/insane.bbclass
@@ -1492,7 +1492,19 @@ python do_qa_fetch() {
             else:
                 oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a HOMEPAGE. Please add an entry.".format(pn, fn), d)
 
+    def test_missing_maintainer(d):
+        fn = d.getVar("FILE")
+        if not '/meta/recipes-' in fn:
+            # We are only interested in OE-Core
+            return
+        pn = d.getVar("PN")
+        if pn.endswith("-native") or pn.startswith("nativesdk-"):
+            return
+        if not d.getVar('RECIPE_MAINTAINER'):
+            oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc.".format(pn, fn), d)
+
     test_missing_metadata(d)
+    test_missing_maintainer(d)
     oe.qa.exit_if_errors(d)
 }
 
-- 
2.30.2

[PATCH 03/55] apmd: remove recipe and apm MACHINE_FEATURE

[Alexander Kanavin]

APM has been obsolete for a very long time, and debian no longer
packages it or carries the source tarball.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../conf/distro/include/default-providers.inc |   1 -
 meta/conf/distro/include/maintainers.inc      |   1 -
 meta/recipes-bsp/apmd/apmd/apmd.service       |   7 -
 meta/recipes-bsp/apmd/apmd/apmd_proxy         |  91 ------------
 meta/recipes-bsp/apmd/apmd/apmd_proxy.conf    |  16 ---
 meta/recipes-bsp/apmd/apmd/default            |   8 --
 meta/recipes-bsp/apmd/apmd/init               |  51 -------
 meta/recipes-bsp/apmd/apmd/legacy.patch       | 133 ------------------
 meta/recipes-bsp/apmd/apmd/libtool.patch      |  41 ------
 meta/recipes-bsp/apmd/apmd/linkage.patch      |  53 -------
 meta/recipes-bsp/apmd/apmd/unlinux.patch      |  25 ----
 meta/recipes-bsp/apmd/apmd/wexitcode.patch    |  26 ----
 meta/recipes-bsp/apmd/apmd_3.2.2-15.bb        |  85 -----------
 .../packagegroups/packagegroup-base.bb        |   7 -
 .../matchbox-panel-2/matchbox-panel-2_2.12.bb |   2 -
 .../matchbox-session-sato/session             |   1 -
 .../matchbox-session-sato_0.1.bb              |   2 +-
 17 files changed, 1 insertion(+), 549 deletions(-)
 delete mode 100644 meta/recipes-bsp/apmd/apmd/apmd.service
 delete mode 100644 meta/recipes-bsp/apmd/apmd/apmd_proxy
 delete mode 100644 meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
 delete mode 100644 meta/recipes-bsp/apmd/apmd/default
 delete mode 100755 meta/recipes-bsp/apmd/apmd/init
 delete mode 100644 meta/recipes-bsp/apmd/apmd/legacy.patch
 delete mode 100644 meta/recipes-bsp/apmd/apmd/libtool.patch
 delete mode 100644 meta/recipes-bsp/apmd/apmd/linkage.patch
 delete mode 100644 meta/recipes-bsp/apmd/apmd/unlinux.patch
 delete mode 100644 meta/recipes-bsp/apmd/apmd/wexitcode.patch
 delete mode 100644 meta/recipes-bsp/apmd/apmd_3.2.2-15.bb

diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 3a4e989c1f9..d18173c7449 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -24,7 +24,6 @@ PREFERRED_PROVIDER_virtual/make-native ?= "make-native"
 # Default virtual runtime providers
 #
 VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg"
-VIRTUAL-RUNTIME_apm ?= "apm"
 VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
 VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt"
 VIRTUAL-RUNTIME_base-utils ?= "busybox"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index b06ae43dac9..823fb5b9001 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -38,7 +38,6 @@ RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker <michael.opdenacker@bootli
 RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>"
 RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>"
 RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker <michael.opdenacker@bootlin.com>"
-RECIPE_MAINTAINER:pn-apmd = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-apr = "Hongxu Jia <hongxu.jia@windriver.com>"
 RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia <hongxu.jia@windriver.com>"
 RECIPE_MAINTAINER:pn-apt = "Unassigned <unassigned@yoctoproject.org>"
diff --git a/meta/recipes-bsp/apmd/apmd/apmd.service b/meta/recipes-bsp/apmd/apmd/apmd.service
deleted file mode 100644
index ffab82334f9..00000000000
--- a/meta/recipes-bsp/apmd/apmd/apmd.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Advanced Power Management daemon
-After=remote-fs.target
-
-[Service]
-EnvironmentFile=-@SYSCONFDIR@/default/apmd
-ExecStart=@SBINDIR@/apmd -P @SYSCONFDIR@/apm/apmd_proxy $APMD
diff --git a/meta/recipes-bsp/apmd/apmd/apmd_proxy b/meta/recipes-bsp/apmd/apmd/apmd_proxy
deleted file mode 100644
index c48ee4e5d5f..00000000000
--- a/meta/recipes-bsp/apmd/apmd/apmd_proxy
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-# 
-# apmd_proxy - program dispatcher for APM daemon
-#
-# Written by Craig Markwardt (craigm@lheamail.gsfc.nasa.gov) 21 May 1999
-# Modified for Debian by Avery Pennarun
-#
-# This shell script is called by the APM daemon (apmd) when a power
-# management event occurs.  Its first and second arguments describe the
-# event.  For example, apmd will call "apmd_proxy suspend system" just
-# before the system is suspended.
-#
-# Here are the possible arguments:
-#
-# start              - APM daemon has started
-# stop               - APM daemon is shutting down
-# suspend critical   - APM system indicates critical suspend (++)
-# suspend system     - APM system has requested suspend mode
-# suspend user       - User has requested suspend mode
-# standby system     - APM system has requested standby mode 
-# standby user       - User has requested standby mode
-# resume suspend     - System has resumed from suspend mode
-# resume standby     - System has resumed from standby mode
-# resume critical    - System has resumed from critical suspend
-# change battery     - APM system reported low battery
-# change power       - APM system reported AC/battery change
-# change time        - APM system reported time change (*)
-# change capability  - APM system reported config. change (+)
-#
-# (*) - APM daemon may be configured to not call these sequences
-# (+) - Available if APM kernel supports it.
-# (++) - "suspend critical" is never passed to apmd from the kernel,
-#   so we will never see it here.  Scripts that process "resume
-#   critical" events need to take this into account.
-#
-# It is the proxy script's responsibility to examine the APM status
-# (via /proc/apm) or other status and to take appropriate actions.
-# For example, the script might unmount network drives before the
-# machine is suspended.
-#
-# In Debian, the usual way of adding functionality to the proxy is to
-# add a script to /etc/apm/event.d.  This script will be called by
-# apmd_proxy (via run-parts) with the same arguments.
-#
-# If it is important that a certain set of script be run in a certain
-# order on suspend and in a different order on resume, then put all
-# the scripts in /etc/apm/scripts.d instead of /etc/apm/event.d and
-# symlink to these from /etc/apm/suspend.d, /etc/apm/resume.d and
-# /etc/apm/other.d using names whose lexicographical order is the same
-# as the desired order of execution.
-#
-# If the kernel's APM driver supports it, apmd_proxy can return a non-zero
-# exit status on suspend and standby events, indicating that the suspend
-# or standby event should be rejected.
-#
-# *******************************************************************
-
-set -e
-
-# The following doesn't yet work, because current kernels (up to at least
-# 2.4.20) do not support rejection of APM events.  Supporting this would
-# require substantial modifications to the APM driver.  We will re-enable
-# this feature if the driver is ever modified.       -- cph@debian.org
-#
-#SUSPEND_ON_AC=false
-#[ -r /etc/apm/apmd_proxy.conf ] && . /etc/apm/apmd_proxy.conf
-#
-#if [ "${SUSPEND_ON_AC}" = "false" -a "${2}" = "system" ] \
-#	&& on_ac_power >/dev/null; then
-#    # Reject system suspends and standbys if we are on AC power
-#    exit 1  # Reject (NOTE kernel support must be enabled)
-#fi
-
-if [ "${1}" = "suspend" -o "${1}" = "standby" ]; then
-    run-parts -a "${1}" -a "${2}" /etc/apm/event.d
-    if [ -d /etc/apm/suspend.d ]; then
-        run-parts -a "${1}" -a "${2}" /etc/apm/suspend.d
-    fi
-elif [ "${1}" = "resume" ]; then
-    if [ -d /etc/apm/resume.d ]; then
-        run-parts -a "${1}" -a "${2}" /etc/apm/resume.d
-    fi
-    run-parts -a "${1}" -a "${2}" /etc/apm/event.d
-else
-    run-parts -a "${1}" -a "${2}" /etc/apm/event.d
-    if [ -d /etc/apm/other.d ]; then
-        run-parts -a "${1}" -a "${2}" /etc/apm/other.d
-    fi
-fi
-
-exit 0
diff --git a/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf b/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
deleted file mode 100644
index 751145c522c..00000000000
--- a/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/apm/apmd_proxy.conf: configuration file for apmd.
-#
-# This file is managed by debconf when installing or reconfiguring the
-# package.  It is generated by merging the answers gathered by debconf
-# into the template file "/usr/share/apmd/apmd_proxy.conf".
-
-# The following doesn't yet work, because current kernels (up to at least
-# 2.4.20) do not support rejection of APM events.  Supporting this would
-# require substantial modifications to the APM driver.  We will re-enable
-# this feature if the driver is ever modified.       -- cph@debian.org
-#
-# Set the following to "false" if you want to reject system suspend or
-# system standby requests when the computer is running on AC power.
-# Otherwise set this to "true".  Such requests are never rejected when
-# the computer is running on battery power.
-#SUSPEND_ON_AC=true
diff --git a/meta/recipes-bsp/apmd/apmd/default b/meta/recipes-bsp/apmd/apmd/default
deleted file mode 100644
index 4b7965abf85..00000000000
--- a/meta/recipes-bsp/apmd/apmd/default
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Default for /etc/init.d/apmd
-#
-
-# As apmd can be called with arguments, we use the following variable
-# to store them, e.g., APMD="-w 5 -p 2".
-# See the manual page apmd(8) for details.
-APMD="--proxy-timeout 30"
diff --git a/meta/recipes-bsp/apmd/apmd/init b/meta/recipes-bsp/apmd/apmd/init
deleted file mode 100755
index c0b41aa9d17..00000000000
--- a/meta/recipes-bsp/apmd/apmd/init
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          apmd
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Advanced Power Management daemon
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-[ -f /etc/default/apmd ] && . /etc/default/apmd
-
-case "$1" in
-    start)
-	echo -n "Starting advanced power management daemon: "
-	start-stop-daemon -S -x /usr/sbin/apmd -- \
-		-P /etc/apm/apmd_proxy $APMD
-	if [ $? = 0 ]; then
-	    echo "apmd."
-	else
-	    echo "(failed.)"
-	fi
-	;;
-    stop)
-	echo -n "Stopping advanced power management daemon: "
-	start-stop-daemon -K \
-		-x /usr/sbin/apmd
-	echo "apmd."
-	;;
-    status)
-	status /usr/sbin/apmd;
-	exit $?
-	;;
-    restart|force-reload) 
-	$0 stop
-	$0 start
-	exit
-	;;
-    *)
-	echo "Usage: /etc/init.d/apmd {start|stop|status|restart|force-reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/meta/recipes-bsp/apmd/apmd/legacy.patch b/meta/recipes-bsp/apmd/apmd/legacy.patch
deleted file mode 100644
index 88713118057..00000000000
--- a/meta/recipes-bsp/apmd/apmd/legacy.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 3595933d221f0ba836917debc0776b8723972ec9 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 11 Aug 2015 17:40:50 +0300
-Subject: [PATCH 1/3] Patch with fixes provided by Debian.
-
-This patch is taken from
-ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2-15.debian.tar.xz
-
-Upstream-Status: Inappropriate [upstream is dead]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- Makefile |  2 +-
- apm.c    |  3 ++-
- apm.h    |  9 +++++++++
- apmd.c   | 15 ++++++++-------
- 4 files changed, 20 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf346d9..92fc0fd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -43,7 +43,7 @@ DESTDIR=
- 
- CC=gcc
- CFLAGS=-O -g
--XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \
-+XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \
- 		-I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \
- 		-DVERSION=\"$(VERSION)\" \
- 		-DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\"
-diff --git a/apm.c b/apm.c
-index b21c057..0359b1c 100644
---- a/apm.c
-+++ b/apm.c
-@@ -219,12 +219,13 @@ int main(int argc, char **argv)
- 		}
- 	}
- 													    
--
-+#if 0
-     if (!(i.apm_flags & APM_32_BIT_SUPPORT))
-     {
- 	fprintf(stderr, "32-bit APM interface not supported\n");
- 	exit(1);
-     }
-+#endif
- 
-     if (verbose && (i.apm_flags & 0x10))
- 	printf("APM BIOS Power Management is currently disabled\n");
-diff --git a/apm.h b/apm.h
-index fb24dfd..824cc06 100644
---- a/apm.h
-+++ b/apm.h
-@@ -20,6 +20,13 @@
-  * $Id: apm.h,v 1.7 1999/07/05 22:31:11 apenwarr Exp $
-  * 
-  */
-+#ifndef _APM_H
-+#define _APM_H 1
-+
-+#ifndef __KERNEL_STRICT_NAMES
-+#define __KERNEL_STRICT_NAMES
-+#endif
-+
- #include <linux/apm_bios.h>
- #include <sys/types.h>
- 
-@@ -93,3 +100,5 @@ extern int apm_reject(int fd);
- #else
- #define apm_reject(fd)   (-EINVAL)
- #endif
-+
-+#endif
-diff --git a/apmd.c b/apmd.c
-index 49ed3a1..560f536 100644
---- a/apmd.c
-+++ b/apmd.c
-@@ -343,7 +343,7 @@ static int call_proxy(apm_event_t event)
- 		/* parent */
- 		int status, retval;
- 		ssize_t len;
--		time_t time_limit;
-+		time_t countdown;
- 
- 		if (pid < 0) {
- 			/* Couldn't fork */
-@@ -356,8 +356,9 @@ static int call_proxy(apm_event_t event)
- 		/* Capture the child's output, if any, but only until it terminates */
- 		close(fds[1]);
- 		fcntl(fds[0], F_SETFL, O_RDONLY|O_NONBLOCK);
--		time_limit = time(0) + proxy_timeout;
-+		countdown = proxy_timeout;
- 		do {
-+			countdown -= 1;
- 			while ((len = read(fds[0], line, sizeof(line)-1)) > 0) {
- 				line[len] = 0;
- 				APMD_SYSLOG(LOG_INFO, "+ %s", line);
-@@ -372,16 +373,16 @@ static int call_proxy(apm_event_t event)
- 				goto proxy_done;
- 			}
- 				
--			sleep(1);
-+			while (sleep(1) > 0) ;
- 		} while (
--			(time(0) < time_limit)
-+			(countdown >= 0)
- 			|| (proxy_timeout < 0)
- 		);
- 
- 		APMD_SYSLOG(LOG_NOTICE, "Proxy has been running more than %d seconds; killing it", proxy_timeout);
- 
- 		kill(pid, SIGTERM);
--		time_limit = time(0) + 5;
-+		countdown = 5;
- 		do {
- 			retval = waitpid(pid, &status, WNOHANG);
- 			if (retval == pid)
-@@ -392,9 +393,9 @@ static int call_proxy(apm_event_t event)
- 				goto proxy_done;
- 			}
- 
--			sleep(1);
-+			while (sleep(1) > 0) ;
- 
--		} while (time(0) < time_limit);
-+		} while (countdown >= 0);
- 
- 		kill(pid, SIGKILL);
- 		status = __W_EXITCODE(0, SIGKILL);
--- 
-2.1.4
-
diff --git a/meta/recipes-bsp/apmd/apmd/libtool.patch b/meta/recipes-bsp/apmd/apmd/libtool.patch
deleted file mode 100644
index fd0a952890d..00000000000
--- a/meta/recipes-bsp/apmd/apmd/libtool.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d5dde7ca91a5aed273d8fe269e1a5194e85c8c79 Mon Sep 17 00:00:00 2001
-From: Scott Garman <scott.a.garman@intel.com>
-Date: Tue, 13 Jul 2010 16:46:46 +0800
-Subject: [PATCH] apmd: upgrade to 3.2.2-14
-
-Add by RP to address "unable to infer tagged configuration" error:
-   commit 35de05e61b88c0808a5e885bb0efdf420555d5ad
-   Author: Richard Purdie <rpurdie@rpsys.net>
-   Date:   Sun Jun 1 16:13:38 2008 +0000
-
-   apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky)
-
-However I didn't see same issue with current libtool-2.2.10. Also per my understanding,
-the default tag, if not specified, falls back to CC. So disable it from patching, but
-keep it here. If we encounter similar issue in the future, we could then push upstream
-
-Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-16
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 92fc0fd..8e283dc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -59,8 +59,8 @@ RANLIB=ranlib
- #LDFLAGS=-s
- 
- LIBTOOL=libtool --quiet
--LT_COMPILE = $(LIBTOOL) --mode=compile $(CC)
--LT_LINK = $(LIBTOOL) --mode=link $(CC)
-+LT_COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC)
-+LT_LINK = $(LIBTOOL)  --tag=CC --mode=link $(CC)
- LT_INSTALL = $(LIBTOOL) --mode=install install
- LT_CLEAN = $(LIBTOOL) --mode=clean rm
- 
diff --git a/meta/recipes-bsp/apmd/apmd/linkage.patch b/meta/recipes-bsp/apmd/apmd/linkage.patch
deleted file mode 100644
index 3d32c49cd27..00000000000
--- a/meta/recipes-bsp/apmd/apmd/linkage.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-When building use the libtool intermediate .lo files instead of explicitly using
-the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is
-a static build, and .libs/foo.o is a shared build.
-
-If static libraries have been disabled globally then libtool won't generate them
-and explicit references to foo.o won't be satisfied.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/Makefile b/Makefile
-index bb695c6..5f60146 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@ endif
- 
- .SUFFIXES:
- 
--OBJS=apmlib.o
-+OBJS=apmlib.lo
- EXES=apm apmd xapm apmsleep
- HEADERS=apm.h
- 
-@@ -66,22 +66,22 @@ all: $(EXES)
- 
- $(OBJS): $(HEADERS)
- 
--%.o: %.c
-+%.lo: %.c
- 	$(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) $<
- 
--%: %.o $(LIBAPM)
-+%: %.lo $(LIBAPM)
- 	$(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM)
- 
--xapm.o: xapm.c
-+xapm.lo: xapm.c
- 	$(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $<
- 
--apmd: apmd.o
-+apmd: apmd.lo
- 
--apmsleep: apmsleep.o
-+apmsleep: apmsleep.lo
- 
--apmexists: apmexists.o
-+apmexists: apmexists.lo
- 
--xapm: xapm.o $(LIBAPM)
-+xapm: xapm.lo $(LIBAPM)
- 	$(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS)
- 
- $(LIBAPM): apmlib.lo
diff --git a/meta/recipes-bsp/apmd/apmd/unlinux.patch b/meta/recipes-bsp/apmd/apmd/unlinux.patch
deleted file mode 100644
index ec8206cf174..00000000000
--- a/meta/recipes-bsp/apmd/apmd/unlinux.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-copy OE commit message here:
-   commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359
-   Author: Michael Krelin <hacker@klever.net>
-   Date:   Tue May 29 12:27:45 2007 +0000
-
-   apmd: prevent build from interferring with host kernel headers. Closes #1257
-
-comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-13
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- apmd-3.2.2.orig/Makefile
-+++ apmd-3.2.2/Makefile
-@@ -43,8 +43,7 @@
- 
- CC=gcc
- CFLAGS=-O -g
--XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \
--		-I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \
-+XTRACFLAGS=-Wall -pipe -I. \
- 		-DVERSION=\"$(VERSION)\" \
- 		-DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\"
- LDFLAGS=
diff --git a/meta/recipes-bsp/apmd/apmd/wexitcode.patch b/meta/recipes-bsp/apmd/apmd/wexitcode.patch
deleted file mode 100644
index c5faa85fa7f..00000000000
--- a/meta/recipes-bsp/apmd/apmd/wexitcode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Define non-posix W* funcitons
-
-C libraries like musl dont define them
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: apmd-3.2.2.orig/apmd.c
-===================================================================
---- apmd-3.2.2.orig.orig/apmd.c
-+++ apmd-3.2.2.orig/apmd.c
-@@ -55,6 +55,14 @@
- #define MINIMUM_RATE_CALC_TIME  120
- #endif
- 
-+#ifndef _POSIX_SOURCE
-+
-+#define	__WCOREFLAG  0200
-+#define __WCOREDUMP(x)  (_W_INT(x) & __WCOREFLAG)
-+#define	__W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
-+
-+#endif
-+
- /*
-  * For the verbosity level feature to be useful,
-  * we rely on the fact that syslog.h assigns adjacent
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
deleted file mode 100644
index 92c35c98969..00000000000
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
+++ /dev/null
@@ -1,85 +0,0 @@
-SUMMARY = "Utilities for Advanced Power Management"
-DESCRIPTION = "The Advanced Power Management (APM) support provides \
-access to battery status information and a set of tools for managing \
-notebook power consumption."
-HOMEPAGE = "http://apenwarr.ca/apmd/"
-SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://apm.h;beginline=6;endline=18;md5=7d4acc1250910a89f84ce3cc6557c4c2"
-DEPENDS = "libtool-cross"
-
-SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/a/${BPN}/${BPN}_3.2.2.orig.tar.gz;name=tarball \
-           file://legacy.patch \
-           file://libtool.patch \
-           file://unlinux.patch \
-           file://wexitcode.patch \
-           file://linkage.patch \
-           file://init \
-           file://default \
-           file://apmd_proxy \
-           file://apmd_proxy.conf \
-           file://apmd.service"
-
-SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8"
-SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d"
-
-# for this package we're mostly interested in tracking debian patches,
-# and not in the upstream version where all development has effectively stopped
-UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apmd/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
-
-S = "${WORKDIR}/apmd-3.2.2.orig"
-
-inherit update-rc.d systemd
-
-INITSCRIPT_NAME = "apmd"
-INITSCRIPT_PARAMS = "defaults"
-
-SYSTEMD_SERVICE:${PN} = "apmd.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-EXTRA_OEMAKE = "-e MAKEFLAGS="
-
-do_compile() {
-	# apmd doesn't use whole autotools. Just libtool for installation
-	oe_runmake apm apmd
-}
-
-do_install() {
-	install -d ${D}${sysconfdir}
-	install -d ${D}${sysconfdir}/apm
-	install -d ${D}${sysconfdir}/apm/event.d
-	install -d ${D}${sysconfdir}/apm/other.d
-	install -d ${D}${sysconfdir}/apm/suspend.d
-	install -d ${D}${sysconfdir}/apm/resume.d
-	install -d ${D}${sysconfdir}/apm/scripts.d
-	install -d ${D}${sysconfdir}/default
-	install -d ${D}${sysconfdir}/init.d
-	install -d ${D}${sbindir}
-	install -d ${D}${bindir}
-	install -d ${D}${libdir}
-	install -d ${D}${datadir}/apmd
-	install -d ${D}${includedir}
-
-	install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm
-	install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd
-	install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/
-	install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/
-	install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/apmd
-	oe_libinstall -so libapm ${D}${libdir}
-	install -m 0644 apm.h ${D}${includedir}
-
-	sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd
-	chmod 755 ${D}${sysconfdir}/init.d/apmd
-
-	install -d ${D}${systemd_system_unitdir}
-	install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_system_unitdir}/
-	sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-		-e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/apmd.service
-}
-
-PACKAGES =+ "libapm apm"
-
-FILES:libapm = "${libdir}/libapm${SOLIBS}"
-FILES:apm = "${bindir}/apm*"
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index d60e1774712..eeb26ca5880 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -16,7 +16,6 @@ PACKAGES = ' \
             \
             ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \
             ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \
-            ${@bb.utils.contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \
             ${@bb.utils.contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \
             ${@bb.utils.contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \
             ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \
@@ -52,7 +51,6 @@ RDEPENDS:packagegroup-base = "\
     packagegroup-machine-base \
     \
     module-init-tools \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \
@@ -149,11 +147,6 @@ SUMMARY:packagegroup-base-acpi = "ACPI support"
 RDEPENDS:packagegroup-base-acpi = "\
     acpid"
 
-SUMMARY:packagegroup-base-apm = "APM support"
-RDEPENDS:packagegroup-base-apm = "\
-    ${VIRTUAL-RUNTIME_apm} \
-    apmd"
-
 SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support"
 RDEPENDS:packagegroup-base-ext2 = "\
     e2fsprogs-e2fsck \
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb
index b71d1e5cd95..83425f60fe1 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 DEPENDS = "gtk+3 startup-notification dbus dbus-glib dbus-glib-native"
 DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
-DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
 
 # The startup-notification requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -28,7 +27,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
 EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
-EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
index 3a70574af9d..61fea510545 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
@@ -22,7 +22,6 @@ matchbox-desktop &
 START_APPLETS=showdesktop,windowselector
 END_APPLETS=$KEYBOARD_APPLET,systray,startup-notify,notify
 END_APPLETS=battery,$END_APPLETS # feature-acpi
-END_APPLETS=battery,$END_APPLETS # feature-apm
 END_APPLETS=clock,$END_APPLETS
 END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
 
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index 020e211ea59..49bf30ee5ea 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -26,7 +26,7 @@ FILES:${PN} += "${datadir}/themes/Sato/index.theme"
 
 do_install() {
 	# This is the set of machine features that the script has markers for
-	FEATURES="acpi apm phone"
+	FEATURES="acpi phone"
 	SCRIPT="${S}/sedder"
 	rm -f $SCRIPT
 	touch $SCRIPT
-- 
2.30.2

[PATCH 04/55] qemu: a pending patch was submitted and accepted upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-tracetool-use-relative-paths-for-line-preprocessor-d.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch b/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch
index a32ee57f8a4..049b9a51052 100644
--- a/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch
+++ b/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch
@@ -8,7 +8,7 @@ The event filename is an absolute path. Convert it to a relative path when
 writing '#line' directives, to preserve reproducibility of the generated
 output when different base paths are used.
 
-Upstream-Status: Pending
+Upstream-Status: Accepted [https://gitlab.com/qemu-project/qemu/-/commit/9d672e290475001fcecdcc9dc79ad088ff89d17f]
 
 ---
  scripts/tracetool/backend/ftrace.py | 4 +++-
-- 
2.30.2

[PATCH 05/55] sysfsutils: fetch a supported fork from github

[Alexander Kanavin]

Debian does the same:
https://packages.debian.org/source/sid/sysfsutils

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index c90a02f1319..fd72cf41659 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
@@ -10,18 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \
                     file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e"
 PR = "r5"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
+SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=master \
            file://sysfsutils-2.0.0-class-dup.patch \
            file://obsolete_automake_macros.patch \
            file://separatebuild.patch"
 
-SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc"
-SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"
+SRCREV = "0d5456e1c9d969cdad6accef2ae2d4881d5db085"
 
-UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/linux-diag/files/sysfsutils/"
-UPSTREAM_CHECK_REGEX = "/sysfsutils/(?P<pver>(\d+[\.\-_]*)+)/"
-
-S = "${WORKDIR}/sysfsutils-${PV}"
+S = "${WORKDIR}/git"
 
 inherit autotools
 
-- 
2.30.2

[PATCH 06/55] sysfsutils: update 2.1.0 -> 2.1.1

[Alexander Kanavin]

Drop all patches, as issues are all fixed upstream.

License-Update: clarification that GPL applies to all executables
(not just test), formatting.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../obsolete_automake_macros.patch            | 15 -----
 .../sysfsutils-2.1.0/separatebuild.patch      | 65 -------------------
 .../sysfsutils-2.0.0-class-dup.patch          | 23 -------
 ...ysfsutils_2.1.0.bb => sysfsutils_2.1.1.bb} | 14 ++--
 4 files changed, 5 insertions(+), 112 deletions(-)
 delete mode 100644 meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
 delete mode 100644 meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
 delete mode 100644 meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
 rename meta/recipes-core/sysfsutils/{sysfsutils_2.1.0.bb => sysfsutils_2.1.1.bb} (55%)

diff --git a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch b/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
deleted file mode 100644
index 9d828d7026e..00000000000
--- a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [http://sourceforge.net/tracker/?func=detail&aid=3600345&group_id=44427&atid=439544]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd sysfsutils-2.1.0/configure.ac sysfsutils-2.1.0/configure.ac
---- sysfsutils-2.1.0/configure.ac	2006-08-07 08:08:00.000000000 +0300
-+++ sysfsutils-2.1.0/configure.ac	2013-01-11 08:13:08.651550634 +0200
-@@ -2,7 +2,7 @@
- AC_INIT(sysfsutils, 2.1.0, linux-diag-devel@lists.sourceforge.net)
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR([config.h.in])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
-
- # Checks for KLIBC support (should be before AC_PROG_LIBTOOL and AC_PROG_CC)
- AC_CHECK_KLIBC
diff --git a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch b/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
deleted file mode 100644
index 82e725e2aca..00000000000
--- a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Upstream-Status: Pending
-
-Fix out of tree build issues so ${B} != ${S} works.
-
-RP 2013/03/18
-
-Index: sysfsutils-2.1.0/cmd/Makefile.am
-===================================================================
---- sysfsutils-2.1.0.orig/cmd/Makefile.am	2013-03-08 08:57:27.224556508 +0000
-+++ sysfsutils-2.1.0/cmd/Makefile.am	2013-03-08 08:57:27.480556502 +0000
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = systool 
- systool_SOURCES = systool.c names.c names.h
--INCLUDES = -I../include
-+INCLUDES = -I$(srcdir)/../include
- LDADD = ../lib/libsysfs.la
- EXTRA_CFLAGS = @EXTRA_CFLAGS@
- AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CFLAGS)
-Index: sysfsutils-2.1.0/lib/Makefile.am
-===================================================================
---- sysfsutils-2.1.0.orig/lib/Makefile.am	2013-03-08 08:57:27.224556508 +0000
-+++ sysfsutils-2.1.0/lib/Makefile.am	2013-03-08 08:57:27.480556502 +0000
-@@ -1,7 +1,7 @@
- lib_LTLIBRARIES = libsysfs.la
- libsysfs_la_SOURCES = sysfs_utils.c sysfs_attr.c sysfs_class.c dlist.c \
-       sysfs_device.c sysfs_driver.c sysfs_bus.c sysfs_module.c sysfs.h
--INCLUDES = -I../include
-+INCLUDES = -I$(srcdir)/../include
- libsysfs_la_LDFLAGS = -version-info 2:1:0
- EXTRA_CFLAGS = @EXTRA_CLFAGS@
- libsysfs_la_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
-Index: sysfsutils-2.1.0/test/Makefile.am
-===================================================================
---- sysfsutils-2.1.0.orig/test/Makefile.am	2013-03-08 08:57:27.224556508 +0000
-+++ sysfsutils-2.1.0/test/Makefile.am	2013-03-08 09:06:48.196543326 +0000
-@@ -2,14 +2,14 @@
- BUILT_SOURCES = test.h
- CLEANFILES = test.h
- test.h:
--	./create-test
-+	$(srcdir)/create-test $(srcdir)/libsysfs.conf
- get_device_SOURCES = get_device.c
- get_driver_SOURCES = get_driver.c
- get_module_SOURCES = get_module.c
- testlibsysfs_SOURCES = test.c test_attr.c test_bus.c test_class.c \
- 		       test_device.c test_driver.c test_module.c test_utils.c \
- 		       testout.c test-defs.h libsysfs.conf create-test
--INCLUDES = -I../include
-+INCLUDES = -I$(srcdir)/../include
- LDADD = ../lib/libsysfs.la
- EXTRA_CFLAGS = @EXTRA_CLFAGS@
- AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
-Index: sysfsutils-2.1.0/test/create-test
-===================================================================
---- sysfsutils-2.1.0.orig/test/create-test	2005-11-28 10:22:10.000000000 +0000
-+++ sysfsutils-2.1.0/test/create-test	2013-03-08 09:07:03.372542838 +0000
-@@ -2,7 +2,7 @@
- 
- rm -f test.h
- 
--conf_file=./libsysfs.conf
-+conf_file=$1
- 
- . $conf_file
- 
diff --git a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch b/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
deleted file mode 100644
index 1a35b7897a7..00000000000
--- a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Upstream-Status: Backport [from fedora core 9]
-
-This patch is from the Fedora Core 9 sysfsutils-2.1.0-3.fc9 package.
-
-It fixes a problem in the upstream package where not all devices 
-will be returned by the function.
-
-The package License indicates this is GPLv2 licensed.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-diff -puN lib/sysfs_class.c~sysfsutils_class_dup lib/sysfs_class.c
---- sysfsutils-2.1.0/lib/sysfs_class.c~sysfsutils_class_dup	2006-09-07 17:01:26.000000000 -0500
-+++ sysfsutils-2.1.0-bjking1/lib/sysfs_class.c	2006-09-07 17:01:26.000000000 -0500
-@@ -66,7 +66,7 @@ static int cdev_name_equal(void *a, void
- 		return 0;
- 
- 	if (strncmp((char *)a, ((struct sysfs_class_device *)b)->name,
--				strlen((char *)a)) == 0)
-+				SYSFS_NAME_LEN) == 0)
- 		return 1;
- 
- 	return 0;
diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.1.bb
similarity index 55%
rename from meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
rename to meta/recipes-core/sysfsutils/sysfsutils_2.1.1.bb
index fd72cf41659..64a6cc26d33 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.1.bb
@@ -5,17 +5,13 @@ HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
 LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 LICENSE:${PN} = "GPL-2.0-only"
 LICENSE:libsysfs = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \
-                    file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \
-                    file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e"
-PR = "r5"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dcc19fa9307a50017fca61423a7d9754 \
+                    file://cmd/GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://lib/LGPL;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=master \
-           file://sysfsutils-2.0.0-class-dup.patch \
-           file://obsolete_automake_macros.patch \
-           file://separatebuild.patch"
+SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=master"
 
-SRCREV = "0d5456e1c9d969cdad6accef2ae2d4881d5db085"
+SRCREV = "da2f1f8500c0af6663a56ce2bff07f67e60a92e0"
 
 S = "${WORKDIR}/git"
 
-- 
2.30.2

[PATCH 07/55] grub: submit determinism.patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-bsp/grub/files/determinism.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/grub/files/determinism.patch b/meta/recipes-bsp/grub/files/determinism.patch
index 2828e809756..852b95a856c 100644
--- a/meta/recipes-bsp/grub/files/determinism.patch
+++ b/meta/recipes-bsp/grub/files/determinism.patch
@@ -14,7 +14,7 @@ missing sorting of the list used to generate it. Add such a sort.
 Also ensure the generated unidata.c file is deterministic by sorting the
 keys of the dict.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/grub-devel/2023-06/index.html]
 Richard Purdie <richard.purdie@linuxfoundation.org>
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
-- 
2.30.2

[PATCH 08/55] ghostscript: remove mkdir-p.patch

[Alexander Kanavin]

The scenario where things break down without this patch is not clear:
it's a make rule, and so make itself will ensure it's not run several times
in parallel.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../ghostscript/ghostscript/mkdir-p.patch     | 50 -------------------
 .../ghostscript/ghostscript_10.01.1.bb        |  1 -
 2 files changed, 51 deletions(-)
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch

diff --git a/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch b/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
deleted file mode 100644
index 3e6d3e3c48a..00000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2b23026f8e2a352417fb1c4da94bf69b19bef267 Mon Sep 17 00:00:00 2001
-From: Joe Slater <joe.slater@windriver.com>
-Date: Thu, 29 Mar 2018 16:04:32 +0800
-Subject: [PATCH 05/10] ghostscript: allow directories to be created more than
- once
-
-When doing parallel builds, we might try to create directories
-more than once.  This should not cause an error.
-
-Upstream-Status: Pending
-
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
-
-Rebase to 9.23
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- base/unix-end.mak | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/base/unix-end.mak b/base/unix-end.mak
-index 9ce599a..feff5a6 100644
---- a/base/unix-end.mak
-+++ b/base/unix-end.mak
-@@ -17,15 +17,14 @@
- UNIX_END_MAK=$(GLSRC)unix-end.mak $(TOP_MAKEFILES)
- # Define the rule for building standard configurations.
- directories: $(UNIX_END_MAK)
--	@if test "$(BINDIR)"    != "" -a ! -d $(BINDIR);        then mkdir $(BINDIR);        fi
--	@if test "$(GLGENDIR)"  != "" -a ! -d $(GLGENDIR);      then mkdir $(GLGENDIR);      fi
--	@if test "$(GLOBJDIR)"  != "" -a ! -d $(GLOBJDIR);      then mkdir $(GLOBJDIR);      fi
--	@if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR);     then mkdir $(DEVGENDIR);     fi
--	@if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR);     then mkdir $(DEVOBJDIR);     fi
--	@if test "$(AUXDIR)"    != "" -a ! -d $(AUXDIR);        then mkdir $(AUXDIR);        fi
--	@if test "$(PSGENDIR)"  != "" -a ! -d $(PSGENDIR);      then mkdir $(PSGENDIR);      fi
--	@if test "$(PSGENDIR)"  != "" -a ! -d $(PSGENDIR)/cups; then mkdir $(PSGENDIR)/cups; fi
--	@if test "$(PSOBJDIR)"  != "" -a ! -d $(PSOBJDIR);      then mkdir $(PSOBJDIR);      fi
-+	@if test "$(BINDIR)"    != "" -a ! -d $(BINDIR);        then mkdir -p $(BINDIR);        fi
-+	@if test "$(GLGENDIR)"  != "" -a ! -d $(GLGENDIR);      then mkdir -p $(GLGENDIR);      fi
-+	@if test "$(GLOBJDIR)"  != "" -a ! -d $(GLOBJDIR);      then mkdir -p $(GLOBJDIR);      fi
-+	@if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR);     then mkdir -p $(DEVGENDIR);     fi
-+	@if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR);     then mkdir -p $(DEVOBJDIR);     fi
-+	@if test "$(AUXDIR)"    != "" -a ! -d $(AUXDIR);        then mkdir -p $(AUXDIR);        fi
-+	@if test "$(PSGENDIR)"  != "" -a ! -d $(PSGENDIR)/cups; then mkdir -p $(PSGENDIR)/cups; fi
-+	@if test "$(PSOBJDIR)"  != "" -a ! -d $(PSOBJDIR);      then mkdir -p $(PSOBJDIR);      fi
- 
- 
- gs: .gssubtarget $(UNIX_END_MAK)
--- 
-1.8.3.1
-
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb
index 5d4b8cdc913..250b4ba9981 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb
@@ -32,7 +32,6 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d
                 file://ghostscript-9.16-Werror-return-type.patch \
                 file://do-not-check-local-libpng-source.patch \
                 file://avoid-host-contamination.patch \
-                file://mkdir-p.patch \
 "
 
 SRC_URI = "${SRC_URI_BASE} \
-- 
2.30.2

[PATCH 09/55] apr: upgrade 1.7.3 -> 1.7.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-support/apr/{apr_1.7.3.bb => apr_1.7.4.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/apr/{apr_1.7.3.bb => apr_1.7.4.bb} (98%)

diff --git a/meta/recipes-support/apr/apr_1.7.3.bb b/meta/recipes-support/apr/apr_1.7.4.bb
similarity index 98%
rename from meta/recipes-support/apr/apr_1.7.3.bb
rename to meta/recipes-support/apr/apr_1.7.4.bb
index 9a93fe09679..e5714693416 100644
--- a/meta/recipes-support/apr/apr_1.7.3.bb
+++ b/meta/recipes-support/apr/apr_1.7.4.bb
@@ -24,7 +24,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \
            "
 
-SRC_URI[sha256sum] = "455e218c060c474f2c834816873f6ed69c0cf0e4cfee54282cc93e8e989ee59e"
+SRC_URI[sha256sum] = "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577"
 
 inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script
 
-- 
2.30.2

[PATCH 10/55] at-spi2-core: upgrade 2.48.0 -> 2.48.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../atk/{at-spi2-core_2.48.0.bb => at-spi2-core_2.48.3.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/atk/{at-spi2-core_2.48.0.bb => at-spi2-core_2.48.3.bb} (95%)

diff --git a/meta/recipes-support/atk/at-spi2-core_2.48.0.bb b/meta/recipes-support/atk/at-spi2-core_2.48.3.bb
similarity index 95%
rename from meta/recipes-support/atk/at-spi2-core_2.48.0.bb
rename to meta/recipes-support/atk/at-spi2-core_2.48.3.bb
index e9648ffe074..17b0e39a5e9 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.48.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.48.3.bb
@@ -11,7 +11,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30"
+SRC_URI[sha256sum] = "37316df43ca9989ce539d54cf429a768c28bb38a0b34950beadd0421827edf55"
 
 DEPENDS = " \
 	dbus \
-- 
2.30.2

[PATCH 11/55] btrfs-tools: upgrade 6.3 -> 6.3.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../btrfs-tools/{btrfs-tools_6.3.bb => btrfs-tools_6.3.1.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.3.bb => btrfs-tools_6.3.1.bb} (98%)

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.1.bb
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.1.bb
index 5c43d951c48..0bdf48ded2b 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.1.bb
@@ -18,7 +18,7 @@ DEPENDS = "util-linux zlib"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
-SRCREV = "fba31d634e3bc658e7d42a6c00f31ebb60adf901"
+SRCREV = "9d2c8c364a6b8df4b1a47ad384cd75fd4ba53e12"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
-- 
2.30.2

[PATCH 12/55] attr: package /etc/xattr.conf with the library that consumes it

[Alexander Kanavin]

This matters for example with latest coreutils where cp
wouldn't copy extended attributes by default if the config
file specifying that policy is not there, and so ptest fails.

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

diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index 8ba865a74a0..e8835398afa 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -22,7 +22,7 @@ inherit ptest update-alternatives autotools gettext
 
 PACKAGES =+ "lib${BPN}"
 
-FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}"
+FILES:lib${BPN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}"
 
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE:${PN} = "setfattr"
-- 
2.30.2

[PATCH 13/55] glib-2.0: backport a patch to address ptest fails caused by coreutils 9.2+

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...pparent-size-only-for-files-and-syml.patch | 105 ++++++++++++++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb |   1 +
 2 files changed, 106 insertions(+)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
new file mode 100644
index 00000000000..a881b25ef3e
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
@@ -0,0 +1,105 @@
+From d1a2117dc18dbcf87685891de7e2898108b66fc9 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Thu, 23 Mar 2023 02:24:30 +0000
+Subject: [PATCH] glocalfile: Sum apparent size only for files and symlinks
+
+Since GNU Coreutils 9.2 (commit 110bcd28386b1f47a4cd876098acb708fdcbbb25),
+`du --apparent-size` (including `du --bytes`) no longer counts all kinds of
+files (directories, FIFOs, etc.), but only those for which `st_size` in
+`struct stat` is defined by POSIX, namely regular files and symlinks
+(and also rarely supported memory objects).
+
+This aligns the behaviour of GLib's `G_FILE_MEASURE_APPARENT_SIZE` flag
+with the new GNU Coreutils `du` and correct POSIX use.
+
+Note that this may be a breaking change for some uses.
+
+Link: https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html
+Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ gio/gioenums.h   |  3 +++
+ gio/glocalfile.c | 37 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 40 insertions(+)
+
+diff --git a/gio/gioenums.h b/gio/gioenums.h
+index 7fd74a43e..c820cd36d 100644
+--- a/gio/gioenums.h
++++ b/gio/gioenums.h
+@@ -224,6 +224,9 @@ typedef enum {
+  *   sizes.  Normally, the block-size is used, if available, as this is a
+  *   more accurate representation of disk space used.
+  *   Compare with `du --apparent-size`.
++ *   Since GLib 2.78. and similarly to `du` since GNU Coreutils 9.2, this will
++ *   ignore the sizes of file types other than regular files and links, as the
++ *   sizes of other file types are not specified in a standard way.
+  * @G_FILE_MEASURE_NO_XDEV: Do not cross mount point boundaries.
+  *   Compare with `du -x`.
+  *
+diff --git a/gio/glocalfile.c b/gio/glocalfile.c
+index 67d4b99fb..dbb56902d 100644
+--- a/gio/glocalfile.c
++++ b/gio/glocalfile.c
+@@ -86,6 +86,9 @@
+ #define FILE_READ_ONLY_VOLUME           0x00080000
+ #endif
+ 
++#ifndef S_ISREG
++#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
++#endif
+ #ifndef S_ISDIR
+ #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
+ #endif
+@@ -2777,6 +2780,39 @@ g_local_file_measure_size_of_contents (gint           fd,
+                                        MeasureState  *state,
+                                        GError       **error);
+ 
++/*
++ * _g_stat_is_size_usable:
++ * @buf: a #GLocalFileStat.
++ *
++ * Checks if the file type is such that the `st_size` field of `struct stat` is
++ * well-defined by POSIX.
++ * (see https://pubs.opengroup.org/onlinepubs/009696799/basedefs/sys/stat.h.html)
++ *
++ * This behaviour is aligned with `du` from GNU Coreutils 9.2+
++ * (see https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html)
++ * and makes apparent size sums well-defined; formerly, they depended on the
++ * implementation, and could differ across filesystems.
++ *
++ * Returns: %TRUE if the size field is well-defined, %FALSE otherwise.
++ **/
++inline static gboolean
++_g_stat_is_size_usable (const GLocalFileStat *buf)
++{
++#ifndef HAVE_STATX
++  /* Memory objects are defined by POSIX, but are not supported by statx nor Windows */
++#ifdef S_TYPEISSHM
++  if (S_TYPEISSHM (buf))
++    return TRUE;
++#endif
++#ifdef S_TYPEISTMO
++  if (S_TYPEISTMO (buf))
++    return TRUE;
++#endif
++#endif
++
++  return S_ISREG (_g_stat_mode (buf)) || S_ISLNK (_g_stat_mode (buf));
++}
++
+ static gboolean
+ g_local_file_measure_size_of_file (gint           parent_fd,
+                                    GSList        *name,
+@@ -2836,6 +2872,7 @@ g_local_file_measure_size_of_file (gint           parent_fd,
+     state->disk_usage += _g_stat_blocks (&buf) * G_GUINT64_CONSTANT (512);
+   else
+ #endif
++  if (_g_stat_is_size_usable (&buf))
+     state->disk_usage += _g_stat_size (&buf);
+ 
+   if (S_ISDIR (_g_stat_mode (&buf)))
+-- 
+2.39.2
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
index a60e7688367..4327a133450 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
@@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
            file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
            file://0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch \
+           file://0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch \
            "
 SRC_URI:append:class-native = " file://relocate-modules.patch"
 
-- 
2.30.2

[PATCH 14/55] coreutils: upgrade 9.1 -> 9.3

[Alexander Kanavin]

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../coreutils/{coreutils_9.1.bb => coreutils_9.3.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/coreutils/{coreutils_9.1.bb => coreutils_9.3.bb} (98%)

diff --git a/meta/recipes-core/coreutils/coreutils_9.1.bb b/meta/recipes-core/coreutils/coreutils_9.3.bb
similarity index 98%
rename from meta/recipes-core/coreutils/coreutils_9.1.bb
rename to meta/recipes-core/coreutils/coreutils_9.3.bb
index e12a6d67971..4ec953c575b 100644
--- a/meta/recipes-core/coreutils/coreutils_9.1.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.3.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/"
 BUGTRACKER = "http://debbugs.gnu.org/coreutils"
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
-                    file://src/ls.c;beginline=1;endline=15;md5=1fe89f62614b5e1f5475ec04d5899bc1 \
+                    file://src/ls.c;beginline=1;endline=15;md5=b720a8b317035d66c555fc6d89e3674c \
                     "
 DEPENDS = "gmp libcap"
 DEPENDS:class-native = ""
@@ -19,7 +19,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://run-ptest \
            "
 
-SRC_URI[sha256sum] = "61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423"
+SRC_URI[sha256sum] = "adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa"
 
 # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842
 # runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue.
-- 
2.30.2

[PATCH 15/55] diffoscope: upgrade 236 -> 242

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../diffoscope/{diffoscope_236.bb => diffoscope_242.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/diffoscope/{diffoscope_236.bb => diffoscope_242.bb} (92%)

diff --git a/meta/recipes-support/diffoscope/diffoscope_236.bb b/meta/recipes-support/diffoscope/diffoscope_242.bb
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_236.bb
rename to meta/recipes-support/diffoscope/diffoscope_242.bb
index 9f89f35c111..4b0d518edcc 100644
--- a/meta/recipes-support/diffoscope/diffoscope_236.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_242.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "84c46840dafffe0223056718e4250ceb52484452a992b85e345e3cf8a2cf7d4b"
+SRC_URI[sha256sum] = "d858c591d2c8d42b2b29eb6d229408607b1cd8a4e7ade72d0cd002db6d1c2a6e"
 
 RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
 
-- 
2.30.2

[PATCH 16/55] dnf: upgrade 4.14.0 -> 4.16.1

[Alexander Kanavin]

Correct the query for locations of rpm package files in the local repo:
upstream has changed it to a separate cmdline parameter.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oe/package_manager/rpm/__init__.py                | 5 +++--
 meta/recipes-devtools/dnf/{dnf_4.14.0.bb => dnf_4.16.1.bb} | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/dnf/{dnf_4.14.0.bb => dnf_4.16.1.bb} (98%)

diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py
index fa218485f5e..f40c880af49 100644
--- a/meta/lib/oe/package_manager/rpm/__init__.py
+++ b/meta/lib/oe/package_manager/rpm/__init__.py
@@ -386,11 +386,12 @@ class RpmPM(PackageManager):
             self.save_rpmpostinst(pkg)
 
     def extract(self, pkg):
-        output = self._invoke_dnf(["repoquery", "--queryformat", "%{location}", pkg])
+        output = self._invoke_dnf(["repoquery", "--location", pkg])
         pkg_name = output.splitlines()[-1]
         if not pkg_name.endswith(".rpm"):
             bb.fatal("dnf could not find package %s in repository: %s" %(pkg, output))
-        pkg_path = oe.path.join(self.rpm_repo_dir, pkg_name)
+        # Strip file: prefix
+        pkg_path = pkg_name[5:]
 
         cpio_cmd = bb.utils.which(os.getenv("PATH"), "cpio")
         rpm2cpio_cmd = bb.utils.which(os.getenv("PATH"), "rpm2cpio")
diff --git a/meta/recipes-devtools/dnf/dnf_4.14.0.bb b/meta/recipes-devtools/dnf/dnf_4.16.1.bb
similarity index 98%
rename from meta/recipes-devtools/dnf/dnf_4.14.0.bb
rename to meta/recipes-devtools/dnf/dnf_4.16.1.bb
index 62df8c4ace5..ff79701dc7b 100644
--- a/meta/recipes-devtools/dnf/dnf_4.14.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.16.1.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc
            file://0001-dnf-write-the-log-lock-to-root.patch \
            "
 
-SRCREV = "e50875b3f5790f70720bdb670e1dd2bf4d828744"
+SRCREV = "94b7cc7956580405b219329541d6b40db6499cf1"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 17/55] ethtool: upgrade 6.2 -> 6.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../ethtool/ethtool/avoid_parallel_tests.patch              | 6 +++---
 .../ethtool/{ethtool_6.2.bb => ethtool_6.3.bb}              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/ethtool/{ethtool_6.2.bb => ethtool_6.3.bb} (93%)

diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index d5cb8705c2f..5e9024834cf 100644
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -1,4 +1,4 @@
-From b4ec6635af4d4a47e9ab7bbd5347e78710d19362 Mon Sep 17 00:00:00 2001
+From 08f887f4bc65684397bf8ec30cc61d91d894deac Mon Sep 17 00:00:00 2001
 From: Tudor Florea <tudor.florea@enea.com>
 Date: Wed, 28 May 2014 18:59:54 +0200
 Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index ebdfd39..c93b79a 100644
+index c1e0012..c460398 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_INIT(ethtool, 6.2, netdev@vger.kernel.org)
+ AC_INIT(ethtool, 6.3, netdev@vger.kernel.org)
  AC_PREREQ(2.52)
  AC_CONFIG_SRCDIR([ethtool.c])
 -AM_INIT_AUTOMAKE([gnu subdir-objects])
diff --git a/meta/recipes-extended/ethtool/ethtool_6.2.bb b/meta/recipes-extended/ethtool/ethtool_6.3.bb
similarity index 93%
rename from meta/recipes-extended/ethtool/ethtool_6.2.bb
rename to meta/recipes-extended/ethtool/ethtool_6.3.bb
index aea03b729d3..504e6459664 100644
--- a/meta/recipes-extended/ethtool/ethtool_6.2.bb
+++ b/meta/recipes-extended/ethtool/ethtool_6.3.bb
@@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
            file://avoid_parallel_tests.patch \
            "
 
-SRC_URI[sha256sum] = "1a9f95c3d8c1795a942220912d72c06a208f1c122a78f7690259402856ff06a0"
+SRC_URI[sha256sum] = "342d37d3fe19da79d0276c4c69c34c61f1ad8f87b06514d664bf1eeb29bfd525"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
 
-- 
2.30.2

[PATCH 18/55] gawk: upgrade 5.2.1 -> 5.2.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/gawk/{gawk_5.2.1.bb => gawk_5.2.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/gawk/{gawk_5.2.1.bb => gawk_5.2.2.bb} (97%)

diff --git a/meta/recipes-extended/gawk/gawk_5.2.1.bb b/meta/recipes-extended/gawk/gawk_5.2.2.bb
similarity index 97%
rename from meta/recipes-extended/gawk/gawk_5.2.1.bb
rename to meta/recipes-extended/gawk/gawk_5.2.2.bb
index 768c8eb3648..3c18b6911a0 100644
--- a/meta/recipes-extended/gawk/gawk_5.2.1.bb
+++ b/meta/recipes-extended/gawk/gawk_5.2.2.bb
@@ -19,7 +19,7 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
            file://run-ptest \
            "
 
-SRC_URI[sha256sum] = "529e7c8c6acf21ff3a6183f4d763c632810908989c24675c77995d51ac37b79c"
+SRC_URI[sha256sum] = "945aef7ccff101f20b22a10802bc005e994ab2b8ea3e724cc1a197c62f41f650"
 
 inherit autotools gettext texinfo update-alternatives
 
-- 
2.30.2

[PATCH 19/55] gdb: upgrade 13.1 -> 13.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ian_13.1.bb => gdb-cross-canadian_13.2.bb} |   0
 .../{gdb-cross_13.1.bb => gdb-cross_13.2.bb}  |   0
 meta/recipes-devtools/gdb/gdb.inc             |   4 +-
 ...r-valid-inferior-thread-regcache-bef.patch | 286 ------------------
 ...low.cc-Fix-a-typo-in-ternary-operato.patch |  24 --
 .../gdb/{gdb_13.1.bb => gdb_13.2.bb}          |   0
 6 files changed, 1 insertion(+), 313 deletions(-)
 rename meta/recipes-devtools/gdb/{gdb-cross-canadian_13.1.bb => gdb-cross-canadian_13.2.bb} (100%)
 rename meta/recipes-devtools/gdb/{gdb-cross_13.1.bb => gdb-cross_13.2.bb} (100%)
 delete mode 100644 meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch
 delete mode 100644 meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch
 rename meta/recipes-devtools/gdb/{gdb_13.1.bb => gdb_13.2.bb} (100%)

diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_13.2.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_13.2.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_13.1.bb b/meta/recipes-devtools/gdb/gdb-cross_13.2.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross_13.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross_13.2.bb
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 8589de62ffd..e986b1a1f91 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -13,10 +13,8 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
            file://0006-resolve-restrict-keyword-conflict.patch \
            file://0007-Fix-invalid-sigprocmask-call.patch \
            file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
-           file://0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch \
            file://add-missing-ldflags.patch \
-           file://0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch \
            "
-SRC_URI[sha256sum] = "115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0"
+SRC_URI[sha256sum] = "fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a"
 
 TOOLCHAIN = "gcc"
diff --git a/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch b/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch
deleted file mode 100644
index 9adf4a4db55..00000000000
--- a/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-From b3eff3e15576229af9bae026c5c23ee694b90389 Mon Sep 17 00:00:00 2001
-From: Luis Machado <luis.machado@arm.com>
-Date: Fri, 24 Mar 2023 07:58:38 +0000
-Subject: [PATCH] aarch64: Check for valid inferior thread/regcache before
- reading pauth registers
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-There were reports of gdb throwing internal errors when calling
-inferior_thread ()/get_current_regcache () on a system with
-Pointer Authentication enabled.
-
-In such cases, gdb produces the following backtrace, or a variation
-of it (for gdb's with the non-address removal implemented only in
-the aarch64-linux-tdep.c file).
-
-../../../repos/binutils-gdb/gdb/thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed.
-A problem internal to GDB has been detected,
-further debugging may prove unreliable.
------ Backtrace -----
-0xaaaae04a571f gdb_internal_backtrace_1
-        ../../../repos/binutils-gdb/gdb/bt-utils.c:122
-0xaaaae04a57f3 _Z22gdb_internal_backtracev
-        ../../../repos/binutils-gdb/gdb/bt-utils.c:168
-0xaaaae0b52ccf internal_vproblem
-        ../../../repos/binutils-gdb/gdb/utils.c:401
-0xaaaae0b5310b _Z15internal_verrorPKciS0_St9__va_list
-        ../../../repos/binutils-gdb/gdb/utils.c:481
-0xaaaae0e24b8f _Z18internal_error_locPKciS0_z
-        ../../../repos/binutils-gdb/gdbsupport/errors.cc:58
-0xaaaae0a88983 _Z15inferior_threadv
-        ../../../repos/binutils-gdb/gdb/thread.c:86
-0xaaaae0956c87 _Z20get_current_regcachev
-        ../../../repos/binutils-gdb/gdb/regcache.c:428
-0xaaaae035223f aarch64_remove_non_address_bits
-        ../../../repos/binutils-gdb/gdb/aarch64-tdep.c:3572
-0xaaaae03e8abb _Z31gdbarch_remove_non_address_bitsP7gdbarchm
-        ../../../repos/binutils-gdb/gdb/gdbarch.c:3109
-0xaaaae0a692d7 memory_xfer_partial
-        ../../../repos/binutils-gdb/gdb/target.c:1620
-0xaaaae0a695e3 _Z19target_xfer_partialP10target_ops13target_objectPKcPhPKhmmPm
-        ../../../repos/binutils-gdb/gdb/target.c:1684
-0xaaaae0a69e9f target_read_partial
-        ../../../repos/binutils-gdb/gdb/target.c:1937
-0xaaaae0a69fdf _Z11target_readP10target_ops13target_objectPKcPhml
-        ../../../repos/binutils-gdb/gdb/target.c:1977
-0xaaaae0a69937 _Z18target_read_memorymPhl
-        ../../../repos/binutils-gdb/gdb/target.c:1773
-0xaaaae08be523 ps_xfer_memory
-        ../../../repos/binutils-gdb/gdb/proc-service.c:90
-0xaaaae08be6db ps_pdread
-        ../../../repos/binutils-gdb/gdb/proc-service.c:124
-0x40001ed7c3b3 _td_fetch_value
-        /build/glibc-RIFKjK/glibc-2.31/nptl_db/fetch-value.c:115
-0x40001ed791ef td_ta_map_lwp2thr
-        /build/glibc-RIFKjK/glibc-2.31/nptl_db/td_ta_map_lwp2thr.c:194
-0xaaaae07f4473 thread_from_lwp
-        ../../../repos/binutils-gdb/gdb/linux-thread-db.c:413
-0xaaaae07f6d6f _ZN16thread_db_target4waitE6ptid_tP17target_waitstatus10enum_flagsI16target_wait_flagE
-        ../../../repos/binutils-gdb/gdb/linux-thread-db.c:1420
-0xaaaae0a6b33b _Z11target_wait6ptid_tP17target_waitstatus10enum_flagsI16target_wait_flagE
-        ../../../repos/binutils-gdb/gdb/target.c:2586
-0xaaaae0789cf7 do_target_wait_1
-        ../../../repos/binutils-gdb/gdb/infrun.c:3825
-0xaaaae0789e6f operator()
-        ../../../repos/binutils-gdb/gdb/infrun.c:3884
-0xaaaae078a167 do_target_wait
-        ../../../repos/binutils-gdb/gdb/infrun.c:3903
-0xaaaae078b0af _Z20fetch_inferior_eventv
-        ../../../repos/binutils-gdb/gdb/infrun.c:4314
-0xaaaae076652f _Z22inferior_event_handler19inferior_event_type
-        ../../../repos/binutils-gdb/gdb/inf-loop.c:41
-0xaaaae07dc68b handle_target_event
-        ../../../repos/binutils-gdb/gdb/linux-nat.c:4206
-0xaaaae0e25fbb handle_file_event
-        ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:573
-0xaaaae0e264f3 gdb_wait_for_event
-        ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:694
-0xaaaae0e24f9b _Z16gdb_do_one_eventi
-        ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:217
-0xaaaae080f033 start_event_loop
-        ../../../repos/binutils-gdb/gdb/main.c:411
-0xaaaae080f1b7 captured_command_loop
-        ../../../repos/binutils-gdb/gdb/main.c:475
-0xaaaae0810b97 captured_main
-        ../../../repos/binutils-gdb/gdb/main.c:1318
-0xaaaae0810c1b _Z8gdb_mainP18captured_main_args
-        ../../../repos/binutils-gdb/gdb/main.c:1337
-0xaaaae0338453 main
-        ../../../repos/binutils-gdb/gdb/gdb.c:32
----------------------
-../../../repos/binutils-gdb/gdb/thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed.
-A problem internal to GDB has been detected,
-further debugging may prove unreliable.
-Quit this debugging session? (y or n)
-
-We also see failures across the testsuite if the tests get executed on a target
-that has native support for the pointer authentication feature. But
-gdb.base/break.exp and gdb.base/access-mem-running.exp are two examples of
-tests that run into errors and internal errors.
-
-This issue started after commit d88cb738e6a7a7179dfaff8af78d69250c852af1, which
-enabled more broad use of pointer authentication masks to remove non-address
-bits of pointers, but wasn't immediately detected because systems with native
-support for pointer authentication are not that common yet.
-
-The above crash happens because gdb is in the middle of handling an event,
-and do_target_wait_1 calls switch_to_inferior_no_thread, nullifying the
-current thread.  This means a call to inferior_thread () will assert, and
-attempting to call get_current_regcache () will also call inferior_thread (),
-resulting in an assertion as well.
-
-target_has_registers was one function that seemed useful for detecting these
-types of situation where we don't have a register cache. The problem with that
-is the inconsistent state of inferior_ptid, which is used by
-target_has_registers.
-
-Despite the call to switch_to_no_thread in switch_to_inferior_no_thread from
-do_target_wait_1 in the backtrace above clearing inferior_ptid, the call to
-ps_xfer_memory sets inferior_ptid momentarily before reading memory:
-
-static ps_err_e
-ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr,
-                gdb_byte *buf, size_t len, int write)
-{
-  scoped_restore_current_inferior restore_inferior;
-  set_current_inferior (ph->thread->inf);
-
-  scoped_restore_current_program_space restore_current_progspace;
-  set_current_program_space (ph->thread->inf->pspace);
-
-  scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
-  inferior_ptid = ph->thread->ptid;
-
-  CORE_ADDR core_addr = ps_addr_to_core_addr (addr);
-
-  int ret;
-  if (write)
-    ret = target_write_memory (core_addr, buf, len);
-  else
-    ret = target_read_memory (core_addr, buf, len);
-  return (ret == 0 ? PS_OK : PS_ERR);
-}
-
-Maybe this shouldn't happen, or maybe it is just an unfortunate state to be
-in. But this prevents the use of target_has_registers to guard against the
-lack of registers, since, although current_thread_ is still nullptr,
-inferior_ptid is valid and is not null_ptid.
-
-There is another crash scenario after we kill a previously active inferior, in
-which case the gdbarch will still say we support pointer authentication but we
-will also have no current thread (inferior_thread () will assert etc).
-
-If the target has support for pointer authentication, gdb needs to use
-a couple (or 4, for bare-metal) mask registers to mask off some bits of
-pointers, and for that it needs to access the registers.
-
-At some points, like the one from the backtrace above, there is no active
-thread/current regcache because gdb is in the middle of doing event handling
-and switching between threads.
-
-Simon suggested the use of inferior_ptid to fetch the register cache, as
-opposed to relying on the current register cache.  Though we need to make sure
-inferior_ptid is valid (not null_ptid), I think this works nicely.
-
-With inferior_ptid, we can do safety checks along the way, making sure we have
-a thread to fetch a register cache from and checking if the thread is actually
-stopped or running.
-
-The following patch implements this idea with safety checks to make sure we
-don't run into assertions or errors.  If any of the checks fail, we fallback to
-using a default mask to remove non-address bits of a pointer.
-
-I discussed with Pedro the possibility of caching the mask register values
-(which are per-process and can change mid-execution), but there isn't a good
-spot to cache those values. Besides, the mask registers can change constantly
-for bare-metal debugging when switching between exception levels.
-
-In some cases, it is just not possible to get access to these mask registers,
-like the case where threads are running. In those cases, using a default mask
-to remove the non-address bits should be enough.
-
-This can happen when we let threads run in the background and then we attempt
-to access a memory address (now that gdb is capable of reading memory even
-with threads running).  Thus gdb will attempt to remove non-address bits
-of that memory access, will attempt to access registers, running into errors.
-
-Regression-tested on aarch64-linux Ubuntu 20.04.
----
- gdb/aarch64-linux-tdep.c | 64 ++++++++++++++++++++++++++++++----------
- 1 file changed, 49 insertions(+), 15 deletions(-)
-
-diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
-index 20a041c599e..4b2915b8e99 100644
---- a/gdb/aarch64-linux-tdep.c
-+++ b/gdb/aarch64-linux-tdep.c
-@@ -57,6 +57,9 @@
- #include "elf/common.h"
- #include "elf/aarch64.h"
- 
-+/* For inferior_ptid and current_inferior ().  */
-+#include "inferior.h"
-+
- /* Signal frame handling.
- 
-       +------------+  ^
-@@ -1986,29 +1989,60 @@ aarch64_linux_decode_memtag_section (struct gdbarch *gdbarch,
- static CORE_ADDR
- aarch64_remove_non_address_bits (struct gdbarch *gdbarch, CORE_ADDR pointer)
- {
--  aarch64_gdbarch_tdep *tdep = gdbarch_tdep<aarch64_gdbarch_tdep> (gdbarch);
--
-   /* By default, we assume TBI and discard the top 8 bits plus the VA range
--     select bit (55).  */
-+     select bit (55).  Below we try to fetch information about pointer
-+     authentication masks in order to make non-address removal more
-+     precise.  */
-   CORE_ADDR mask = AARCH64_TOP_BITS_MASK;
- 
--  if (tdep->has_pauth ())
-+  /* Check if we have an inferior first.  If not, just use the default
-+     mask.
-+
-+     We use the inferior_ptid here because the pointer authentication masks
-+     should be the same across threads of a process.  Since we may not have
-+     access to the current thread (gdb may have switched to no inferiors
-+     momentarily), we use the inferior ptid.  */
-+  if (inferior_ptid != null_ptid)
-     {
--      /* Fetch the PAC masks.  These masks are per-process, so we can just
--	 fetch data from whatever thread we have at the moment.
-+      /* If we do have an inferior, attempt to fetch its thread's thread_info
-+	 struct.  */
-+      thread_info *thread
-+	= find_thread_ptid (current_inferior ()->process_target (),
-+			    inferior_ptid);
- 
--	 Also, we have both a code mask and a data mask.  For now they are the
--	 same, but this may change in the future.  */
--      struct regcache *regs = get_current_regcache ();
--      CORE_ADDR cmask, dmask;
-+      /* If the thread is running, we will not be able to fetch the mask
-+	 registers.  */
-+      if (thread != nullptr && thread->state != THREAD_RUNNING)
-+	{
-+	  /* Otherwise, fetch the register cache and the masks.  */
-+	  struct regcache *regs
-+	    = get_thread_regcache (current_inferior ()->process_target (),
-+				   inferior_ptid);
-+
-+	  /* Use the gdbarch from the register cache to check for pointer
-+	     authentication support, as it matches the features found in
-+	     that particular thread.  */
-+	  aarch64_gdbarch_tdep *tdep
-+	    = gdbarch_tdep<aarch64_gdbarch_tdep> (regs->arch ());
-+
-+	  /* Is there pointer authentication support?  */
-+	  if (tdep->has_pauth ())
-+	    {
-+	      /* We have both a code mask and a data mask.  For now they are
-+		 the same, but this may change in the future.  */
-+	      CORE_ADDR cmask, dmask;
- 
--      if (regs->cooked_read (tdep->pauth_reg_base, &dmask) != REG_VALID)
--	dmask = mask;
-+	      if (regs->cooked_read (tdep->pauth_reg_base, &dmask)
-+		  != REG_VALID)
-+		dmask = mask;
- 
--      if (regs->cooked_read (tdep->pauth_reg_base + 1, &cmask) != REG_VALID)
--	cmask = mask;
-+	      if (regs->cooked_read (tdep->pauth_reg_base + 1, &cmask)
-+		  != REG_VALID)
-+		cmask = mask;
- 
--      mask |= aarch64_mask_from_pac_registers (cmask, dmask);
-+	      mask |= aarch64_mask_from_pac_registers (cmask, dmask);
-+	    }
-+	}
-     }
- 
-   return aarch64_remove_top_bits (pointer, mask);
--- 
-2.34.1
-
diff --git a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch b/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch
deleted file mode 100644
index 32eba089bc2..00000000000
--- a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9a85132c4ba7d37a5df146239b3ab1a5854ce478 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 22 Feb 2023 16:24:07 -0800
-Subject: [PATCH] gdbserver/linux-low.cc: Fix a typo in ternary operator
-
-Upstream-Status: Submitted [https://sourceware.org/pipermail/gdb-patches/2023-February/197298.html]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- gdbserver/linux-low.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
-index 7e1de397893..95ec871d436 100644
---- a/gdbserver/linux-low.cc
-+++ b/gdbserver/linux-low.cc
-@@ -5390,7 +5390,7 @@ proc_xfer_memory (CORE_ADDR memaddr, unsigned char *readbuf,
-       if (lseek (fd, memaddr, SEEK_SET) != -1)
- 	bytes = (readbuf != nullptr
- 		 ? read (fd, readbuf, len)
--		 ? write (fd, writebuf, len));
-+		 : write (fd, writebuf, len));
- #endif
- 
-       if (bytes < 0)
diff --git a/meta/recipes-devtools/gdb/gdb_13.1.bb b/meta/recipes-devtools/gdb/gdb_13.2.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb_13.1.bb
rename to meta/recipes-devtools/gdb/gdb_13.2.bb
-- 
2.30.2

[PATCH 20/55] gnupg: upgrade 2.4.0 -> 2.4.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...e-a-custom-value-for-the-location-of-.patch |  6 +++---
 .../recipes-support/gnupg/gnupg/relocate.patch | 18 +++++++++---------
 .../gnupg/{gnupg_2.4.0.bb => gnupg_2.4.2.bb}   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.4.0.bb => gnupg_2.4.2.bb} (97%)

diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
index 0cd4c459070..81aeaf5d3a6 100644
--- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
@@ -1,4 +1,4 @@
-From 346a6b17a07b658954db65f814461b59824d9fcd Mon Sep 17 00:00:00 2001
+From 8b9e3d286e87bc978ec6bb9cfd790d8d253b79c3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 22 Jan 2018 18:00:21 +0200
 Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 099c6a8..e8cf408 100644
+index a547401..60bc2c5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1935,7 +1935,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
+@@ -1922,7 +1922,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
  
  AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
  
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 071dd93ff55..f7dd12fbcc1 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From b1117adeb476304ce2792814516a5b7cd44d0d38 Mon Sep 17 00:00:00 2001
+From c4ddea8e6070d1df51058aac08088e27c37e7e73 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Wed, 19 Sep 2018 14:44:40 +0100
 Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/common/homedir.c b/common/homedir.c
-index 67bbde8..7f360ba 100644
+index 286685f..212a945 100644
 --- a/common/homedir.c
 +++ b/common/homedir.c
-@@ -1171,7 +1171,7 @@ gnupg_socketdir (void)
+@@ -1213,7 +1213,7 @@ gnupg_socketdir (void)
    if (!name)
      {
        unsigned int dummy;
@@ -26,7 +26,7 @@ index 67bbde8..7f360ba 100644
        gpgrt_annotate_leaked_object (name);
      }
  
-@@ -1203,7 +1203,7 @@ gnupg_sysconfdir (void)
+@@ -1245,7 +1245,7 @@ gnupg_sysconfdir (void)
    if (dir)
      return dir;
    else
@@ -35,7 +35,7 @@ index 67bbde8..7f360ba 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1239,7 +1239,7 @@ gnupg_bindir (void)
+@@ -1281,7 +1281,7 @@ gnupg_bindir (void)
        return name;
      }
    else
@@ -44,7 +44,7 @@ index 67bbde8..7f360ba 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1266,7 +1266,7 @@ gnupg_libexecdir (void)
+@@ -1308,7 +1308,7 @@ gnupg_libexecdir (void)
        return name;
      }
    else
@@ -53,7 +53,7 @@ index 67bbde8..7f360ba 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1296,7 +1296,7 @@ gnupg_libdir (void)
+@@ -1338,7 +1338,7 @@ gnupg_libdir (void)
        return name;
      }
    else
@@ -62,7 +62,7 @@ index 67bbde8..7f360ba 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1327,7 +1327,7 @@ gnupg_datadir (void)
+@@ -1369,7 +1369,7 @@ gnupg_datadir (void)
        return name;
      }
    else
@@ -71,7 +71,7 @@ index 67bbde8..7f360ba 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1359,7 +1359,7 @@ gnupg_localedir (void)
+@@ -1401,7 +1401,7 @@ gnupg_localedir (void)
        return name;
      }
    else
diff --git a/meta/recipes-support/gnupg/gnupg_2.4.0.bb b/meta/recipes-support/gnupg/gnupg_2.4.2.bb
similarity index 97%
rename from meta/recipes-support/gnupg/gnupg_2.4.0.bb
rename to meta/recipes-support/gnupg/gnupg_2.4.2.bb
index 900aa8ad736..580782037e4 100644
--- a/meta/recipes-support/gnupg/gnupg_2.4.0.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.4.2.bb
@@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-
                                 file://relocate.patch"
 SRC_URI:append:class-nativesdk = " file://relocate.patch"
 
-SRC_URI[sha256sum] = "1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483"
+SRC_URI[sha256sum] = "97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \
-- 
2.30.2

[PATCH 21/55] gobject-introspection: upgrade 1.74.0 -> 1.76.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...01-Relocate-the-repository-directory-for-native-builds.patch | 2 +-
 ...-introspection_1.74.0.bb => gobject-introspection_1.76.1.bb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.74.0.bb => gobject-introspection_1.76.1.bb} (99%)

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index 030ff176010..9ba8bcfd71a 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
-From d396e5126461631e2c73ce98ba034f1e44598f6a Mon Sep 17 00:00:00 2001
+From 2c31944eabbb42a86a4ddaa2998a3b100a13138d Mon Sep 17 00:00:00 2001
 From: Sascha Silbe <x-yo17@se-silbe.de>
 Date: Fri, 8 Jun 2018 13:55:10 +0200
 Subject: [PATCH] Relocate the repository directory for native builds
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb
similarity index 99%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb
index d3a7ce2fd93..17748b9f496 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb
@@ -17,7 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
            file://0001-g-ir-tool-template.in-fix-girdir-path.patch \
            "
 
-SRC_URI[sha256sum] = "347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653"
+SRC_URI[sha256sum] = "196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf"
 
 SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
 
-- 
2.30.2

[PATCH 22/55] kmscube: upgrade to latest revision

[Alexander Kanavin]

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

diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb
index 67ac97b963d..ca76251d7ab 100644
--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -10,7 +10,7 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm"
 
 LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
 
-SRCREV = "345111481d654b38a72b5c3629151dc74f7a82bc"
+SRCREV = "cf4ec7f35521eb54d72ce0c92ce65b2249171cbd"
 SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https"
 UPSTREAM_CHECK_COMMITS = "1"
 
-- 
2.30.2

[PATCH 23/55] libmodulemd: upgrade 2.14.0 -> 2.15.0

[Alexander Kanavin]

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

diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
index 9e321346284..d3bef833062 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
 
 SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main"
 
-PV = "2.14.0"
-SRCREV = "ee80309bc766d781a144e6879419b29f444d94eb"
+PV = "2.15.0"
+SRCREV = "bfde7f2d04fbb22e26c9eb843e4ccc478762dd8d"
 
 S = "${WORKDIR}/git"
 
-- 
2.30.2

[PATCH 24/55] libuv: license file was split in two in the 1.45.0 version update

[Alexander Kanavin]

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

diff --git a/meta/recipes-connectivity/libuv/libuv_1.45.0.bb b/meta/recipes-connectivity/libuv/libuv_1.45.0.bb
index 45b3a96f120..456cb2f9624 100644
--- a/meta/recipes-connectivity/libuv/libuv_1.45.0.bb
+++ b/meta/recipes-connectivity/libuv/libuv_1.45.0.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "https://github.com/libuv/libuv"
 DESCRIPTION = "libuv is a multi-platform support library with a focus on asynchronous I/O. It was primarily developed for use by Node.js, but it's also used by Luvit, Julia, pyuv, and others."
 BUGTRACKER = "https://github.com/libuv/libuv/issues"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=74b6f2f7818a4e3a80d03556f71b129b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=74b6f2f7818a4e3a80d03556f71b129b \
+                    file://LICENSE-extra;md5=f9307417749e19bd1d6d68a394b49324"
 
 SRCREV = "96e05543f53b19d9642b4b0dd73b86ad3cea313e"
 SRC_URI = "git://github.com/libuv/libuv.git;branch=master;protocol=https"
-- 
2.30.2

[PATCH 25/55] libx11: upgrade 1.8.4 -> 1.8.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-lib/{libx11_1.8.4.bb => libx11_1.8.5.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-lib/{libx11_1.8.4.bb => libx11_1.8.5.bb} (92%)

diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.5.bb
similarity index 92%
rename from meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb
rename to meta/recipes-graphics/xorg-lib/libx11_1.8.5.bb
index 9058c1844ec..cf2e29471a9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.5.bb
@@ -24,7 +24,7 @@ XORG_PN = "libX11"
 
 SRC_URI += "file://disable_tests.patch"
 
-SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518"
+SRC_URI[sha256sum] = "e362c6f03c793171becd1ce2078c64789504c7d7ff48ee40a76ff76b59f6b561"
 
 inherit gettext
 
-- 
2.30.2

[PATCH 26/55] libxcrypt: upgrade 4.4.33 -> 4.4.34

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...{libxcrypt-compat_4.4.33.bb => libxcrypt-compat_4.4.34.bb} | 0
 meta/recipes-core/libxcrypt/libxcrypt.inc                     | 4 ++--
 .../libxcrypt/{libxcrypt_4.4.33.bb => libxcrypt_4.4.34.bb}    | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.33.bb => libxcrypt-compat_4.4.34.bb} (100%)
 rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.33.bb => libxcrypt_4.4.34.bb} (100%)

diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb
rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
index 61b03810763..4d145cf3ccd 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
 inherit autotools pkgconfig
 
 SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
-SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175"
-SRCBRANCH ?= "develop"
+SRCREV = "e80cfde51bb4fe4bcf27585810e0b4ea3d1e4d7d"
+SRCBRANCH ?= "master"
 
 SRC_URI += "file://fix_cflags_handling.patch"
 
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb
rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb
-- 
2.30.2

[PATCH 27/55] libxslt: upgrade 1.1.37 -> 1.1.38

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libxslt/{libxslt_1.1.37.bb => libxslt_1.1.38.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/libxslt/{libxslt_1.1.37.bb => libxslt_1.1.38.bb} (95%)

diff --git a/meta/recipes-support/libxslt/libxslt_1.1.37.bb b/meta/recipes-support/libxslt/libxslt_1.1.38.bb
similarity index 95%
rename from meta/recipes-support/libxslt/libxslt_1.1.37.bb
rename to meta/recipes-support/libxslt/libxslt_1.1.38.bb
index 361bb0f8dc9..bf35a94b7f0 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.37.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.38.bb
@@ -15,7 +15,7 @@ DEPENDS = "libxml2"
 
 SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4"
+SRC_URI[sha256sum] = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1"
 
 UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
 
-- 
2.30.2

[PATCH 28/55] linux-firmware: upgrade 20230404 -> 20230515

[Alexander Kanavin]

License-Update: additional firmwares

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...{linux-firmware_20230404.bb => linux-firmware_20230515.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20230404.bb => linux-firmware_20230515.bb} (99%)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb
index 7412c022ba9..34701312942 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb
@@ -134,7 +134,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     "
 # WHENCE checksum is defined separately to ease overriding it if
 # class-devupstream is selected.
-WHENCE_CHKSUM  = "0782deea054d4b1b7f10c92c3a245da4"
+WHENCE_CHKSUM  = "a0997fc7a9af4e46d96529d6ef13b58a"
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
 # so that the license files will be copied from fetched source
@@ -212,7 +212,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
 # Pin this to the 20220509 release, override this in local.conf
 SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
 
-SRC_URI[sha256sum] = "c3f9ad2bb5311cce2490f37a8052f836703d6936aabd840246b6576f1f71f607"
+SRC_URI[sha256sum] = "8b1acfa16f1ee94732a6acb50d9d6c835cf53af11068bd89ed207bbe04a1e951"
 
 inherit allarch
 
-- 
2.30.2

[PATCH 29/55] ltp: upgrade 20230127 -> 20230516

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-syscalls-fcntl-define-_LARGEFILE64_.patch | 28 +++++++++++++++++++
 .../ltp/{ltp_20230127.bb => ltp_20230516.bb}  |  3 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch
 rename meta/recipes-extended/ltp/{ltp_20230127.bb => ltp_20230516.bb} (97%)

diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch
new file mode 100644
index 00000000000..dbe63f21708
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch
@@ -0,0 +1,28 @@
+From f4f75ce9218b469d91b536218de3323977edc529 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Tue, 13 Jun 2023 15:10:33 +0200
+Subject: [PATCH] testcases/kernel/syscalls/fcntl: define _LARGEFILE64_SOURCE
+
+This is required for off64_t to be available on musl systems.
+
+Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/1047]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ testcases/kernel/syscalls/fcntl/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testcases/kernel/syscalls/fcntl/Makefile b/testcases/kernel/syscalls/fcntl/Makefile
+index df663a50a..aac774111 100644
+--- a/testcases/kernel/syscalls/fcntl/Makefile
++++ b/testcases/kernel/syscalls/fcntl/Makefile
+@@ -17,6 +17,6 @@ include $(abs_srcdir)/../utils/newer_64.mk
+ 
+ %_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64
+ 
+-CPPFLAGS		+= -D_GNU_SOURCE
++CPPFLAGS		+= -D_GNU_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
+-- 
+2.30.2
+
diff --git a/meta/recipes-extended/ltp/ltp_20230127.bb b/meta/recipes-extended/ltp/ltp_20230516.bb
similarity index 97%
rename from meta/recipes-extended/ltp/ltp_20230127.bb
rename to meta/recipes-extended/ltp/ltp_20230516.bb
index 4325aa6672c..ddc6523e302 100644
--- a/meta/recipes-extended/ltp/ltp_20230127.bb
+++ b/meta/recipes-extended/ltp/ltp_20230516.bb
@@ -24,11 +24,12 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse"
 
 CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "dd2d61ac1a1e09797a6165f478abd4a9f4f43035"
+SRCREV = "3ebc2dfa85c2445bb68d8c0d66e33c4da1e1b3a7"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
            file://0001-Remove-OOM-tests-from-runtest-mm.patch \
            file://disable_hanging_tests.patch \
+           file://0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch \
            "
 
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 30/55] mesa: upgrade 23.0.3 -> 23.1.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ld-check-for-all-linux-host_os-combinations.patch | 12 ++++++------
 .../mesa/{mesa-gl_23.0.3.bb => mesa-gl_23.1.1.bb}    |  0
 meta/recipes-graphics/mesa/mesa.inc                  |  2 +-
 .../mesa/{mesa_23.0.3.bb => mesa_23.1.1.bb}          |  0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_23.0.3.bb => mesa-gl_23.1.1.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_23.0.3.bb => mesa_23.1.1.bb} (100%)

diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 36c33f889bf..a555c5f865c 100644
--- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,4 +1,4 @@
-From 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001
+From b251af67df5a6840d2e9cc06edae2c387f8778f1 Mon Sep 17 00:00:00 2001
 From: Alistair Francis <alistair@alistair23.me>
 Date: Thu, 14 Nov 2019 13:04:49 -0800
 Subject: [PATCH] meson.build: check for all linux host_os combinations
@@ -20,19 +20,19 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 172c64a..9b5294c 100644
+index 22385d8..15f48a6 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -121,7 +121,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
  # Only build shared_glapi if at least one OpenGL API is enabled
  with_shared_glapi = with_shared_glapi and with_any_opengl
  
 -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system())
 +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux')
  
- with_freedreno_kgsl = get_option('freedreno-kgsl')
- if with_freedreno_kgsl
-@@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray')
+ gallium_drivers = get_option('gallium-drivers')
+ if gallium_drivers.contains('auto')
+@@ -909,7 +909,7 @@ if cc.has_function('fmemopen')
  endif
  
  # TODO: this is very incomplete
diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb
rename to meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 439389fb8a9..ac42a8dd4f3 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -19,7 +19,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            "
 
-SRC_URI[sha256sum] = "386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5"
+SRC_URI[sha256sum] = "a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta/recipes-graphics/mesa/mesa_23.0.3.bb b/meta/recipes-graphics/mesa/mesa_23.1.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_23.0.3.bb
rename to meta/recipes-graphics/mesa/mesa_23.1.1.bb
-- 
2.30.2

[PATCH 31/55] meson: upgrade 1.1.0 -> 1.1.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/meson/{meson_1.1.0.bb => meson_1.1.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/meson/{meson_1.1.0.bb => meson_1.1.1.bb} (98%)

diff --git a/meta/recipes-devtools/meson/meson_1.1.0.bb b/meta/recipes-devtools/meson/meson_1.1.1.bb
similarity index 98%
rename from meta/recipes-devtools/meson/meson_1.1.0.bb
rename to meta/recipes-devtools/meson/meson_1.1.1.bb
index 1190d5c34d9..500e13775f4 100644
--- a/meta/recipes-devtools/meson/meson_1.1.0.bb
+++ b/meta/recipes-devtools/meson/meson_1.1.1.bb
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
            file://0001-Make-CPU-family-warnings-fatal.patch \
            file://0002-Support-building-allarch-recipes-again.patch \
            "
-SRC_URI[sha256sum] = "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f"
+SRC_URI[sha256sum] = "d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c"
 
 inherit python_setuptools_build_meta github-releases
 
-- 
2.30.2

[PATCH 32/55] mmc-utils: upgrade to latest revision

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index 1e2e17bfd3e..373ada2026a 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d"
 
 SRCBRANCH ?= "master"
-SRCREV = "d4c2910981ff99b983734426dfa99632fb81ac6b"
+SRCREV = "958227890690290ee766aaad1b92f3413f67048c"
 
 PV = "0.1+git${SRCPV}"
 
-- 
2.30.2

[PATCH 33/55] nettle: upgrade 3.8.1 -> 3.9

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-support/nettle/{nettle_3.8.1.bb => nettle_3.9.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/nettle/{nettle_3.8.1.bb => nettle_3.9.bb} (96%)

diff --git a/meta/recipes-support/nettle/nettle_3.8.1.bb b/meta/recipes-support/nettle/nettle_3.9.bb
similarity index 96%
rename from meta/recipes-support/nettle/nettle_3.8.1.bb
rename to meta/recipes-support/nettle/nettle_3.9.bb
index 92cc966dbba..7a5bdb2a038 100644
--- a/meta/recipes-support/nettle/nettle_3.8.1.bb
+++ b/meta/recipes-support/nettle/nettle_3.9.bb
@@ -20,7 +20,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://check-header-files-of-openssl-only-if-enable_.patch \
            "
 
-SRC_URI[sha256sum] = "364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe"
+SRC_URI[sha256sum] = "0ee7adf5a7201610bb7fe0acbb7c9b3be83be44904dd35ebbcd965cd896bfeaa"
 
 UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
 
-- 
2.30.2

[PATCH 34/55] nghttp2: upgrade 1.52.0 -> 1.53.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../nghttp2/{nghttp2_1.52.0.bb => nghttp2_1.53.0.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/nghttp2/{nghttp2_1.52.0.bb => nghttp2_1.53.0.bb} (91%)

diff --git a/meta/recipes-support/nghttp2/nghttp2_1.52.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.53.0.bb
similarity index 91%
rename from meta/recipes-support/nghttp2/nghttp2_1.52.0.bb
rename to meta/recipes-support/nghttp2/nghttp2_1.53.0.bb
index f57a15954d8..88d5f31083a 100644
--- a/meta/recipes-support/nghttp2/nghttp2_1.52.0.bb
+++ b/meta/recipes-support/nghttp2/nghttp2_1.53.0.bb
@@ -8,7 +8,7 @@ SRC_URI = "\
     ${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz \
     file://0001-fetch-ocsp-response-use-python3.patch \
 "
-SRC_URI[sha256sum] = "3ea9f0439e60469ad4d39cb349938684ffb929dd7e8e06a7bffe9f9d21f8ba7d"
+SRC_URI[sha256sum] = "b867184254e5a29b0ba68413aa14f8b0ce1142a371761374598dec092dabb809"
 
 inherit cmake manpages python3native github-releases
 PACKAGECONFIG[manpages] = ""
-- 
2.30.2

[PATCH 35/55] parted: upgrade 3.5 -> 3.6

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/parted/{parted_3.5.bb => parted_3.6.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/parted/{parted_3.5.bb => parted_3.6.bb} (96%)

diff --git a/meta/recipes-extended/parted/parted_3.5.bb b/meta/recipes-extended/parted/parted_3.6.bb
similarity index 96%
rename from meta/recipes-extended/parted/parted_3.5.bb
rename to meta/recipes-extended/parted/parted_3.6.bb
index ea2b68bbd81..05d57507fbd 100644
--- a/meta/recipes-extended/parted/parted_3.5.bb
+++ b/meta/recipes-extended/parted/parted_3.6.bb
@@ -11,7 +11,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
            file://run-ptest \
            "
 
-SRC_URI[sha256sum] = "4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2"
+SRC_URI[sha256sum] = "3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612"
 
 inherit autotools pkgconfig gettext texinfo ptest
 
-- 
2.30.2

[PATCH 36/55] puzzles: upgrade to latest revision

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-sato/puzzles/puzzles_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 4b045886826..960b5d3b110 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main;protocol=https"
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "5a491c5ad333ef34c1e7713f920f51cbb205af60"
+SRCREV = "b6c842a28cf6597df063fcff35079c3e3982381e"
 PE = "2"
 PV = "0.0+git${SRCPV}"
 
-- 
2.30.2

[PATCH 37/55] python3: upgrade 3.11.2 -> 3.11.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Don-t-search-system-for-headers-libraries.patch        | 2 +-
 ...1-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch | 2 +-
 .../python3/12-distutils-prefix-is-inside-staging-area.patch    | 2 +-
 .../python/{python3_3.11.2.bb => python3_3.11.3.bb}             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python3_3.11.2.bb => python3_3.11.3.bb} (99%)

diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
index 96e5e813424..c9253832cfb 100644
--- a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
+++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
@@ -1,4 +1,4 @@
-From 7d296dc635ad3ac2792955ce37e140a4104b098f Mon Sep 17 00:00:00 2001
+From 6cb667f37beacd832cb409e5244b3c90dfad32f7 Mon Sep 17 00:00:00 2001
 From: Jeremy Puhlman <jpuhlman@mvista.com>
 Date: Wed, 4 Mar 2020 00:06:42 +0000
 Subject: [PATCH] Don't search system for headers/libraries
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
index 86971f40482..d5b7ce2b95b 100644
--- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
@@ -1,4 +1,4 @@
-From cab8b8b1390165a93dfb27c48c1cc4c3e4280dfd Mon Sep 17 00:00:00 2001
+From 4ed481f4928c361970e78f27c4d9be8700af176b Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 10 Sep 2021 12:28:31 +0200
 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index e080b5c5629..5ee4e4f126f 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,4 +1,4 @@
-From 79e7ed59750612e57647847957ab85709307ea38 Mon Sep 17 00:00:00 2001
+From 4c39252c71d8bca81fdc43753c83a59f8668c619 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 14 May 2013 15:00:26 -0700
 Subject: [PATCH] python3: Add target and native recipes
diff --git a/meta/recipes-devtools/python/python3_3.11.2.bb b/meta/recipes-devtools/python/python3_3.11.3.bb
similarity index 99%
rename from meta/recipes-devtools/python/python3_3.11.2.bb
rename to meta/recipes-devtools/python/python3_3.11.3.bb
index 421a305e22f..c7974849b60 100644
--- a/meta/recipes-devtools/python/python3_3.11.2.bb
+++ b/meta/recipes-devtools/python/python3_3.11.3.bb
@@ -39,7 +39,7 @@ SRC_URI:append:class-native = " \
            file://12-distutils-prefix-is-inside-staging-area.patch \
            file://0001-Don-t-search-system-for-headers-libraries.patch \
            "
-SRC_URI[sha256sum] = "29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af"
+SRC_URI[sha256sum] = "8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
-- 
2.30.2

[PATCH 38/55] python3-certifi: upgrade 2022.12.7 -> 2023.5.7

[Alexander Kanavin]

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

diff --git a/meta/recipes-devtools/python/python3-certifi_2022.12.7.bb b/meta/recipes-devtools/python/python3-certifi_2023.5.7.bb
similarity index 86%
rename from meta/recipes-devtools/python/python3-certifi_2022.12.7.bb
rename to meta/recipes-devtools/python/python3-certifi_2023.5.7.bb
index b2e3ec125af..924b05c12cb 100644
--- a/meta/recipes-devtools/python/python3-certifi_2022.12.7.bb
+++ b/meta/recipes-devtools/python/python3-certifi_2023.5.7.bb
@@ -7,7 +7,7 @@ HOMEPAGE = " http://certifi.io/"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3c2b7404369c587c3559afb604fce2f2"
 
-SRC_URI[sha256sum] = "35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"
+SRC_URI[sha256sum] = "0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7"
 
 inherit pypi setuptools3
 
-- 
2.30.2

[PATCH 39/55] python3-docutils: upgrade 0.19 -> 0.20.1

[Alexander Kanavin]

License-Update: formatting

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{python3-docutils_0.19.bb => python3-docutils_0.20.1.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-docutils_0.19.bb => python3-docutils_0.20.1.bb} (62%)

diff --git a/meta/recipes-devtools/python/python3-docutils_0.19.bb b/meta/recipes-devtools/python/python3-docutils_0.20.1.bb
similarity index 62%
rename from meta/recipes-devtools/python/python3-docutils_0.19.bb
rename to meta/recipes-devtools/python/python3-docutils_0.20.1.bb
index 7ae93ab557b..65ca55e07bf 100644
--- a/meta/recipes-devtools/python/python3-docutils_0.19.bb
+++ b/meta/recipes-devtools/python/python3-docutils_0.20.1.bb
@@ -2,9 +2,9 @@ SUMMARY = "Docutils is a modular system for processing documentation into useful
 HOMEPAGE = "http://docutils.sourceforge.net"
 SECTION = "devel/python"
 LICENSE = "PSF-2.0 & BSD-2-Clause & GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=41001b296a89bb2780bbe306e947ecee"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=08f5f8aa6a1db2500c08a2bb558e45af"
 
-SRC_URI[sha256sum] = "33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6"
+SRC_URI[sha256sum] = "f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b"
 
 inherit pypi setuptools3
 
-- 
2.30.2

[PATCH 40/55] python3-flit-core: upgrade 3.8.0 -> 3.9.0

[Alexander Kanavin]

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

diff --git a/meta/recipes-devtools/python/python3-flit-core_3.8.0.bb b/meta/recipes-devtools/python/python3-flit-core_3.9.0.bb
similarity index 92%
rename from meta/recipes-devtools/python/python3-flit-core_3.8.0.bb
rename to meta/recipes-devtools/python/python3-flit-core_3.9.0.bb
index 2e5b1e80695..b0bef4b6b69 100644
--- a/meta/recipes-devtools/python/python3-flit-core_3.8.0.bb
+++ b/meta/recipes-devtools/python/python3-flit-core_3.9.0.bb
@@ -8,7 +8,7 @@ BUGTRACKER = "https://github.com/pypa/flit/issues"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=41eb78fa8a872983a882c694a8305f08"
 
-SRC_URI[sha256sum] = "d0f2a8f4bd45dc794befbf5839ecc0fd3830d65a57bd52b5997542fac5d5e937"
+SRC_URI[sha256sum] = "d75edf5eb324da20d53570a6a6f87f51e606eee8384925cd66a90611140844c7"
 
 inherit pypi python_flit_core
 
-- 
2.30.2

[PATCH 41/55] python3-importlib-metadata: upgrade 6.2.0 -> 6.6.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ib-metadata_6.2.0.bb => python3-importlib-metadata_6.6.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-importlib-metadata_6.2.0.bb => python3-importlib-metadata_6.6.0.bb} (88%)

diff --git a/meta/recipes-devtools/python/python3-importlib-metadata_6.2.0.bb b/meta/recipes-devtools/python/python3-importlib-metadata_6.6.0.bb
similarity index 88%
rename from meta/recipes-devtools/python/python3-importlib-metadata_6.2.0.bb
rename to meta/recipes-devtools/python/python3-importlib-metadata_6.6.0.bb
index 3e9b40ee9d4..34bc55b0e13 100644
--- a/meta/recipes-devtools/python/python3-importlib-metadata_6.2.0.bb
+++ b/meta/recipes-devtools/python/python3-importlib-metadata_6.6.0.bb
@@ -8,7 +8,7 @@ inherit pypi python_setuptools_build_meta
 PYPI_PACKAGE = "importlib_metadata"
 UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/"
 
-SRC_URI[sha256sum] = "9127aad2f49d7203e7112098c12b92e4fd1061ccd18548cdfdc49171a8c073cc"
+SRC_URI[sha256sum] = "92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705"
 
 S = "${WORKDIR}/importlib_metadata-${PV}"
 
-- 
2.30.2

[PATCH 42/55] python3-pyasn1: upgrade 0.4.8 -> 0.5.0

[Alexander Kanavin]

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../recipes-devtools/python/python-pyasn1.inc | 10 +++----
 ...arning-__int__-returned-non-int-on-P.patch | 28 -------------------
 ...yasn1_0.4.8.bb => python3-pyasn1_0.5.0.bb} |  1 +
 3 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch
 rename meta/recipes-devtools/python/{python3-pyasn1_0.4.8.bb => python3-pyasn1_0.5.0.bb} (98%)

diff --git a/meta/recipes-devtools/python/python-pyasn1.inc b/meta/recipes-devtools/python/python-pyasn1.inc
index 126d0388efa..9eb87354cf3 100644
--- a/meta/recipes-devtools/python/python-pyasn1.inc
+++ b/meta/recipes-devtools/python/python-pyasn1.inc
@@ -1,10 +1,9 @@
 SUMMARY = "Python library implementing ASN.1 types."
 HOMEPAGE = "http://pyasn1.sourceforge.net/"
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=a14482d15c2249de3b6f0e8a47e021fd"
+LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=190f79253908c986e6cacf380c3a5f6d"
 
-SRC_URI[md5sum] = "dffae4ff9f997a83324b3f33fe62be54"
-SRC_URI[sha256sum] = "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"
+SRC_URI[sha256sum] = "97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde"
 
 RDEPENDS:${PN}:class-target += " \
     ${PYTHON_PN}-codecs \
@@ -18,9 +17,8 @@ BBCLASSEXTEND = "native nativesdk"
 inherit ptest
 
 SRC_URI += " \
-	file://run-ptest \
-	file://0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch \
-"
+       file://run-ptest \
+           "
 
 RDEPENDS:${PN}-ptest += " \
 	${PYTHON_PN}-pytest \
diff --git a/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch b/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch
deleted file mode 100644
index 30ac9a66843..00000000000
--- a/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From db8f1a7930c6b5826357646746337dafc983f953 Mon Sep 17 00:00:00 2001
-From: Ilya Etingof <etingof@gmail.com>
-Date: Sat, 21 Mar 2020 19:05:03 +0100
-Subject: [PATCH] Fix `DeprecationWarning: __int__ returned non-int` on Py3
-
-In `BitString.__int__()`
-Upstream-Status: Backport
-Signed-off-by: Yulong Liu <yulong.liu@windriver.com>
----
- pyasn1/type/univ.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py
-index 10924c3..488241f 100644
---- a/pyasn1/type/univ.py
-+++ b/pyasn1/type/univ.py
-@@ -551,7 +551,7 @@ class BitString(base.SimpleAsn1Type):
-         return self.clone(SizedInteger(self._value >> count).setBitLength(max(0, len(self._value) - count)))
- 
-     def __int__(self):
--        return self._value
-+        return int(self._value)
- 
-     def __float__(self):
-         return float(self._value)
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/python/python3-pyasn1_0.4.8.bb b/meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb
similarity index 98%
rename from meta/recipes-devtools/python/python3-pyasn1_0.4.8.bb
rename to meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb
index a5e2a713626..0519ba5edb0 100644
--- a/meta/recipes-devtools/python/python3-pyasn1_0.4.8.bb
+++ b/meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb
@@ -1,2 +1,3 @@
 inherit pypi setuptools3
 require python-pyasn1.inc
+
-- 
2.30.2

[PATCH 43/55] python3-pyopenssl: upgrade 23.1.1 -> 23.2.0

[Alexander Kanavin]

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

diff --git a/meta/recipes-devtools/python/python3-pyopenssl_23.1.1.bb b/meta/recipes-devtools/python/python3-pyopenssl_23.2.0.bb
similarity index 86%
rename from meta/recipes-devtools/python/python3-pyopenssl_23.1.1.bb
rename to meta/recipes-devtools/python/python3-pyopenssl_23.2.0.bb
index 90a6252f7c1..86ae406ffb3 100644
--- a/meta/recipes-devtools/python/python3-pyopenssl_23.1.1.bb
+++ b/meta/recipes-devtools/python/python3-pyopenssl_23.2.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 DEPENDS += "openssl ${PYTHON_PN}-cryptography"
 
-SRC_URI[sha256sum] = "841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7"
+SRC_URI[sha256sum] = "276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac"
 
 PYPI_PACKAGE = "pyOpenSSL"
 inherit pypi setuptools3
-- 
2.30.2

[PATCH 44/55] python3-sphinx: remove BSD-3-Clause from LICENSE

[Alexander Kanavin]

License-Update: BSD-3-Clause code removed in
https://github.com/sphinx-doc/sphinx/commit/a7f5d91c29d6f377b9fe7e926965c6f9d3e7b802
which was a part of 7.0.1 update

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/python/python3-sphinx_7.0.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb b/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb
index 7af45828612..10e01a2d7ae 100644
--- a/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb
+++ b/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Python documentation generator"
 HOMEPAGE = "http://sphinx-doc.org/"
 SECTION = "devel/python"
-LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause"
+LICENSE = "BSD-2-Clause & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb6ac1b115a1ed24a12d9f15b633993"
 
 PYPI_PACKAGE = "Sphinx"
-- 
2.30.2

[PATCH 45/55] serf: upgrade 1.3.9 -> 1.3.10

[Alexander Kanavin]

As serf is undead, we need to reassess all the remaining patches.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...print-in-the-scons-file-to-unbreak-b.patch | 29 -------------------
 ...sl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 28 ------------------
 ...11083-fix-building-with-scons-3.0.0-.patch | 29 -------------------
 ...ories.without.sandbox-install.prefix.patch |  2 +-
 .../serf/{serf_1.3.9.bb => serf_1.3.10.bb}    |  6 +---
 5 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100644 meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch
 delete mode 100644 meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
 delete mode 100644 meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch
 rename meta/recipes-support/serf/{serf_1.3.9.bb => serf_1.3.10.bb} (78%)

diff --git a/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch b/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch
deleted file mode 100644
index 4a5832ac1a5..00000000000
--- a/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 99f6e1b0d68281b63218d6adfe68cd9e331ac5be Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 3 Sep 2018 10:50:08 -0700
-Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building
- with most recent scons version.
-
-* SConstruct Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python
-  3.0 and 2.7.
-
-Upstream-Status: Backport
-[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1809132&r2=1811083&diff_format=h]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 1670459..18a45fa 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -184,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
- 
- unknown = opts.UnknownVariables()
- if unknown:
--  print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
-+  print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
- 
- apr = str(env['APR'])
- apu = str(env['APU'])
diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
deleted file mode 100644
index 91ccc8a474a..00000000000
--- a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2f45711a66ff99886b6e4a5708e2db01a63e5af4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 10 Sep 2021 11:05:10 +0200
-Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC
-
-Upstream removed it in
-https://github.com/openssl/openssl/pull/16004
-
-Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- buckets/ssl_buckets.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
-index b01e535..9801f87 100644
---- a/buckets/ssl_buckets.c
-+++ b/buckets/ssl_buckets.c
-@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey)
-                 return 0;
-             }
-             else {
--                printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err),
--                       ERR_GET_FUNC(err),
-+                printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err),
-                        ERR_GET_REASON(err));
-                 PKCS12_free(p12);
-                 bio_meth_free(biom);
diff --git a/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch b/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch
deleted file mode 100644
index 02fa9e3a062..00000000000
--- a/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 565211fd082ef653ca9c44a345350fc1451f5a0f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 3 Sep 2018 11:12:38 -0700
-Subject: [PATCH] Follow-up to r1811083 fix building with scons 3.0.0 and
- Python3
-
-* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid
-  TypeError: cannot use a string pattern on a bytes-like object
-
-Upstream-Status: Backport
-[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1811088&r2=1814604]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 877731e..7678bb1 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -169,7 +169,7 @@ env.Append(BUILDERS = {
- match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
-                   'SERF_MINOR_VERSION ([0-9]+).*'
-                   'SERF_PATCH_VERSION ([0-9]+)',
--                  env.File('serf.h').get_contents(),
-+                  env.File('serf.h').get_contents().decode('utf-8'),
-                   re.DOTALL)
- MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
- env.Append(MAJOR=str(MAJOR))
diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
index 4105868a7e2..91640d60443 100644
--- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
+++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
@@ -31,7 +31,7 @@ ERROR: scons install execution failed.
   and the installed paths (including the paths inside libserf*.pc)
   look correct
 
-Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019]
+Upstream-Status: Pending
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 
diff --git a/meta/recipes-support/serf/serf_1.3.9.bb b/meta/recipes-support/serf/serf_1.3.10.bb
similarity index 78%
rename from meta/recipes-support/serf/serf_1.3.9.bb
rename to meta/recipes-support/serf/serf_1.3.10.bb
index 669f42b8e7c..c6b51452aa3 100644
--- a/meta/recipes-support/serf/serf_1.3.9.bb
+++ b/meta/recipes-support/serf/serf_1.3.10.bb
@@ -7,16 +7,12 @@ HOMEPAGE = "http://serf.apache.org/"
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://norpath.patch \
            file://env.patch \
-           file://0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch \
            file://0002-SConstruct-Fix-path-quoting-for-.def-generator.patch \
            file://0003-gen_def.patch \
-           file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \
            file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \
-           file://0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch \
            "
 
-SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57"
-SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc"
+SRC_URI[sha256sum] = "be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-- 
2.30.2

[PATCH 46/55] shaderc: upgrade 2023.2 -> 2023.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...isable-building-external-dependencies.patch | 18 ++++++++----------
 .../{shaderc_2023.2.bb => shaderc_2023.4.bb}   |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)
 rename meta/recipes-graphics/shaderc/{shaderc_2023.2.bb => shaderc_2023.4.bb} (95%)

diff --git a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch
index cc9a4000281..35855bd8326 100644
--- a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch
+++ b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch
@@ -1,7 +1,7 @@
-From 071a9d71bea91bbefcf15e061fc87e53568f3188 Mon Sep 17 00:00:00 2001
+From d3fbd6b9427f29606540528d17fe02930cd78d0c Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <quaresma.jose@gmail.com>
 Date: Sat, 13 Feb 2021 00:45:56 +0000
-Subject: [PATCH 1/3] cmake: disable building external dependencies
+Subject: [PATCH] cmake: disable building external dependencies
 
 - add cmake option to disable the build of the third_party dependencies
 - change the update_build_version.py to use pkg-config when third_party dependencies not found
@@ -9,24 +9,25 @@ Subject: [PATCH 1/3] cmake: disable building external dependencies
 Upstream-Status: Inappropriate [OE-core specific]
 
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
+
 ---
  CMakeLists.txt                | 13 ++++++++++---
  utils/update_build_version.py | 22 +++++++++++++++-------
  2 files changed, 25 insertions(+), 10 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c74cd8..b358f6b 100644
+index 633c244..75b01da 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -41,6 +41,7 @@ else()
+@@ -67,6 +67,7 @@ else()
  endif()
  
  option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON)
 +option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON)
  
- set (CMAKE_CXX_STANDARD 11)
+ set (CMAKE_CXX_STANDARD 17)
  
-@@ -101,8 +102,14 @@ endif(MSVC)
+@@ -129,8 +130,14 @@ endif(MSVC)
  
  
  # Configure subdirectories.
@@ -43,7 +44,7 @@ index 5c74cd8..b358f6b 100644
  
  add_subdirectory(libshaderc_util)
  add_subdirectory(libshaderc)
-@@ -112,7 +119,7 @@ add_subdirectory(examples)
+@@ -142,7 +149,7 @@ endif()
  add_custom_target(build-version
    ${PYTHON_EXECUTABLE}
    ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
@@ -104,6 +105,3 @@ index 5785390..f72b762 100755
      mkdir_p(os.path.dirname(output_file))
  
      if os.path.isfile(output_file):
--- 
-2.30.1
-
diff --git a/meta/recipes-graphics/shaderc/shaderc_2023.2.bb b/meta/recipes-graphics/shaderc/shaderc_2023.4.bb
similarity index 95%
rename from meta/recipes-graphics/shaderc/shaderc_2023.2.bb
rename to meta/recipes-graphics/shaderc/shaderc_2023.4.bb
index 07fae0bb7ec..739e7ae81c9 100644
--- a/meta/recipes-graphics/shaderc/shaderc_2023.2.bb
+++ b/meta/recipes-graphics/shaderc/shaderc_2023.4.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-SRCREV = "55f4bbd993de3a3cad34cb41cd07b82fa1c77dd6"
+SRCREV = "7a8b3da0583425cf511336cf3afbdcf2ebc8b36b"
 SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \
            file://0001-cmake-disable-building-external-dependencies.patch \
            file://0002-libshaderc_util-fix-glslang-header-file-location.patch \
-- 
2.30.2

[PATCH 47/55] squashfs-tools: upgrade 4.5.1 -> 4.6.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ....sh-do-not-write-original-timestamps.patch | 30 -------------------
 .../squashfs-tools/squashfs-tools_git.bb      |  8 ++---
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch

diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch b/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch
deleted file mode 100644
index ed1d2f5b3b2..00000000000
--- a/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b44b00dae195d8587857c7e8054e9be4eaa1f8b3 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Thu, 7 Apr 2022 09:26:09 +0200
-Subject: [PATCH] install-manpages.sh: do not write original timestamps into
- .gz metadata
-
-This helps binary reproducibility.
-
-Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/177]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- generate-manpages/install-manpages.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/generate-manpages/install-manpages.sh b/generate-manpages/install-manpages.sh
-index d4c9e91..6a43b89 100755
---- a/generate-manpages/install-manpages.sh
-+++ b/generate-manpages/install-manpages.sh
-@@ -56,7 +56,7 @@ for i in mksquashfs unsquashfs sqfstar sqfscat; do
- 		exit 1
- 	fi
- 
--	if ! gzip -f9 $2/$i.1; then
-+	if ! gzip -n -f9 $2/$i.1; then
- 		echo "$0: Compressing installed manpage failed.  Aborting" >&2
- 		exit 1
- 	fi
--- 
-2.30.2
-
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 4e009d26255..982a43f8899 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -7,11 +7,9 @@ SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-PV = "4.5.1"
-SRCREV = "afdd63fc386919b4aa40d573b0a6069414d14317"
-SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master \
-           file://0001-install-manpages.sh-do-not-write-original-timestamps.patch \
-           "
+PV = "4.6.1"
+SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184"
+SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=v6.1.1"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 48/55] strace: upgrade 6.2 -> 6.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/strace/{strace_6.2.bb => strace_6.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/strace/{strace_6.2.bb => strace_6.3.bb} (96%)

diff --git a/meta/recipes-devtools/strace/strace_6.2.bb b/meta/recipes-devtools/strace/strace_6.3.bb
similarity index 96%
rename from meta/recipes-devtools/strace/strace_6.2.bb
rename to meta/recipes-devtools/strace/strace_6.3.bb
index dc01b57d80e..ae614716720 100644
--- a/meta/recipes-devtools/strace/strace_6.2.bb
+++ b/meta/recipes-devtools/strace/strace_6.3.bb
@@ -16,7 +16,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \
            file://0002-tests-Replace-off64_t-with-off_t.patch \
            "
-SRC_URI[sha256sum] = "0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8"
+SRC_URI[sha256sum] = "e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731"
 
 inherit autotools ptest
 
-- 
2.30.2

[PATCH 49/55] vala: upgrade 0.56.6 -> 0.56.8

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/vala/vala_0.56.6.bb | 3 ---
 meta/recipes-devtools/vala/vala_0.56.8.bb | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 meta/recipes-devtools/vala/vala_0.56.6.bb
 create mode 100644 meta/recipes-devtools/vala/vala_0.56.8.bb

diff --git a/meta/recipes-devtools/vala/vala_0.56.6.bb b/meta/recipes-devtools/vala/vala_0.56.6.bb
deleted file mode 100644
index bc5f5477d73..00000000000
--- a/meta/recipes-devtools/vala/vala_0.56.6.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI[sha256sum] = "050e841cbfe2b8e7d0fb350c9506bd7557be1cd86a90c896765f1a09a1870013"
diff --git a/meta/recipes-devtools/vala/vala_0.56.8.bb b/meta/recipes-devtools/vala/vala_0.56.8.bb
new file mode 100644
index 00000000000..f55fb41ad39
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala_0.56.8.bb
@@ -0,0 +1,3 @@
+require ${BPN}.inc
+
+SRC_URI[sha256sum] = "93f81dcfc6a93b77baa271d65e6be981ee3238ad451ef380af118e295d904bde"
-- 
2.30.2

[PATCH 50/55] vulkan: upgrade 1.3.243.0 -> 1.3.250.0

[Alexander Kanavin]

Add a patch to vulkan-tools that unbreaks cross-builds.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...lang_1.3.243.0.bb => glslang_1.3.250.0.bb} |  2 +-
 ....3.243.0.bb => spirv-headers_1.3.250.0.bb} |  2 +-
 ..._1.3.243.0.bb => spirv-tools_1.3.250.0.bb} |  2 +-
 ...3.243.0.bb => vulkan-headers_1.3.250.0.bb} |  2 +-
 ....3.243.0.bb => vulkan-loader_1.3.250.0.bb} |  4 +--
 ...ts.txt-do-not-make-special-arrangeme.patch | 29 +++++++++++++++++++
 ...1.3.243.0.bb => vulkan-tools_1.3.250.0.bb} |  6 ++--
 7 files changed, 39 insertions(+), 8 deletions(-)
 rename meta/recipes-graphics/glslang/{glslang_1.3.243.0.bb => glslang_1.3.250.0.bb} (96%)
 rename meta/recipes-graphics/spir/{spirv-headers_1.3.243.0.bb => spirv-headers_1.3.250.0.bb} (92%)
 rename meta/recipes-graphics/spir/{spirv-tools_1.3.243.0.bb => spirv-tools_1.3.250.0.bb} (96%)
 rename meta/recipes-graphics/vulkan/{vulkan-headers_1.3.243.0.bb => vulkan-headers_1.3.250.0.bb} (95%)
 rename meta/recipes-graphics/vulkan/{vulkan-loader_1.3.243.0.bb => vulkan-loader_1.3.250.0.bb} (95%)
 create mode 100644 meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch
 rename meta/recipes-graphics/vulkan/{vulkan-tools_1.3.243.0.bb => vulkan-tools_1.3.250.0.bb} (89%)

diff --git a/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb
similarity index 96%
rename from meta/recipes-graphics/glslang/glslang_1.3.243.0.bb
rename to meta/recipes-graphics/glslang/glslang_1.3.250.0.bb
index c50d67a6522..6e9c666d46d 100644
--- a/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb
+++ b/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
 LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
 
-SRCREV = "14e5a04e70057972eef8a40df422e30a3b70e4b5"
+SRCREV = "d1517d64cfca91f573af1bf7341dc3a5113349c0"
 SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \
            file://0001-generate-glslang-pkg-config.patch \
            "
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb
similarity index 92%
rename from meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb
index e27c0a67dc2..d0a2e2e9916 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
-SRCREV = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db"
+SRCREV = "268a061764ee69f09a477a695bf6a11ffe311b8d"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb
similarity index 96%
rename from meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb
index 21f9dd9650f..2b0a773e80a 100644
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb
@@ -7,7 +7,7 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "44d72a9b36702f093dd20815561a56778b2d181e"
+SRCREV = "e7c6084fd1d6d6f5ac393e842728d8be309688ca"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb
similarity index 95%
rename from meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb
index 6ddc35e5d87..2970767ff32 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
 
-SRCREV = "65ad768d8603671fc1085fe115019e72a595ced8"
+SRCREV = "9e61870ecbd32514113b467e0a0c46f60ed222c7"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb
similarity index 95%
rename from meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb
index 20128667f12..456c9734068 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb
@@ -9,8 +9,8 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.243;protocol=https"
-SRCREV = "22407d7804f111fbc0e31fa0db592d658e19ae8b"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.250;protocol=https"
+SRCREV = "f372068d09fc13bcf54b8c81274f37aa5f46aea3"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch b/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch
new file mode 100644
index 00000000000..6b70a1e62d8
--- /dev/null
+++ b/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch
@@ -0,0 +1,29 @@
+From 9060e916ca05d34b56c62f2be0b4a77dd104e2aa Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 2 Jun 2023 14:13:00 +0200
+Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH
+ instead of replacing it
+
+Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto
+(which is a major cross compiling framework).
+
+Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Tools/pull/808]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
+---
+ scripts/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 5b979d43..19a58bf9 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -114,7 +114,7 @@ if (MOLTENVK_REPO_ROOT)
+ endif()
+ 
+ if (CMAKE_CROSSCOMPILING)
+-    set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
++    set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+ else()
+     set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+ endif()
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb
similarity index 89%
rename from meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb
index dfdd716abd3..0346b380ee7 100644
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb
@@ -6,8 +6,10 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.243;protocol=https"
-SRCREV = "18bdf5565f5d02831869785cbf758fa7b295b7d5"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https \
+           file://0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch \
+           "
+SRCREV = "695887a994ef9cc00a7aa3f9c00b31a56ea79534"
 
 S = "${WORKDIR}/git"
 
-- 
2.30.2

[PATCH 51/55] wget: upgrade 1.21.3 -> 1.21.4

[Alexander Kanavin]

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/wget/wget.inc                           | 2 +-
 meta/recipes-extended/wget/{wget_1.21.3.bb => wget_1.21.4.bb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/wget/{wget_1.21.3.bb => wget_1.21.4.bb} (60%)

diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index d31756dbc8b..51926e72962 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -7,7 +7,7 @@ FTP sites"
 HOMEPAGE = "https://www.gnu.org/software/wget/"
 SECTION = "console/network"
 LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6f65012d1daf98cb09b386cfb68df26b"
 
 inherit autotools gettext texinfo update-alternatives pkgconfig
 
diff --git a/meta/recipes-extended/wget/wget_1.21.3.bb b/meta/recipes-extended/wget/wget_1.21.4.bb
similarity index 60%
rename from meta/recipes-extended/wget/wget_1.21.3.bb
rename to meta/recipes-extended/wget/wget_1.21.4.bb
index f176a1546ca..1d31b0116d2 100644
--- a/meta/recipes-extended/wget/wget_1.21.3.bb
+++ b/meta/recipes-extended/wget/wget_1.21.4.bb
@@ -2,6 +2,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
            file://0002-improve-reproducibility.patch \
           "
 
-SRC_URI[sha256sum] = "5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5"
+SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c"
 
 require wget.inc
-- 
2.30.2

[PATCH 52/55] wireless-regdb: upgrade 2023.02.13 -> 2023.05.03

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ireless-regdb_2023.02.13.bb => wireless-regdb_2023.05.03.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2023.02.13.bb => wireless-regdb_2023.05.03.bb} (94%)

diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb
similarity index 94%
rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb
rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb
index ce60154f1ea..cd3f52fc763 100644
--- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb
+++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb
@@ -5,7 +5,7 @@ LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
 
 SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73"
+SRC_URI[sha256sum] = "f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12"
 
 inherit bin_package allarch
 
-- 
2.30.2

[PATCH 53/55] xf86-input-libinput: upgrade 1.2.1 -> 1.3.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...f86-input-libinput_1.2.1.bb => xf86-input-libinput_1.3.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-libinput_1.2.1.bb => xf86-input-libinput_1.3.0.bb} (77%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.3.0.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.3.0.bb
index e1c47aa5e7d..892046e959c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.3.0.bb
@@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a22925127bd3c827c384cedd23ed2309"
 DEPENDS += "libinput"
 
 XORG_DRIVER_COMPRESSOR = ".tar.xz"
-SRC_URI[sha256sum] = "8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b"
+SRC_URI[sha256sum] = "1446ba20a22bc968b5a4a0b4dbc3b8e037c50d9c59ac75fa3f7fc506c58c1abb"
 
 FILES:${PN} += "${datadir}/X11/xorg.conf.d"
-- 
2.30.2

[PATCH 54/55] xf86-input-mouse: upgrade 1.9.4 -> 1.9.5

[Alexander Kanavin]

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{xf86-input-mouse_1.9.4.bb => xf86-input-mouse_1.9.5.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.9.4.bb => xf86-input-mouse_1.9.5.bb} (72%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.4.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.5.bb
similarity index 72%
rename from meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.4.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.5.bb
index 191987494e0..92e54d97014 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.4.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.5.bb
@@ -8,7 +8,7 @@ functions as a pointer input device, and may be used as the X server's \
 core pointer. Multiple mice are supported by multiple instances of this \
 driver."
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d213a69053dffe9bcab94abf60013d33"
 
-SRC_URI[sha256sum] = "7f6f8551fc238abdddcf9f38906564c1f8c7dacb0ad947cfc110487aefbd8d4c"
+SRC_URI[sha256sum] = "4fde8ae9b44352e2a208584c36528ee3ed13cf5fe4417208a9785daccefd9968"
 XORG_DRIVER_COMPRESSOR = ".tar.xz"
-- 
2.30.2

[PATCH 55/55] zstd: upgrade 1.5.4 -> 1.5.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/zstd/{zstd_1.5.4.bb => zstd_1.5.5.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/zstd/{zstd_1.5.4.bb => zstd_1.5.5.bb} (96%)

diff --git a/meta/recipes-extended/zstd/zstd_1.5.4.bb b/meta/recipes-extended/zstd/zstd_1.5.5.bb
similarity index 96%
rename from meta/recipes-extended/zstd/zstd_1.5.4.bb
rename to meta/recipes-extended/zstd/zstd_1.5.5.bb
index c2e96225e44..487465b6c70 100644
--- a/meta/recipes-extended/zstd/zstd_1.5.4.bb
+++ b/meta/recipes-extended/zstd/zstd_1.5.5.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \
 
 SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https"
 
-SRCREV = "945f27758c0fd67b636103a38dbf050266c6b90a"
+SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 CVE_PRODUCT = "zstandard"
-- 
2.30.2

Re: [OE-core] [PATCH 01/55] insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only)

[Richard Purdie]

On Wed, 2023-06-14 at 11:28 +0200, Alexander Kanavin wrote:
> This was done in a selftest, but that is too late and creates
> friction in integration as errors are not seen until autobuilder fails.
> 
> Bonus fix: SUMMARY check wasn't even working, as in the absence
> of one set in the recipe there is a default value set from bitbake.conf.
> 
> I left DESCRIPTION check out for now, as many recipes don't actually
> have it, and it's set from SUMMARY (plus a dot) if absent.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/classes-global/insane.bbclass         | 26 ++++++++++++++++
>  meta/lib/oeqa/selftest/cases/distrodata.py | 36 ----------------------
>  2 files changed, 26 insertions(+), 36 deletions(-)

I think this change is in the right direction but there are a few
things I think we need to tweak here.

a) I don't like the " if not '/meta/recipes-'" check at all. We now
have the groundwork for layer overrides in bitbake so I'd like to
complete that, then we can make some of these WARN_QA entries as layer
specific. This has the added bounus that other layers and more easily
adopt the tests and raise the bar on quality.

b) I really really don't want a do_fetch postfunc doing something that
isn't fetching. I know why you've done this, so it appears early in the
build and so on but it doesn't belong there.

There are other sanity tests at parse time in anonymous python which
also bother me since the increase parsing time and also shouldn't be
there. Those often aren't gated on ERROR_QA/WARN_QA options either so
can't be configured.

Given all this, do we want to consider a new task which covers these
kinds of tests? A new task does have certain overhead but I'm starting
to think we might need to do that. Of course there is then a dillema
about which task it would need to run before.

c) There is an issue that warnings are not restored from sstate. If you
rerun this build after seeing the warnings, the warnings will not show
again. This is going to confuse users and cause issues to get missed on
the autobuilder. There is an open bug for this one, it isn't an easy
fix unfortunately.

Cheers,

Richard

Re: [OE-core] [PATCH 01/55] insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only)

[Ross Burton]

On 14 Jun 2023, at 12:33, Richard Purdie via lists.openembedded.org <richard.purdie=linuxfoundation.org@lists.openembedded.org> wrote:
> Given all this, do we want to consider a new task which covers these
> kinds of tests? A new task does have certain overhead but I'm starting
> to think we might need to do that. Of course there is then a dillema
> about which task it would need to run before.

I agree: somewhere lost in my pile of branches is a half-completed implementation of a recipe-scope QA check to collect together these checks which can be ran from just the metadata and don’t depend on the results of do_package.

Ross

Re: [OE-core] [PATCH 26/55] libxcrypt: upgrade 4.4.33 -> 4.4.34

[Khem Raj]

On Wed, Jun 14, 2023 at 2:29 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...{libxcrypt-compat_4.4.33.bb => libxcrypt-compat_4.4.34.bb} | 0
>  meta/recipes-core/libxcrypt/libxcrypt.inc                     | 4 ++--
>  .../libxcrypt/{libxcrypt_4.4.33.bb => libxcrypt_4.4.34.bb}    | 0
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.33.bb => libxcrypt-compat_4.4.34.bb} (100%)
>  rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.33.bb => libxcrypt_4.4.34.bb} (100%)
>
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb
> similarity index 100%
> rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb
> rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
> index 61b03810763..4d145cf3ccd 100644
> --- a/meta/recipes-core/libxcrypt/libxcrypt.inc
> +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
> @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
>  inherit autotools pkgconfig
>
>  SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
> -SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175"
> -SRCBRANCH ?= "develop"
> +SRCREV = "e80cfde51bb4fe4bcf27585810e0b4ea3d1e4d7d"
> +SRCBRANCH ?= "master"
>

branch change perhaps is unwanted here, If I look at
https://github.com/besser82/libxcrypt/commit/e80cfde51bb4fe4bcf27585810e0b4ea3d1e4d7d
its in develop branch

btw. there already is 4.4.35 release to fix minor build issues.

>  SRC_URI += "file://fix_cflags_handling.patch"
>
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb
> similarity index 100%
> rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb
> rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb
> --
> 2.30.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#182771): https://lists.openembedded.org/g/openembedded-core/message/182771
> Mute This Topic: https://lists.openembedded.org/mt/99524163/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 19/55] gdb: upgrade 13.1 -> 13.2

[Khem Raj]

lgtm

On Wed, Jun 14, 2023 at 2:29 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...ian_13.1.bb => gdb-cross-canadian_13.2.bb} |   0
>  .../{gdb-cross_13.1.bb => gdb-cross_13.2.bb}  |   0
>  meta/recipes-devtools/gdb/gdb.inc             |   4 +-
>  ...r-valid-inferior-thread-regcache-bef.patch | 286 ------------------
>  ...low.cc-Fix-a-typo-in-ternary-operato.patch |  24 --
>  .../gdb/{gdb_13.1.bb => gdb_13.2.bb}          |   0
>  6 files changed, 1 insertion(+), 313 deletions(-)
>  rename meta/recipes-devtools/gdb/{gdb-cross-canadian_13.1.bb => gdb-cross-canadian_13.2.bb} (100%)
>  rename meta/recipes-devtools/gdb/{gdb-cross_13.1.bb => gdb-cross_13.2.bb} (100%)
>  delete mode 100644 meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch
>  delete mode 100644 meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch
>  rename meta/recipes-devtools/gdb/{gdb_13.1.bb => gdb_13.2.bb} (100%)
>
> diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_13.2.bb
> similarity index 100%
> rename from meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb
> rename to meta/recipes-devtools/gdb/gdb-cross-canadian_13.2.bb
> diff --git a/meta/recipes-devtools/gdb/gdb-cross_13.1.bb b/meta/recipes-devtools/gdb/gdb-cross_13.2.bb
> similarity index 100%
> rename from meta/recipes-devtools/gdb/gdb-cross_13.1.bb
> rename to meta/recipes-devtools/gdb/gdb-cross_13.2.bb
> diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
> index 8589de62ffd..e986b1a1f91 100644
> --- a/meta/recipes-devtools/gdb/gdb.inc
> +++ b/meta/recipes-devtools/gdb/gdb.inc
> @@ -13,10 +13,8 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
>             file://0006-resolve-restrict-keyword-conflict.patch \
>             file://0007-Fix-invalid-sigprocmask-call.patch \
>             file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
> -           file://0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch \
>             file://add-missing-ldflags.patch \
> -           file://0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch \
>             "
> -SRC_URI[sha256sum] = "115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0"
> +SRC_URI[sha256sum] = "fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a"
>
>  TOOLCHAIN = "gcc"
> diff --git a/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch b/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch
> deleted file mode 100644
> index 9adf4a4db55..00000000000
> --- a/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch
> +++ /dev/null
> @@ -1,286 +0,0 @@
> -From b3eff3e15576229af9bae026c5c23ee694b90389 Mon Sep 17 00:00:00 2001
> -From: Luis Machado <luis.machado@arm.com>
> -Date: Fri, 24 Mar 2023 07:58:38 +0000
> -Subject: [PATCH] aarch64: Check for valid inferior thread/regcache before
> - reading pauth registers
> -
> -Upstream-Status: Backport
> -Signed-off-by: Ross Burton <ross.burton@arm.com>
> -
> -There were reports of gdb throwing internal errors when calling
> -inferior_thread ()/get_current_regcache () on a system with
> -Pointer Authentication enabled.
> -
> -In such cases, gdb produces the following backtrace, or a variation
> -of it (for gdb's with the non-address removal implemented only in
> -the aarch64-linux-tdep.c file).
> -
> -../../../repos/binutils-gdb/gdb/thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed.
> -A problem internal to GDB has been detected,
> -further debugging may prove unreliable.
> ------ Backtrace -----
> -0xaaaae04a571f gdb_internal_backtrace_1
> -        ../../../repos/binutils-gdb/gdb/bt-utils.c:122
> -0xaaaae04a57f3 _Z22gdb_internal_backtracev
> -        ../../../repos/binutils-gdb/gdb/bt-utils.c:168
> -0xaaaae0b52ccf internal_vproblem
> -        ../../../repos/binutils-gdb/gdb/utils.c:401
> -0xaaaae0b5310b _Z15internal_verrorPKciS0_St9__va_list
> -        ../../../repos/binutils-gdb/gdb/utils.c:481
> -0xaaaae0e24b8f _Z18internal_error_locPKciS0_z
> -        ../../../repos/binutils-gdb/gdbsupport/errors.cc:58
> -0xaaaae0a88983 _Z15inferior_threadv
> -        ../../../repos/binutils-gdb/gdb/thread.c:86
> -0xaaaae0956c87 _Z20get_current_regcachev
> -        ../../../repos/binutils-gdb/gdb/regcache.c:428
> -0xaaaae035223f aarch64_remove_non_address_bits
> -        ../../../repos/binutils-gdb/gdb/aarch64-tdep.c:3572
> -0xaaaae03e8abb _Z31gdbarch_remove_non_address_bitsP7gdbarchm
> -        ../../../repos/binutils-gdb/gdb/gdbarch.c:3109
> -0xaaaae0a692d7 memory_xfer_partial
> -        ../../../repos/binutils-gdb/gdb/target.c:1620
> -0xaaaae0a695e3 _Z19target_xfer_partialP10target_ops13target_objectPKcPhPKhmmPm
> -        ../../../repos/binutils-gdb/gdb/target.c:1684
> -0xaaaae0a69e9f target_read_partial
> -        ../../../repos/binutils-gdb/gdb/target.c:1937
> -0xaaaae0a69fdf _Z11target_readP10target_ops13target_objectPKcPhml
> -        ../../../repos/binutils-gdb/gdb/target.c:1977
> -0xaaaae0a69937 _Z18target_read_memorymPhl
> -        ../../../repos/binutils-gdb/gdb/target.c:1773
> -0xaaaae08be523 ps_xfer_memory
> -        ../../../repos/binutils-gdb/gdb/proc-service.c:90
> -0xaaaae08be6db ps_pdread
> -        ../../../repos/binutils-gdb/gdb/proc-service.c:124
> -0x40001ed7c3b3 _td_fetch_value
> -        /build/glibc-RIFKjK/glibc-2.31/nptl_db/fetch-value.c:115
> -0x40001ed791ef td_ta_map_lwp2thr
> -        /build/glibc-RIFKjK/glibc-2.31/nptl_db/td_ta_map_lwp2thr.c:194
> -0xaaaae07f4473 thread_from_lwp
> -        ../../../repos/binutils-gdb/gdb/linux-thread-db.c:413
> -0xaaaae07f6d6f _ZN16thread_db_target4waitE6ptid_tP17target_waitstatus10enum_flagsI16target_wait_flagE
> -        ../../../repos/binutils-gdb/gdb/linux-thread-db.c:1420
> -0xaaaae0a6b33b _Z11target_wait6ptid_tP17target_waitstatus10enum_flagsI16target_wait_flagE
> -        ../../../repos/binutils-gdb/gdb/target.c:2586
> -0xaaaae0789cf7 do_target_wait_1
> -        ../../../repos/binutils-gdb/gdb/infrun.c:3825
> -0xaaaae0789e6f operator()
> -        ../../../repos/binutils-gdb/gdb/infrun.c:3884
> -0xaaaae078a167 do_target_wait
> -        ../../../repos/binutils-gdb/gdb/infrun.c:3903
> -0xaaaae078b0af _Z20fetch_inferior_eventv
> -        ../../../repos/binutils-gdb/gdb/infrun.c:4314
> -0xaaaae076652f _Z22inferior_event_handler19inferior_event_type
> -        ../../../repos/binutils-gdb/gdb/inf-loop.c:41
> -0xaaaae07dc68b handle_target_event
> -        ../../../repos/binutils-gdb/gdb/linux-nat.c:4206
> -0xaaaae0e25fbb handle_file_event
> -        ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:573
> -0xaaaae0e264f3 gdb_wait_for_event
> -        ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:694
> -0xaaaae0e24f9b _Z16gdb_do_one_eventi
> -        ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:217
> -0xaaaae080f033 start_event_loop
> -        ../../../repos/binutils-gdb/gdb/main.c:411
> -0xaaaae080f1b7 captured_command_loop
> -        ../../../repos/binutils-gdb/gdb/main.c:475
> -0xaaaae0810b97 captured_main
> -        ../../../repos/binutils-gdb/gdb/main.c:1318
> -0xaaaae0810c1b _Z8gdb_mainP18captured_main_args
> -        ../../../repos/binutils-gdb/gdb/main.c:1337
> -0xaaaae0338453 main
> -        ../../../repos/binutils-gdb/gdb/gdb.c:32
> ----------------------
> -../../../repos/binutils-gdb/gdb/thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed.
> -A problem internal to GDB has been detected,
> -further debugging may prove unreliable.
> -Quit this debugging session? (y or n)
> -
> -We also see failures across the testsuite if the tests get executed on a target
> -that has native support for the pointer authentication feature. But
> -gdb.base/break.exp and gdb.base/access-mem-running.exp are two examples of
> -tests that run into errors and internal errors.
> -
> -This issue started after commit d88cb738e6a7a7179dfaff8af78d69250c852af1, which
> -enabled more broad use of pointer authentication masks to remove non-address
> -bits of pointers, but wasn't immediately detected because systems with native
> -support for pointer authentication are not that common yet.
> -
> -The above crash happens because gdb is in the middle of handling an event,
> -and do_target_wait_1 calls switch_to_inferior_no_thread, nullifying the
> -current thread.  This means a call to inferior_thread () will assert, and
> -attempting to call get_current_regcache () will also call inferior_thread (),
> -resulting in an assertion as well.
> -
> -target_has_registers was one function that seemed useful for detecting these
> -types of situation where we don't have a register cache. The problem with that
> -is the inconsistent state of inferior_ptid, which is used by
> -target_has_registers.
> -
> -Despite the call to switch_to_no_thread in switch_to_inferior_no_thread from
> -do_target_wait_1 in the backtrace above clearing inferior_ptid, the call to
> -ps_xfer_memory sets inferior_ptid momentarily before reading memory:
> -
> -static ps_err_e
> -ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr,
> -                gdb_byte *buf, size_t len, int write)
> -{
> -  scoped_restore_current_inferior restore_inferior;
> -  set_current_inferior (ph->thread->inf);
> -
> -  scoped_restore_current_program_space restore_current_progspace;
> -  set_current_program_space (ph->thread->inf->pspace);
> -
> -  scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
> -  inferior_ptid = ph->thread->ptid;
> -
> -  CORE_ADDR core_addr = ps_addr_to_core_addr (addr);
> -
> -  int ret;
> -  if (write)
> -    ret = target_write_memory (core_addr, buf, len);
> -  else
> -    ret = target_read_memory (core_addr, buf, len);
> -  return (ret == 0 ? PS_OK : PS_ERR);
> -}
> -
> -Maybe this shouldn't happen, or maybe it is just an unfortunate state to be
> -in. But this prevents the use of target_has_registers to guard against the
> -lack of registers, since, although current_thread_ is still nullptr,
> -inferior_ptid is valid and is not null_ptid.
> -
> -There is another crash scenario after we kill a previously active inferior, in
> -which case the gdbarch will still say we support pointer authentication but we
> -will also have no current thread (inferior_thread () will assert etc).
> -
> -If the target has support for pointer authentication, gdb needs to use
> -a couple (or 4, for bare-metal) mask registers to mask off some bits of
> -pointers, and for that it needs to access the registers.
> -
> -At some points, like the one from the backtrace above, there is no active
> -thread/current regcache because gdb is in the middle of doing event handling
> -and switching between threads.
> -
> -Simon suggested the use of inferior_ptid to fetch the register cache, as
> -opposed to relying on the current register cache.  Though we need to make sure
> -inferior_ptid is valid (not null_ptid), I think this works nicely.
> -
> -With inferior_ptid, we can do safety checks along the way, making sure we have
> -a thread to fetch a register cache from and checking if the thread is actually
> -stopped or running.
> -
> -The following patch implements this idea with safety checks to make sure we
> -don't run into assertions or errors.  If any of the checks fail, we fallback to
> -using a default mask to remove non-address bits of a pointer.
> -
> -I discussed with Pedro the possibility of caching the mask register values
> -(which are per-process and can change mid-execution), but there isn't a good
> -spot to cache those values. Besides, the mask registers can change constantly
> -for bare-metal debugging when switching between exception levels.
> -
> -In some cases, it is just not possible to get access to these mask registers,
> -like the case where threads are running. In those cases, using a default mask
> -to remove the non-address bits should be enough.
> -
> -This can happen when we let threads run in the background and then we attempt
> -to access a memory address (now that gdb is capable of reading memory even
> -with threads running).  Thus gdb will attempt to remove non-address bits
> -of that memory access, will attempt to access registers, running into errors.
> -
> -Regression-tested on aarch64-linux Ubuntu 20.04.
> ----
> - gdb/aarch64-linux-tdep.c | 64 ++++++++++++++++++++++++++++++----------
> - 1 file changed, 49 insertions(+), 15 deletions(-)
> -
> -diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
> -index 20a041c599e..4b2915b8e99 100644
> ---- a/gdb/aarch64-linux-tdep.c
> -+++ b/gdb/aarch64-linux-tdep.c
> -@@ -57,6 +57,9 @@
> - #include "elf/common.h"
> - #include "elf/aarch64.h"
> -
> -+/* For inferior_ptid and current_inferior ().  */
> -+#include "inferior.h"
> -+
> - /* Signal frame handling.
> -
> -       +------------+  ^
> -@@ -1986,29 +1989,60 @@ aarch64_linux_decode_memtag_section (struct gdbarch *gdbarch,
> - static CORE_ADDR
> - aarch64_remove_non_address_bits (struct gdbarch *gdbarch, CORE_ADDR pointer)
> - {
> --  aarch64_gdbarch_tdep *tdep = gdbarch_tdep<aarch64_gdbarch_tdep> (gdbarch);
> --
> -   /* By default, we assume TBI and discard the top 8 bits plus the VA range
> --     select bit (55).  */
> -+     select bit (55).  Below we try to fetch information about pointer
> -+     authentication masks in order to make non-address removal more
> -+     precise.  */
> -   CORE_ADDR mask = AARCH64_TOP_BITS_MASK;
> -
> --  if (tdep->has_pauth ())
> -+  /* Check if we have an inferior first.  If not, just use the default
> -+     mask.
> -+
> -+     We use the inferior_ptid here because the pointer authentication masks
> -+     should be the same across threads of a process.  Since we may not have
> -+     access to the current thread (gdb may have switched to no inferiors
> -+     momentarily), we use the inferior ptid.  */
> -+  if (inferior_ptid != null_ptid)
> -     {
> --      /* Fetch the PAC masks.  These masks are per-process, so we can just
> --       fetch data from whatever thread we have at the moment.
> -+      /* If we do have an inferior, attempt to fetch its thread's thread_info
> -+       struct.  */
> -+      thread_info *thread
> -+      = find_thread_ptid (current_inferior ()->process_target (),
> -+                          inferior_ptid);
> -
> --       Also, we have both a code mask and a data mask.  For now they are the
> --       same, but this may change in the future.  */
> --      struct regcache *regs = get_current_regcache ();
> --      CORE_ADDR cmask, dmask;
> -+      /* If the thread is running, we will not be able to fetch the mask
> -+       registers.  */
> -+      if (thread != nullptr && thread->state != THREAD_RUNNING)
> -+      {
> -+        /* Otherwise, fetch the register cache and the masks.  */
> -+        struct regcache *regs
> -+          = get_thread_regcache (current_inferior ()->process_target (),
> -+                                 inferior_ptid);
> -+
> -+        /* Use the gdbarch from the register cache to check for pointer
> -+           authentication support, as it matches the features found in
> -+           that particular thread.  */
> -+        aarch64_gdbarch_tdep *tdep
> -+          = gdbarch_tdep<aarch64_gdbarch_tdep> (regs->arch ());
> -+
> -+        /* Is there pointer authentication support?  */
> -+        if (tdep->has_pauth ())
> -+          {
> -+            /* We have both a code mask and a data mask.  For now they are
> -+               the same, but this may change in the future.  */
> -+            CORE_ADDR cmask, dmask;
> -
> --      if (regs->cooked_read (tdep->pauth_reg_base, &dmask) != REG_VALID)
> --      dmask = mask;
> -+            if (regs->cooked_read (tdep->pauth_reg_base, &dmask)
> -+                != REG_VALID)
> -+              dmask = mask;
> -
> --      if (regs->cooked_read (tdep->pauth_reg_base + 1, &cmask) != REG_VALID)
> --      cmask = mask;
> -+            if (regs->cooked_read (tdep->pauth_reg_base + 1, &cmask)
> -+                != REG_VALID)
> -+              cmask = mask;
> -
> --      mask |= aarch64_mask_from_pac_registers (cmask, dmask);
> -+            mask |= aarch64_mask_from_pac_registers (cmask, dmask);
> -+          }
> -+      }
> -     }
> -
> -   return aarch64_remove_top_bits (pointer, mask);
> ---
> -2.34.1
> -
> diff --git a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch b/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch
> deleted file mode 100644
> index 32eba089bc2..00000000000
> --- a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From 9a85132c4ba7d37a5df146239b3ab1a5854ce478 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Wed, 22 Feb 2023 16:24:07 -0800
> -Subject: [PATCH] gdbserver/linux-low.cc: Fix a typo in ternary operator
> -
> -Upstream-Status: Submitted [https://sourceware.org/pipermail/gdb-patches/2023-February/197298.html]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - gdbserver/linux-low.cc | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
> -index 7e1de397893..95ec871d436 100644
> ---- a/gdbserver/linux-low.cc
> -+++ b/gdbserver/linux-low.cc
> -@@ -5390,7 +5390,7 @@ proc_xfer_memory (CORE_ADDR memaddr, unsigned char *readbuf,
> -       if (lseek (fd, memaddr, SEEK_SET) != -1)
> -       bytes = (readbuf != nullptr
> -                ? read (fd, readbuf, len)
> --               ? write (fd, writebuf, len));
> -+               : write (fd, writebuf, len));
> - #endif
> -
> -       if (bytes < 0)
> diff --git a/meta/recipes-devtools/gdb/gdb_13.1.bb b/meta/recipes-devtools/gdb/gdb_13.2.bb
> similarity index 100%
> rename from meta/recipes-devtools/gdb/gdb_13.1.bb
> rename to meta/recipes-devtools/gdb/gdb_13.2.bb
> --
> 2.30.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#182764): https://lists.openembedded.org/g/openembedded-core/message/182764
> Mute This Topic: https://lists.openembedded.org/mt/99524156/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 26/55] libxcrypt: upgrade 4.4.33 -> 4.4.34

[Alexander Kanavin]

It's in master too:
https://github.com/besser82/libxcrypt/commits/master

I don't know why github won't show that but using master is preferable
over develop.

4.4.35 will be provided by AUH in due time and taken into the next
batch; I don't chase shifting 'latest upstream versions' when making
and testing those large version update patchsets, that would endanger
my sanity :)

Alex

On Wed, 14 Jun 2023 at 19:12, Khem Raj <raj.khem@gmail.com> wrote:
>
> On Wed, Jun 14, 2023 at 2:29 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  ...{libxcrypt-compat_4.4.33.bb => libxcrypt-compat_4.4.34.bb} | 0
> >  meta/recipes-core/libxcrypt/libxcrypt.inc                     | 4 ++--
> >  .../libxcrypt/{libxcrypt_4.4.33.bb => libxcrypt_4.4.34.bb}    | 0
> >  3 files changed, 2 insertions(+), 2 deletions(-)
> >  rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.33.bb => libxcrypt-compat_4.4.34.bb} (100%)
> >  rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.33.bb => libxcrypt_4.4.34.bb} (100%)
> >
> > diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb
> > similarity index 100%
> > rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb
> > rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb
> > diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
> > index 61b03810763..4d145cf3ccd 100644
> > --- a/meta/recipes-core/libxcrypt/libxcrypt.inc
> > +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
> > @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
> >  inherit autotools pkgconfig
> >
> >  SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
> > -SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175"
> > -SRCBRANCH ?= "develop"
> > +SRCREV = "e80cfde51bb4fe4bcf27585810e0b4ea3d1e4d7d"
> > +SRCBRANCH ?= "master"
> >
>
> branch change perhaps is unwanted here, If I look at
> https://github.com/besser82/libxcrypt/commit/e80cfde51bb4fe4bcf27585810e0b4ea3d1e4d7d
> its in develop branch
>
> btw. there already is 4.4.35 release to fix minor build issues.
>
> >  SRC_URI += "file://fix_cflags_handling.patch"
> >
> > diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb
> > similarity index 100%
> > rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb
> > rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb
> > --
> > 2.30.2
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#182771): https://lists.openembedded.org/g/openembedded-core/message/182771
> > Mute This Topic: https://lists.openembedded.org/mt/99524163/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 14/55] coreutils: upgrade 9.1 -> 9.3

[Ross Burton]

With this upgrade I get:

| checking whether MB_CUR_MAX is correct... configure: error: in `/yocto/ross/build/tmp/work/cortexa57-poky-linux/coreutils/9.3-r0/build':
| configure: error: cannot run test program while cross compiling

Ross

Re: [OE-core] [PATCH 14/55] coreutils: upgrade 9.1 -> 9.3

[Alexander Kanavin]

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

This didn’t happen in a-full so can you check wh ere the difference is?

Alex

On Thu 15. Jun 2023 at 10.14, Ross Burton <Ross.Burton@arm.com> wrote:

> With this upgrade I get:
>
> | checking whether MB_CUR_MAX is correct... configure: error: in
> `/yocto/ross/build/tmp/work/cortexa57-poky-linux/coreutils/9.3-r0/build':
> | configure: error: cannot run test program while cross compiling
>
> Ross

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

Re: [OE-core] [PATCH 06/55] sysfsutils: update 2.1.0 -> 2.1.1

[Ross Burton]

On 14 Jun 2023, at 10:28, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
> 
> Drop all patches, as issues are all fixed upstream.
> 
> License-Update: clarification that GPL applies to all executables
> (not just test), formatting.

This drops the pkgconfig file into /lib/pkgconfig, which doesn’t look right.

Ross

Re: [OE-core] [PATCH 06/55] sysfsutils: update 2.1.0 -> 2.1.1

[Ross Burton]

On 15 Jun 2023, at 16:10, Ross Burton via lists.openembedded.org <ross.burton=arm.com@lists.openembedded.org> wrote:
> 
> On 14 Jun 2023, at 10:28, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
>> 
>> Drop all patches, as issues are all fixed upstream.
>> 
>> License-Update: clarification that GPL applies to all executables
>> (not just test), formatting.
> 
> This drops the pkgconfig file into /lib/pkgconfig, which doesn’t look right.

This is because the recipe sets libdir=$base_libdir, for historical reasons that we can ignore[1].  Delete that line.

[1] pcmciautils also puts stuff into /bin or /lib and was linking to sysfsutils.  pcmciautils is now outside of core and lets be honest, dead, so this is moot.

Re: [OE-core] [PATCH 06/55] sysfsutils: update 2.1.0 -> 2.1.1

[Alexander Kanavin]

On Thu, 15 Jun 2023 at 17:25, Ross Burton <Ross.Burton@arm.com> wrote:
> > This drops the pkgconfig file into /lib/pkgconfig, which doesn’t look right.
>
> This is because the recipe sets libdir=$base_libdir, for historical reasons that we can ignore[1].  Delete that line.
>
> [1] pcmciautils also puts stuff into /bin or /lib and was linking to sysfsutils.  pcmciautils is now outside of core and lets be honest, dead, so this is moot.

Can you send a followup patch like you did for coreutils?

Alex

Re: [OE-core] [PATCH 13/55] glib-2.0: backport a patch to address ptest fails caused by coreutils 9.2+

[Alexandre Belloni]

Hello,

Which ptest are you trying to fix?

I got:
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/5023/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5207/steps/12/logs/stdio
{'glib-2.0': ['glib/file.test']}

On 14/06/2023 11:28:36+0200, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...pparent-size-only-for-files-and-syml.patch | 105 ++++++++++++++++++
>  meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb |   1 +
>  2 files changed, 106 insertions(+)
>  create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
> 
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
> new file mode 100644
> index 00000000000..a881b25ef3e
> --- /dev/null
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
> @@ -0,0 +1,105 @@
> +From d1a2117dc18dbcf87685891de7e2898108b66fc9 Mon Sep 17 00:00:00 2001
> +From: Joan Bruguera <joanbrugueram@gmail.com>
> +Date: Thu, 23 Mar 2023 02:24:30 +0000
> +Subject: [PATCH] glocalfile: Sum apparent size only for files and symlinks
> +
> +Since GNU Coreutils 9.2 (commit 110bcd28386b1f47a4cd876098acb708fdcbbb25),
> +`du --apparent-size` (including `du --bytes`) no longer counts all kinds of
> +files (directories, FIFOs, etc.), but only those for which `st_size` in
> +`struct stat` is defined by POSIX, namely regular files and symlinks
> +(and also rarely supported memory objects).
> +
> +This aligns the behaviour of GLib's `G_FILE_MEASURE_APPARENT_SIZE` flag
> +with the new GNU Coreutils `du` and correct POSIX use.
> +
> +Note that this may be a breaking change for some uses.
> +
> +Link: https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html
> +Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965
> +
> +Upstream-Status: Backport
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + gio/gioenums.h   |  3 +++
> + gio/glocalfile.c | 37 +++++++++++++++++++++++++++++++++++++
> + 2 files changed, 40 insertions(+)
> +
> +diff --git a/gio/gioenums.h b/gio/gioenums.h
> +index 7fd74a43e..c820cd36d 100644
> +--- a/gio/gioenums.h
> ++++ b/gio/gioenums.h
> +@@ -224,6 +224,9 @@ typedef enum {
> +  *   sizes.  Normally, the block-size is used, if available, as this is a
> +  *   more accurate representation of disk space used.
> +  *   Compare with `du --apparent-size`.
> ++ *   Since GLib 2.78. and similarly to `du` since GNU Coreutils 9.2, this will
> ++ *   ignore the sizes of file types other than regular files and links, as the
> ++ *   sizes of other file types are not specified in a standard way.
> +  * @G_FILE_MEASURE_NO_XDEV: Do not cross mount point boundaries.
> +  *   Compare with `du -x`.
> +  *
> +diff --git a/gio/glocalfile.c b/gio/glocalfile.c
> +index 67d4b99fb..dbb56902d 100644
> +--- a/gio/glocalfile.c
> ++++ b/gio/glocalfile.c
> +@@ -86,6 +86,9 @@
> + #define FILE_READ_ONLY_VOLUME           0x00080000
> + #endif
> + 
> ++#ifndef S_ISREG
> ++#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
> ++#endif
> + #ifndef S_ISDIR
> + #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
> + #endif
> +@@ -2777,6 +2780,39 @@ g_local_file_measure_size_of_contents (gint           fd,
> +                                        MeasureState  *state,
> +                                        GError       **error);
> + 
> ++/*
> ++ * _g_stat_is_size_usable:
> ++ * @buf: a #GLocalFileStat.
> ++ *
> ++ * Checks if the file type is such that the `st_size` field of `struct stat` is
> ++ * well-defined by POSIX.
> ++ * (see https://pubs.opengroup.org/onlinepubs/009696799/basedefs/sys/stat.h.html)
> ++ *
> ++ * This behaviour is aligned with `du` from GNU Coreutils 9.2+
> ++ * (see https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html)
> ++ * and makes apparent size sums well-defined; formerly, they depended on the
> ++ * implementation, and could differ across filesystems.
> ++ *
> ++ * Returns: %TRUE if the size field is well-defined, %FALSE otherwise.
> ++ **/
> ++inline static gboolean
> ++_g_stat_is_size_usable (const GLocalFileStat *buf)
> ++{
> ++#ifndef HAVE_STATX
> ++  /* Memory objects are defined by POSIX, but are not supported by statx nor Windows */
> ++#ifdef S_TYPEISSHM
> ++  if (S_TYPEISSHM (buf))
> ++    return TRUE;
> ++#endif
> ++#ifdef S_TYPEISTMO
> ++  if (S_TYPEISTMO (buf))
> ++    return TRUE;
> ++#endif
> ++#endif
> ++
> ++  return S_ISREG (_g_stat_mode (buf)) || S_ISLNK (_g_stat_mode (buf));
> ++}
> ++
> + static gboolean
> + g_local_file_measure_size_of_file (gint           parent_fd,
> +                                    GSList        *name,
> +@@ -2836,6 +2872,7 @@ g_local_file_measure_size_of_file (gint           parent_fd,
> +     state->disk_usage += _g_stat_blocks (&buf) * G_GUINT64_CONSTANT (512);
> +   else
> + #endif
> ++  if (_g_stat_is_size_usable (&buf))
> +     state->disk_usage += _g_stat_size (&buf);
> + 
> +   if (S_ISDIR (_g_stat_mode (&buf)))
> +-- 
> +2.39.2
> +
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
> index a60e7688367..4327a133450 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
> @@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
>             file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
>             file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
>             file://0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch \
> +           file://0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch \
>             "
>  SRC_URI:append:class-native = " file://relocate-modules.patch"
>  
> -- 
> 2.30.2
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#182758): https://lists.openembedded.org/g/openembedded-core/message/182758
> Mute This Topic: https://lists.openembedded.org/mt/99524149/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 13/55] glib-2.0: backport a patch to address ptest fails caused by coreutils 9.2+

[Alexandre Belloni]

On 16/06/2023 00:27:00+0200, Alexandre Belloni wrote:
> Hello,
> 
> Which ptest are you trying to fix?
> 
> I got:
> https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/5023/steps/13/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5207/steps/12/logs/stdio
> {'glib-2.0': ['glib/file.test']}
> 

This is probably because I didn't take the coreutils patch following
Ross' comment.

> On 14/06/2023 11:28:36+0200, Alexander Kanavin wrote:
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  ...pparent-size-only-for-files-and-syml.patch | 105 ++++++++++++++++++
> >  meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb |   1 +
> >  2 files changed, 106 insertions(+)
> >  create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
> > 
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
> > new file mode 100644
> > index 00000000000..a881b25ef3e
> > --- /dev/null
> > +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
> > @@ -0,0 +1,105 @@
> > +From d1a2117dc18dbcf87685891de7e2898108b66fc9 Mon Sep 17 00:00:00 2001
> > +From: Joan Bruguera <joanbrugueram@gmail.com>
> > +Date: Thu, 23 Mar 2023 02:24:30 +0000
> > +Subject: [PATCH] glocalfile: Sum apparent size only for files and symlinks
> > +
> > +Since GNU Coreutils 9.2 (commit 110bcd28386b1f47a4cd876098acb708fdcbbb25),
> > +`du --apparent-size` (including `du --bytes`) no longer counts all kinds of
> > +files (directories, FIFOs, etc.), but only those for which `st_size` in
> > +`struct stat` is defined by POSIX, namely regular files and symlinks
> > +(and also rarely supported memory objects).
> > +
> > +This aligns the behaviour of GLib's `G_FILE_MEASURE_APPARENT_SIZE` flag
> > +with the new GNU Coreutils `du` and correct POSIX use.
> > +
> > +Note that this may be a breaking change for some uses.
> > +
> > +Link: https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html
> > +Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965
> > +
> > +Upstream-Status: Backport
> > +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > +---
> > + gio/gioenums.h   |  3 +++
> > + gio/glocalfile.c | 37 +++++++++++++++++++++++++++++++++++++
> > + 2 files changed, 40 insertions(+)
> > +
> > +diff --git a/gio/gioenums.h b/gio/gioenums.h
> > +index 7fd74a43e..c820cd36d 100644
> > +--- a/gio/gioenums.h
> > ++++ b/gio/gioenums.h
> > +@@ -224,6 +224,9 @@ typedef enum {
> > +  *   sizes.  Normally, the block-size is used, if available, as this is a
> > +  *   more accurate representation of disk space used.
> > +  *   Compare with `du --apparent-size`.
> > ++ *   Since GLib 2.78. and similarly to `du` since GNU Coreutils 9.2, this will
> > ++ *   ignore the sizes of file types other than regular files and links, as the
> > ++ *   sizes of other file types are not specified in a standard way.
> > +  * @G_FILE_MEASURE_NO_XDEV: Do not cross mount point boundaries.
> > +  *   Compare with `du -x`.
> > +  *
> > +diff --git a/gio/glocalfile.c b/gio/glocalfile.c
> > +index 67d4b99fb..dbb56902d 100644
> > +--- a/gio/glocalfile.c
> > ++++ b/gio/glocalfile.c
> > +@@ -86,6 +86,9 @@
> > + #define FILE_READ_ONLY_VOLUME           0x00080000
> > + #endif
> > + 
> > ++#ifndef S_ISREG
> > ++#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
> > ++#endif
> > + #ifndef S_ISDIR
> > + #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
> > + #endif
> > +@@ -2777,6 +2780,39 @@ g_local_file_measure_size_of_contents (gint           fd,
> > +                                        MeasureState  *state,
> > +                                        GError       **error);
> > + 
> > ++/*
> > ++ * _g_stat_is_size_usable:
> > ++ * @buf: a #GLocalFileStat.
> > ++ *
> > ++ * Checks if the file type is such that the `st_size` field of `struct stat` is
> > ++ * well-defined by POSIX.
> > ++ * (see https://pubs.opengroup.org/onlinepubs/009696799/basedefs/sys/stat.h.html)
> > ++ *
> > ++ * This behaviour is aligned with `du` from GNU Coreutils 9.2+
> > ++ * (see https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html)
> > ++ * and makes apparent size sums well-defined; formerly, they depended on the
> > ++ * implementation, and could differ across filesystems.
> > ++ *
> > ++ * Returns: %TRUE if the size field is well-defined, %FALSE otherwise.
> > ++ **/
> > ++inline static gboolean
> > ++_g_stat_is_size_usable (const GLocalFileStat *buf)
> > ++{
> > ++#ifndef HAVE_STATX
> > ++  /* Memory objects are defined by POSIX, but are not supported by statx nor Windows */
> > ++#ifdef S_TYPEISSHM
> > ++  if (S_TYPEISSHM (buf))
> > ++    return TRUE;
> > ++#endif
> > ++#ifdef S_TYPEISTMO
> > ++  if (S_TYPEISTMO (buf))
> > ++    return TRUE;
> > ++#endif
> > ++#endif
> > ++
> > ++  return S_ISREG (_g_stat_mode (buf)) || S_ISLNK (_g_stat_mode (buf));
> > ++}
> > ++
> > + static gboolean
> > + g_local_file_measure_size_of_file (gint           parent_fd,
> > +                                    GSList        *name,
> > +@@ -2836,6 +2872,7 @@ g_local_file_measure_size_of_file (gint           parent_fd,
> > +     state->disk_usage += _g_stat_blocks (&buf) * G_GUINT64_CONSTANT (512);
> > +   else
> > + #endif
> > ++  if (_g_stat_is_size_usable (&buf))
> > +     state->disk_usage += _g_stat_size (&buf);
> > + 
> > +   if (S_ISDIR (_g_stat_mode (&buf)))
> > +-- 
> > +2.39.2
> > +
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
> > index a60e7688367..4327a133450 100644
> > --- a/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
> > +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb
> > @@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> >             file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
> >             file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
> >             file://0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch \
> > +           file://0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch \
> >             "
> >  SRC_URI:append:class-native = " file://relocate-modules.patch"
> >  
> > -- 
> > 2.30.2
> > 
> 
> > 
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#182758): https://lists.openembedded.org/g/openembedded-core/message/182758
> > Mute This Topic: https://lists.openembedded.org/mt/99524149/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> > 
> 
> 
> -- 
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 13/55] glib-2.0: backport a patch to address ptest fails caused by coreutils 9.2+

[Alexander Kanavin]

On Fri, 16 Jun 2023 at 00:34, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> On 16/06/2023 00:27:00+0200, Alexandre Belloni wrote:
> > Hello,
> >
> > Which ptest are you trying to fix?
> >
> > I got:
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/5023/steps/13/logs/stdio
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5207/steps/12/logs/stdio
> > {'glib-2.0': ['glib/file.test']}
> >
>
> This is probably because I didn't take the coreutils patch following
> Ross' comment.

That's right. This fix is tightly coupled with the coreutils update.
glib upstream did further fixing to make it backwards compatible with
older coreutils, but we don't need to take that as our versions are
deterministic.

Ross sent a patch for the coreutils issue he saw.

Alex

Re: [OE-core] [PATCH 08/55] ghostscript: remove mkdir-p.patch

[Ross Burton]

On 14 Jun 2023, at 10:28, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
> 
> The scenario where things break down without this patch is not clear:
> it's a make rule, and so make itself will ensure it's not run several times
> in parallel.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>

Drop this, I’ve incorporated it into my ghostscript rewrite patch that I just sent.

Ross

Re: [OE-core] [PATCH 49/55] vala: upgrade 0.56.6 -> 0.56.8

[Khem Raj]

This is in master now but it breaks geary

https://snips.sh/f/32iLt9_dQn

On Wed, Jun 14, 2023 at 2:30 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/recipes-devtools/vala/vala_0.56.6.bb | 3 ---
>  meta/recipes-devtools/vala/vala_0.56.8.bb | 3 +++
>  2 files changed, 3 insertions(+), 3 deletions(-)
>  delete mode 100644 meta/recipes-devtools/vala/vala_0.56.6.bb
>  create mode 100644 meta/recipes-devtools/vala/vala_0.56.8.bb
>
> diff --git a/meta/recipes-devtools/vala/vala_0.56.6.bb b/meta/recipes-devtools/vala/vala_0.56.6.bb
> deleted file mode 100644
> index bc5f5477d73..00000000000
> --- a/meta/recipes-devtools/vala/vala_0.56.6.bb
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -require ${BPN}.inc
> -
> -SRC_URI[sha256sum] = "050e841cbfe2b8e7d0fb350c9506bd7557be1cd86a90c896765f1a09a1870013"
> diff --git a/meta/recipes-devtools/vala/vala_0.56.8.bb b/meta/recipes-devtools/vala/vala_0.56.8.bb
> new file mode 100644
> index 00000000000..f55fb41ad39
> --- /dev/null
> +++ b/meta/recipes-devtools/vala/vala_0.56.8.bb
> @@ -0,0 +1,3 @@
> +require ${BPN}.inc
> +
> +SRC_URI[sha256sum] = "93f81dcfc6a93b77baa271d65e6be981ee3238ad451ef380af118e295d904bde"
> --
> 2.30.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#182794): https://lists.openembedded.org/g/openembedded-core/message/182794
> Mute This Topic: https://lists.openembedded.org/mt/99524186/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>