[PATCH 01/33] seatd: add recipe

[PATCH 01/33] seatd: add recipe

[Alexander Kanavin]

This is needed to run weston properly as non-root in the absence
of systemd-logind, and other compositors will likely require seatd
as well.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/conf/distro/include/maintainers.inc |  1 +
 meta/recipes-core/seatd/seatd/init       | 45 ++++++++++++++++++++++++
 meta/recipes-core/seatd/seatd_0.6.3.bb   | 29 +++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 meta/recipes-core/seatd/seatd/init
 create mode 100644 meta/recipes-core/seatd/seatd_0.6.3.bb

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index ae25287c11..cb289a0eee 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <unassigned@yoctoproject.org>"
 RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>"
 RECIPE_MAINTAINER:pn-sbc = "Unassigned <unassigned@yoctoproject.org>"
 RECIPE_MAINTAINER:pn-screen = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin <alex.kanavin@gmail.com>"
 RECIPE_MAINTAINER:pn-sed = "Chen Qi <Qi.Chen@windriver.com>"
 RECIPE_MAINTAINER:pn-serf = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-setserial = "Yi Zhao <yi.zhao@windriver.com>"
diff --git a/meta/recipes-core/seatd/seatd/init b/meta/recipes-core/seatd/seatd/init
new file mode 100644
index 0000000000..0589c765ac
--- /dev/null
+++ b/meta/recipes-core/seatd/seatd/init
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: seatd
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
+
+killproc() {
+        pid=`/bin/pidof $1`
+        [ "$pid" != "" ] && kill $pid
+}
+
+case "$1" in
+  start)
+        seatd -g video -n 1 > /tmp/seatd-start-notify &
+        [ -s /tmp/seatd-start-notify ] && exit 0
+        sleep 0.1
+        [ -s /tmp/seatd-start-notify ] && exit 0
+        sleep 0.5
+        [ -s /tmp/seatd-start-notify ] && exit 0
+        sleep 5
+        [ -s /tmp/seatd-start-notify ] && exit 0
+        exit 1
+  ;;
+
+  stop)
+        echo "Stopping seatd"
+        killproc seatd
+  ;;
+
+  restart)
+	$0 stop
+        sleep 1
+        $0 start
+  ;;
+
+  *)
+        echo "usage: $0 { start | stop | restart }"
+  ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb b/meta/recipes-core/seatd/seatd_0.6.3.bb
new file mode 100644
index 0000000000..0e1a79dddf
--- /dev/null
+++ b/meta/recipes-core/seatd/seatd_0.6.3.bb
@@ -0,0 +1,29 @@
+SUMMARY = "A minimal seat management daemon, and a universal seat management library."
+DESCRIPTION = "Seat management takes care of mediating access to shared devices (graphics, input), without requiring the applications needing access to be root."
+HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd"
+
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
+
+SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master \
+           file://init"
+SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig update-rc.d
+
+PACKAGECONFIG ?= "libseat-builtin"
+
+PACKAGECONFIG[libseat-builtin] = "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
+
+do_install:append() {
+        if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
+                install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/seatd
+        fi
+}
+
+INITSCRIPT_NAME = "seatd"
+INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}"
+
-- 
2.20.1

[PATCH 02/33] weston: upgrade 9.0.0 -> 10.0.0

[Alexander Kanavin]

Release announcement with changes:
https://lists.freedesktop.org/archives/wayland-devel/2022-February/042103.html

Upstream has deprecated both weston-launch and fbdev backend, so let's
not delay the inevitable and find replacements.

Fbdev can be replaced by passing --use-pixman to drm backend;
this will bypass the opengl paths and use CPU for rendering.
Apply where GL is too slow or unavailable.

weston-launch can be replaced by starting weston directly, with
a seat management daemon for support. This is provided either
by systemd, or on systemd-less systems, by seatd. The sysvinit
startup scripts and tests have been rewritten accordingly. Bonus
fix: under sysvinit weston now starts under weston user as it should,
and not under root.

Upstream discussion:
https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/runtime/cases/weston.py         |   6 +-
 .../recipes-graphics/wayland/weston-init/init |   2 +-
 .../wayland/weston-init/weston-start          |  30 +--
 ...d-drm-Re-order-gbm-destruction-at-DR.patch |  50 -----
 ...001-meson.build-fix-incorrect-header.patch |  32 ---
 ...ntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch |  47 -----
 ...ovide-a-default-version-that-doesn-t.patch | 199 ------------------
 .../weston/dont-use-plane-add-prop.patch      |  13 +-
 .../{weston_9.0.0.bb => weston_10.0.0.bb}     |  27 ++-
 9 files changed, 29 insertions(+), 377 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
 rename meta/recipes-graphics/wayland/{weston_9.0.0.bb => weston_10.0.0.bb} (86%)

diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py
index b3a7c2776d..b81cc299ef 100644
--- a/meta/lib/oeqa/runtime/cases/weston.py
+++ b/meta/lib/oeqa/runtime/cases/weston.py
@@ -10,7 +10,7 @@ import threading
 import time
 
 class WestonTest(OERuntimeTestCase):
-    weston_log_file = '/tmp/weston.log'
+    weston_log_file = '/tmp/weston-2.log'
 
     @classmethod
     def tearDownClass(cls):
@@ -31,13 +31,13 @@ class WestonTest(OERuntimeTestCase):
         return output.split(" ")
 
     def get_weston_command(self, cmd):
-        return 'export XDG_RUNTIME_DIR=/run/user/0; export WAYLAND_DISPLAY=wayland-0; %s' % cmd
+        return 'export XDG_RUNTIME_DIR=/run/user/`id -u weston`; export WAYLAND_DISPLAY=wayland-1; %s' % cmd
 
     def run_weston_init(self):
         if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']:
             self.target.run('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR=/tmp -E WAYLAND_DISPLAY=wayland-0 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file)
         else:
-            self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-1 --log=%s' % self.weston_log_file))
+            self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-2 --log=%s' % self.weston_log_file))
 
     def get_new_wayland_processes(self, existing_wl_processes):
         try_cnt = 0
diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init
index a849f29bcb..d3b0d1873e 100644
--- a/meta/recipes-graphics/wayland/weston-init/init
+++ b/meta/recipes-graphics/wayland/weston-init/init
@@ -32,7 +32,7 @@ case "$1" in
         . /etc/profile
 	export HOME=ROOTHOME
 
-        weston-start -- $OPTARGS
+        WESTON_USER=weston weston-start $OPTARGS &
   ;;
 
   stop)
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index 0f1bc4c29d..01670cd4f5 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -6,7 +6,7 @@ export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
 
 usage() {
 	cat <<EOF
-	$0 [<openvt arguments>] [-- <weston options>]
+	$0 [<weston options>]
 EOF
 }
 
@@ -18,11 +18,6 @@ add_weston_argument() {
 	weston_args="$weston_args $1"
 }
 
-# Add openvt extra argument
-add_openvt_argument() {
-	openvt_args="$openvt_args $1"
-
-}
 ## Add module to --modules argument
 add_weston_module() {
 	if [[ "x${weston_modules}" == "x" ]]; then
@@ -37,33 +32,12 @@ if [ -n "$WAYLAND_DISPLAY" ]; then
 fi
 
 if [ -n "$WESTON_USER" ]; then
-	if [ -z "$WESTON_TTY" ]; then
-		echo "ERROR: If you have WESTON_USER variable set, you also need WESTON_TTY."
-		exit 1
-	fi
 	if [ -z "$WESTON_GROUP" ]; then
 		# no explicit WESTON_GROUP given, therefore use WESTON_USER
 		export WESTON_GROUP="${WESTON_USER}"
 	fi
-	weston_args_user="-u $WESTON_USER -t $WESTON_TTY"
 fi
 
-if [ -n "$DISPLAY" ]; then
-	launcher="weston"
-else
-	launcher="weston-launch $weston_args_user --"
-fi
-
-openvt_args="-s"
-while [ -n "$1" ]; do
-	if [ "$1" = "--" ]; then
-		shift
-		break
-	fi
-	openvt_args="$openvt_args $1"
-	shift
-done
-
 weston_args=$*
 
 # Load and run modules
@@ -94,4 +68,4 @@ if test -z "$XDG_RUNTIME_DIR"; then
 	fi
 fi
 
-exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log
+su -c "XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` weston $weston_args --log=/tmp/weston.log" $WESTON_USER
diff --git a/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
deleted file mode 100644
index f8f7589499..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c8bfa1f8d576cdc6d515dbbac36c48c6166be0d5 Mon Sep 17 00:00:00 2001
-From: Marius Vlad <marius.vlad@collabora.com>
-Date: Thu, 1 Apr 2021 00:12:00 +0300
-Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down
-
-Tearing down the drm-backend when there are no input devices, would call
-for the gbm device destruction before compositor shutdown. The latter
-would call into the renderer detroy function and assume that the
-EGLDisplay, which was created using the before-mentioned gbm device, is
-still available. This patch re-orders the gbm destruction after the
-compositor shutdown when no one would make use of it.
-
-Fixes: #314
-
-Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
-Suggested-by: Daniel Stone <daniel.stone@collabora.com>
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb]
----
- libweston/backend-drm/drm.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
-index 2780f3b..fbcfeca 100644
---- a/libweston/backend-drm/drm.c
-+++ b/libweston/backend-drm/drm.c
-@@ -3025,10 +3025,6 @@ err_drm_source:
- err_udev_input:
- 	udev_input_destroy(&b->input);
- err_sprite:
--#ifdef BUILD_DRM_GBM
--	if (b->gbm)
--		gbm_device_destroy(b->gbm);
--#endif
- 	destroy_sprites(b);
- err_udev_dev:
- 	udev_device_unref(drm_device);
-@@ -3038,6 +3034,10 @@ err_launcher:
- 	weston_launcher_destroy(compositor->launcher);
- err_compositor:
- 	weston_compositor_shutdown(compositor);
-+#ifdef BUILD_DRM_GBM
-+	if (b->gbm)
-+		gbm_device_destroy(b->gbm);
-+#endif
- 	free(b);
- 	return NULL;
- }
---
-2.33.0
diff --git a/meta/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch b/meta/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch
deleted file mode 100644
index 06e0f7baec..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a2ba4714a6872e547621d29d9ddcb0f374b88cf6 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Tue, 20 Apr 2021 20:42:18 -0700
-Subject: [PATCH] meson.build: fix incorrect header
-
-The wayland.c actually include 'xdg-shell-client-protocol.h' instead of
-the server one, so fix it. Otherwise, it's possible to get build failure
-due to race condition.
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- libweston/backend-wayland/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libweston/backend-wayland/meson.build b/libweston/backend-wayland/meson.build
-index 7e82513..29270b5 100644
---- a/libweston/backend-wayland/meson.build
-+++ b/libweston/backend-wayland/meson.build
-@@ -10,7 +10,7 @@ srcs_wlwl = [
- 	fullscreen_shell_unstable_v1_protocol_c,
- 	presentation_time_protocol_c,
- 	presentation_time_server_protocol_h,
--	xdg_shell_server_protocol_h,
-+	xdg_shell_client_protocol_h,
- 	xdg_shell_protocol_c,
- ]
- 
--- 
-2.30.2
-
diff --git a/meta/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch b/meta/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch
deleted file mode 100644
index 6fe86ff3f0..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 58760e09eed662a72da939ff4802d605489cff8e Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Tue, 8 Sep 2020 19:37:42 -0400
-Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and
- O_CREAT
-
-musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(),
-O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors:
-
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock':
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration]
-|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
-|       |       ^~~~
-|       |       popen
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function)
-|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
-|       |                       ^~~~~~
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function)
-|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
-|       |                                ^~~~~~~~~
-| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function)
-|   135 |  fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
-|       |                                            ^~~~~~~
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/493/diffs?commit_id=b10c0e843dcb8148bbe869bb15261955b94ac98c]
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- tests/weston-test-fixture-compositor.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c
-index 0c9855f..e0e32c9 100644
---- a/tests/weston-test-fixture-compositor.c
-+++ b/tests/weston-test-fixture-compositor.c
-@@ -31,6 +31,7 @@
- #include <unistd.h>
- #include <sys/file.h>
- #include <errno.h>
-+#include <fcntl.h>
- 
- #include "shared/helpers.h"
- #include "weston-test-fixture-compositor.h"
--- 
-2.7.4
-
diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
deleted file mode 100644
index f6ebfd8f61..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From a1548c742bf2dedbb47282d8a00407b60bbab669 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require
-
- PAM
-
-weston-launch requires PAM for starting weston as a non-root user.
-
-Since starting weston as root is a valid use case by itself, if
-PAM is not available, provide a default version of weston-launch
-without non-root-user support.
-
-Upstream-Status: Denied [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725]
-
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-Signed-off-by: Ming Liu <ming.liu@toradex.com>
-
----
- libweston/meson.build     | 16 ++++++++++++----
- libweston/weston-launch.c | 21 +++++++++++++++++++++
- meson_options.txt         |  7 +++++++
- 3 files changed, 40 insertions(+), 4 deletions(-)
-
-diff --git a/libweston/meson.build b/libweston/meson.build
-index 08d23ec..cb9fd3f 100644
---- a/libweston/meson.build
-+++ b/libweston/meson.build
-@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency(
- )
- 
- if get_option('weston-launch')
--	dep_pam = cc.find_library('pam')
-+	deps_weston_launch = [systemd_dep, dep_libdrm]
- 
--	if not cc.has_function('pam_open_session', dependencies: dep_pam)
--		error('pam_open_session not found for weston-launch')
-+	if get_option('pam')
-+		dep_pam = cc.find_library('pam')
-+		if not cc.has_function('pam_open_session', dependencies: dep_pam)
-+			error('pam_open_session not found for weston-launch')
-+		endif
-+
-+		if dep_pam.found()
-+			deps_weston_launch += dep_pam
-+			config_h.set('HAVE_PAM', '1')
-+		endif
- 	endif
- 
- 	executable(
- 		'weston-launch',
- 		'weston-launch.c',
--		dependencies: [dep_pam, systemd_dep, dep_libdrm],
-+		dependencies: deps_weston_launch,
- 		include_directories: common_inc,
- 		install: true
- 	)
-diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 521cb2c..2d42d33 100644
---- a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -51,7 +51,9 @@
- 
- #include <pwd.h>
- #include <grp.h>
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
- 
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd)
- #endif
- 
- struct weston_launch {
-+#ifdef HAVE_PAM
- 	struct pam_conv pc;
- 	pam_handle_t *ph;
-+#endif
- 	int tty;
- 	int ttynr;
- 	int sock[2];
-@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl)
- 	return false;
- }
- 
-+#ifdef HAVE_PAM
- static int
- pam_conversation_fn(int msg_count,
- 		    const struct pam_message **messages,
-@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl)
- 
- 	return 0;
- }
-+#endif
- 
- static int
- setup_launcher_socket(struct weston_launch *wl)
-@@ -466,6 +472,7 @@ quit(struct weston_launch *wl, int status)
- 	close(wl->signalfd);
- 	close(wl->sock[0]);
- 
-+#ifdef HAVE_PAM
- 	if (wl->new_user) {
- 		err = pam_close_session(wl->ph, 0);
- 		if (err)
-@@ -473,6 +480,7 @@ quit(struct weston_launch *wl, int status)
- 				err, pam_strerror(wl->ph, err));
- 		pam_end(wl->ph, err);
- 	}
-+#endif
- 
- 	/*
- 	 * Get a fresh handle to the tty as the previous one is in
-@@ -710,6 +718,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
- 	setenv("HOME", wl->pw->pw_dir, 1);
- 	setenv("SHELL", wl->pw->pw_shell, 1);
- 
-+#ifdef HAVE_PAM
- 	env = pam_getenvlist(wl->ph);
- 	if (env) {
- 		for (i = 0; env[i]; ++i) {
-@@ -718,6 +727,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
- 		}
- 		free(env);
- 	}
-+#endif
- 
- 	/*
- 	 * We open a new session, so it makes sense
-@@ -789,8 +799,10 @@ static void
- help(const char *name)
- {
- 	fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-+#ifdef HAVE_PAM
- 	fprintf(stderr, "  -u, --user      Start session as specified username,\n"
- 			"                  e.g. -u joe, requires root.\n");
-+#endif
- 	fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
- 			"                  e.g. -t /dev/tty4, requires -u option.\n");
- 	fprintf(stderr, "  -v, --verbose   Be verbose\n");
-@@ -804,7 +816,9 @@ main(int argc, char *argv[])
- 	int i, c;
- 	char *tty = NULL;
- 	struct option opts[] = {
-+#ifdef HAVE_PAM
- 		{ "user",    required_argument, NULL, 'u' },
-+#endif
- 		{ "tty",     required_argument, NULL, 't' },
- 		{ "verbose", no_argument,       NULL, 'v' },
- 		{ "help",    no_argument,       NULL, 'h' },
-@@ -816,11 +830,16 @@ main(int argc, char *argv[])
- 	while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
- 		switch (c) {
- 		case 'u':
-+#ifdef HAVE_PAM
- 			wl.new_user = optarg;
- 			if (getuid() != 0) {
- 				fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
- 				exit(EXIT_FAILURE);
- 			}
-+#else
-+			fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n");
-+			exit(EXIT_FAILURE);
-+#endif
- 			break;
- 		case 't':
- 			tty = optarg;
-@@ -872,8 +891,10 @@ main(int argc, char *argv[])
- 	if (setup_tty(&wl, tty) < 0)
- 		exit(EXIT_FAILURE);
- 
-+#ifdef HAVE_PAM
- 	if (wl.new_user && setup_pam(&wl) < 0)
- 		exit(EXIT_FAILURE);
-+#endif
- 
- 	if (setup_launcher_socket(&wl) < 0)
- 		exit(EXIT_FAILURE);
-diff --git a/meson_options.txt b/meson_options.txt
-index 239bd2d..99e4ec3 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -73,6 +73,13 @@ option(
- )
- 
- option(
-+	'pam',
-+	type: 'boolean',
-+	value: true,
-+	description: 'Define if PAM is available'
-+)
-+
-+option(
- 	'xwayland',
- 	type: 'boolean',
- 	value: true,
diff --git a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
index a4444e5d18..1ac0695222 100644
--- a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
+++ b/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
@@ -1,4 +1,7 @@
-Fix atomic modesetting with musl
+From ece4c3d261aeec230869c0304ed1011ff6837c16 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 12 Sep 2020 14:04:04 -0700
+Subject: [PATCH] Fix atomic modesetting with musl
 
 atomic modesetting seems to fail with drm weston backend and this patch fixes
 it, below errors are seen before weston exits
@@ -8,9 +11,15 @@ atomic: couldn't commit new state: Invalid argument
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
+---
+ libweston/backend-drm/kms.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c
+index 780d007..9994da1 100644
 --- a/libweston/backend-drm/kms.c
 +++ b/libweston/backend-drm/kms.c
-@@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct dr
+@@ -1142,8 +1142,8 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state,
  		wl_list_for_each(plane, &b->plane_list, link) {
  			drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n",
  				  (unsigned long) plane->plane_id);
diff --git a/meta/recipes-graphics/wayland/weston_9.0.0.bb b/meta/recipes-graphics/wayland/weston_10.0.0.bb
similarity index 86%
rename from meta/recipes-graphics/wayland/weston_9.0.0.bb
rename to meta/recipes-graphics/wayland/weston_10.0.0.bb
index 59ab217a3b..fbb7927820 100644
--- a/meta/recipes-graphics/wayland/weston_9.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_10.0.0.bb
@@ -3,22 +3,19 @@ DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
 HOMEPAGE = "http://wayland.freedesktop.org"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
-                    file://libweston/compositor.c;endline=27;md5=6c53bbbd99273f4f7c4affa855c33c0a"
+                    file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \
+                    "
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://weston.png \
            file://weston.desktop \
            file://xwayland.weston-start \
            file://systemd-notify.weston-start \
-           file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
-           file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \
-           file://0001-meson.build-fix-incorrect-header.patch \
-           file://0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch \
-"
+           "
 
 SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch "
 
-SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe"
+SRC_URI[sha256sum] = "5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
 
@@ -34,13 +31,13 @@ LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '',
 
 WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
 
-EXTRA_OEMESON += "-Dbackend-default=auto -Dpipewire=false"
+EXTRA_OEMESON += "-Dpipewire=false"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
                    ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
-                   launch \
+                   ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \
                    image-jpeg \
                    screenshare \
                    shell-desktop \
@@ -59,11 +56,11 @@ PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libx
 # Headless Weston
 PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
 # Weston on framebuffer
-PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev"
+PACKAGECONFIG[fbdev] = "-Ddeprecated-backend-fbdev=true,-Ddeprecated-backend-fbdev=false,udev mtdev"
 # Weston on RDP
 PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp"
 # weston-launch
-PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm"
+PACKAGECONFIG[launch] = "-Ddeprecated-weston-launch=true,-Ddeprecated-weston-launch=false,drm"
 # VA-API desktop recorder
 PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva"
 # Weston with EGL support
@@ -82,8 +79,6 @@ PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-color
 PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
 # Virtual remote output with GStreamer on DRM backend
 PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base"
-# Weston with PAM support
-PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
 # Weston with screen-share support
 PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false"
 # Traditional desktop shell
@@ -94,6 +89,8 @@ PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=fa
 PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false"
 # JPEG image loading support
 PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
+# support libseat based launch
+PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd"
 
 do_install:append() {
 	# Weston doesn't need the .la files to load modules, so wipe them
-- 
2.20.1

[PATCH 03/33] gdb: update 11.1 -> 11.2

[Alexander Kanavin]

Simplyfy .inc structure: merge gdb.inc into gdb_11.2.bb, rename
gdb-${PV}.inc to gdb.inc. This will allow easier automatic updates.

Drop upstreamed patch.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/gdb/gdb-11.1.inc        |  19 --
 ...ian_11.1.bb => gdb-cross-canadian_11.2.bb} |   2 +-
 .../{gdb-cross_11.1.bb => gdb-cross_11.2.bb}  |   2 +-
 meta/recipes-devtools/gdb/gdb.inc             |  27 +-
 ...erver-register-set-selection-dynamic.patch | 317 ------------------
 .../gdb/{gdb_11.1.bb => gdb_11.2.bb}          |  13 +-
 6 files changed, 31 insertions(+), 349 deletions(-)
 delete mode 100644 meta/recipes-devtools/gdb/gdb-11.1.inc
 rename meta/recipes-devtools/gdb/{gdb-cross-canadian_11.1.bb => gdb-cross-canadian_11.2.bb} (71%)
 rename meta/recipes-devtools/gdb/{gdb-cross_11.1.bb => gdb-cross_11.2.bb} (50%)
 delete mode 100644 meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
 rename meta/recipes-devtools/gdb/{gdb_11.1.bb => gdb_11.2.bb} (80%)

diff --git a/meta/recipes-devtools/gdb/gdb-11.1.inc b/meta/recipes-devtools/gdb/gdb-11.1.inc
deleted file mode 100644
index 5364a880e3..0000000000
--- a/meta/recipes-devtools/gdb/gdb-11.1.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
-		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
-		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
-
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
-           file://0001-make-man-install-relative-to-DESTDIR.patch \
-           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
-           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
-           file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \
-           file://0006-use-asm-sgidefs.h.patch \
-           file://0007-Change-order-of-CFLAGS.patch \
-           file://0008-resolve-restrict-keyword-conflict.patch \
-           file://0009-Fix-invalid-sigprocmask-call.patch \
-           file://0010-gdbserver-ctrl-c-handling.patch \
-           file://0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch \
-           "
-SRC_URI[sha256sum] = "cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
similarity index 71%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
index 301035940c..4ab2b7156d 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
@@ -1,3 +1,3 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
-require gdb-${PV}.inc
+require gdb.inc
diff --git a/meta/recipes-devtools/gdb/gdb-cross_11.1.bb b/meta/recipes-devtools/gdb/gdb-cross_11.2.bb
similarity index 50%
rename from meta/recipes-devtools/gdb/gdb-cross_11.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross_11.2.bb
index 50cf159fdb..3b654a2f0d 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_11.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_11.2.bb
@@ -1,2 +1,2 @@
 require gdb-cross.inc
-require gdb-${PV}.inc
+require gdb.inc
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 2c95ed3ca0..cf801b192b 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -1,11 +1,18 @@
-require gdb-common.inc
-
-inherit gettext pkgconfig
-
-#LDFLAGS:append = " -s"
-#export CFLAGS:append=" -L${STAGING_LIBDIR}"
-
-# cross-canadian must not see this
-PACKAGES =+ "gdbserver"
-FILES:gdbserver = "${bindir}/gdbserver"
+LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
+		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
 
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
+           file://0001-make-man-install-relative-to-DESTDIR.patch \
+           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
+           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
+           file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \
+           file://0006-use-asm-sgidefs.h.patch \
+           file://0007-Change-order-of-CFLAGS.patch \
+           file://0008-resolve-restrict-keyword-conflict.patch \
+           file://0009-Fix-invalid-sigprocmask-call.patch \
+           file://0010-gdbserver-ctrl-c-handling.patch \
+           "
+SRC_URI[sha256sum] = "1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32"
diff --git a/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch b/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
deleted file mode 100644
index 6fc1859391..0000000000
--- a/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001
-From: Luis Machado <luis.machado@linaro.org>
-Date: Fri, 29 Oct 2021 14:54:36 -0300
-Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic
-
-The current register set selection mechanism for AArch64 is static, based
-on a pre-populated array of register sets.
-
-This means that we might potentially probe register sets that are not
-available. This is OK if the kernel errors out during ptrace, but probing the
-tag_ctl register, for example, does not result in a ptrace error if the kernel
-supports the tagged address ABI but not MTE (PR 28355).
-
-Making the register set selection dynamic, based on feature checks, solves
-this and simplifies the code a bit. It allows us to list all of the register
-sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties.
-
-gdb/ChangeLog:
-
-2021-11-03  Luis Machado  <luis.machado@linaro.org>
-
-	PR gdb/28355
-
-	* arch/aarch64.h (struct aarch64_features): New struct.
-
-gdbserver/ChangeLog:
-
-2021-11-03  Luis Machado  <luis.machado@linaro.org>
-
-	PR gdb/28355
-
-	* linux-aarch64-low.cc (is_sve_tdesc): Remove.
-	(aarch64_target::low_arch_setup): Rework to adjust the register sets.
-	(aarch64_regsets): Update to list all register sets.
-	(aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr.
-	(aarch64_sve_regsets, aarch64_sve_regsets_info)
-	(regs_info_aarch64_sve): Remove.
-	(aarch64_adjust_register_sets): New.
-	(aarch64_target::get_regs_info): Remove references to removed structs.
-	(initialize_low_arch): Likewise.
-
-[ChangeLog entry stripped so that patch applies cleanly]
-Upstream-Status: Accepted
----
-
-diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h
-index 0eb702c5b5e..95edb664b55 100644
---- a/gdb/arch/aarch64.h
-+++ b/gdb/arch/aarch64.h
-@@ -22,6 +22,15 @@
- 
- #include "gdbsupport/tdesc.h"
- 
-+/* Holds information on what architectural features are available.  This is
-+   used to select register sets.  */
-+struct aarch64_features
-+{
-+  bool sve = false;
-+  bool pauth = false;
-+  bool mte = false;
-+};
-+
- /* Create the aarch64 target description.  A non zero VQ value indicates both
-    the presence of SVE and the Vector Quotient - the number of 128bit chunks in
-    an SVE Z register.  HAS_PAUTH_P indicates the presence of the PAUTH
-diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc
-index daccfef746e..9a8cb4169a7 100644
---- a/gdbserver/linux-aarch64-low.cc
-+++ b/gdbserver/linux-aarch64-low.cc
-@@ -196,16 +196,6 @@ is_64bit_tdesc (void)
-   return register_size (regcache->tdesc, 0) == 8;
- }
- 
--/* Return true if the regcache contains the number of SVE registers.  */
--
--static bool
--is_sve_tdesc (void)
--{
--  struct regcache *regcache = get_thread_regcache (current_thread, 0);
--
--  return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve");
--}
--
- static void
- aarch64_fill_gregset (struct regcache *regcache, void *buf)
- {
-@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent,
-   *child->priv->arch_private = *parent->priv->arch_private;
- }
- 
--/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
--#define AARCH64_HWCAP_PACA (1 << 30)
--
--/* Implementation of linux target ops method "low_arch_setup".  */
--
--void
--aarch64_target::low_arch_setup ()
--{
--  unsigned int machine;
--  int is_elf64;
--  int tid;
--
--  tid = lwpid_of (current_thread);
--
--  is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
--
--  if (is_elf64)
--    {
--      uint64_t vq = aarch64_sve_get_vq (tid);
--      unsigned long hwcap = linux_get_hwcap (8);
--      unsigned long hwcap2 = linux_get_hwcap2 (8);
--      bool pauth_p = hwcap & AARCH64_HWCAP_PACA;
--      /* MTE is AArch64-only.  */
--      bool mte_p = hwcap2 & HWCAP2_MTE;
--
--      current_process ()->tdesc
--	= aarch64_linux_read_description (vq, pauth_p, mte_p);
--    }
--  else
--    current_process ()->tdesc = aarch32_linux_read_description ();
--
--  aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
--}
--
- /* Wrapper for aarch64_sve_regs_copy_to_reg_buf.  */
- 
- static void
-@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf)
-   return aarch64_sve_regs_copy_from_reg_buf (regcache, buf);
- }
- 
-+/* Array containing all the possible register sets for AArch64/Linux.  During
-+   architecture setup, these will be checked against the HWCAP/HWCAP2 bits for
-+   validity and enabled/disabled accordingly.
-+
-+   Their sizes are set to 0 here, but they will be adjusted later depending
-+   on whether each register set is available or not.  */
- static struct regset_info aarch64_regsets[] =
- {
-+  /* GPR registers.  */
-   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
--    sizeof (struct user_pt_regs), GENERAL_REGS,
-+    0, GENERAL_REGS,
-     aarch64_fill_gregset, aarch64_store_gregset },
-+  /* Floating Point (FPU) registers.  */
-   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET,
--    sizeof (struct user_fpsimd_state), FP_REGS,
-+    0, FP_REGS,
-     aarch64_fill_fpregset, aarch64_store_fpregset
-   },
-+  /* Scalable Vector Extension (SVE) registers.  */
-+  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
-+    0, EXTENDED_REGS,
-+    aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
-+  },
-+  /* PAC registers.  */
-   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
--    AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
--    NULL, aarch64_store_pauthregset },
-+    0, OPTIONAL_REGS,
-+    nullptr, aarch64_store_pauthregset },
-+  /* Tagged address control / MTE registers.  */
-   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
--    AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
--    aarch64_store_mteregset },
-+    0, OPTIONAL_REGS,
-+    aarch64_fill_mteregset, aarch64_store_mteregset },
-   NULL_REGSET
- };
- 
-@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info =
-   {
-     aarch64_regsets, /* regsets */
-     0, /* num_regsets */
--    NULL, /* disabled_regsets */
-+    nullptr, /* disabled_regsets */
-   };
- 
- static struct regs_info regs_info_aarch64 =
-   {
--    NULL, /* regset_bitmap */
--    NULL, /* usrregs */
-+    nullptr, /* regset_bitmap */
-+    nullptr, /* usrregs */
-     &aarch64_regsets_info,
-   };
- 
--static struct regset_info aarch64_sve_regsets[] =
-+/* Given FEATURES, adjust the available register sets by setting their
-+   sizes.  A size of 0 means the register set is disabled and won't be
-+   used.  */
-+
-+static void
-+aarch64_adjust_register_sets (const struct aarch64_features &features)
- {
--  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
--    sizeof (struct user_pt_regs), GENERAL_REGS,
--    aarch64_fill_gregset, aarch64_store_gregset },
--  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
--    SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS,
--    aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
--  },
--  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
--    AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
--    NULL, aarch64_store_pauthregset },
--  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
--    AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
--    aarch64_store_mteregset },
--  NULL_REGSET
--};
-+  struct regset_info *regset;
- 
--static struct regsets_info aarch64_sve_regsets_info =
--  {
--    aarch64_sve_regsets, /* regsets.  */
--    0, /* num_regsets.  */
--    NULL, /* disabled_regsets.  */
--  };
-+  for (regset = aarch64_regsets; regset->size >= 0; regset++)
-+    {
-+      switch (regset->nt_type)
-+	{
-+	case NT_PRSTATUS:
-+	  /* General purpose registers are always present.  */
-+	  regset->size = sizeof (struct user_pt_regs);
-+	  break;
-+	case NT_FPREGSET:
-+	  /* This is unavailable when SVE is present.  */
-+	  if (!features.sve)
-+	    regset->size = sizeof (struct user_fpsimd_state);
-+	  break;
-+	case NT_ARM_SVE:
-+	  if (features.sve)
-+	    regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE);
-+	  break;
-+	case NT_ARM_PAC_MASK:
-+	  if (features.pauth)
-+	    regset->size = AARCH64_PAUTH_REGS_SIZE;
-+	  break;
-+	case NT_ARM_TAGGED_ADDR_CTRL:
-+	  if (features.mte)
-+	    regset->size = AARCH64_LINUX_SIZEOF_MTE;
-+	  break;
-+	default:
-+	  gdb_assert_not_reached ("Unknown register set found.");
-+	}
-+    }
-+}
- 
--static struct regs_info regs_info_aarch64_sve =
--  {
--    NULL, /* regset_bitmap.  */
--    NULL, /* usrregs.  */
--    &aarch64_sve_regsets_info,
--  };
-+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
-+#define AARCH64_HWCAP_PACA (1 << 30)
-+
-+/* Implementation of linux target ops method "low_arch_setup".  */
-+
-+void
-+aarch64_target::low_arch_setup ()
-+{
-+  unsigned int machine;
-+  int is_elf64;
-+  int tid;
-+
-+  tid = lwpid_of (current_thread);
-+
-+  is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
-+
-+  if (is_elf64)
-+    {
-+      struct aarch64_features features;
-+
-+      uint64_t vq = aarch64_sve_get_vq (tid);
-+      features.sve = (vq > 0);
-+      /* A-profile PAC is 64-bit only.  */
-+      features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA;
-+      /* A-profile MTE is 64-bit only.  */
-+      features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE;
-+
-+      current_process ()->tdesc
-+	= aarch64_linux_read_description (vq, features.pauth, features.mte);
-+
-+      /* Adjust the register sets we should use for this particular set of
-+	 features.  */
-+      aarch64_adjust_register_sets (features);
-+    }
-+  else
-+    current_process ()->tdesc = aarch32_linux_read_description ();
-+
-+  aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
-+}
- 
- /* Implementation of linux target ops method "get_regs_info".  */
- 
-@@ -802,9 +821,7 @@ aarch64_target::get_regs_info ()
-   if (!is_64bit_tdesc ())
-     return &regs_info_aarch32;
- 
--  if (is_sve_tdesc ())
--    return &regs_info_aarch64_sve;
--
-+  /* AArch64 64-bit registers.  */
-   return &regs_info_aarch64;
- }
- 
-@@ -3294,5 +3311,4 @@ initialize_low_arch (void)
-   initialize_low_arch_aarch32 ();
- 
-   initialize_regsets_info (&aarch64_regsets_info);
--  initialize_regsets_info (&aarch64_sve_regsets_info);
- }
--- 
-2.27.0
-
diff --git a/meta/recipes-devtools/gdb/gdb_11.1.bb b/meta/recipes-devtools/gdb/gdb_11.2.bb
similarity index 80%
rename from meta/recipes-devtools/gdb/gdb_11.1.bb
rename to meta/recipes-devtools/gdb/gdb_11.2.bb
index e73e3a2c5c..9c6db4ca2c 100644
--- a/meta/recipes-devtools/gdb/gdb_11.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_11.2.bb
@@ -1,5 +1,15 @@
+require gdb-common.inc
+
+inherit gettext pkgconfig
+
+#LDFLAGS:append = " -s"
+#export CFLAGS:append=" -L${STAGING_LIBDIR}"
+
+# cross-canadian must not see this
+PACKAGES =+ "gdbserver"
+FILES:gdbserver = "${bindir}/gdbserver"
+
 require gdb.inc
-require gdb-${PV}.inc
 
 inherit python3-dir
 
@@ -26,3 +36,4 @@ EOF
 		chmod +x ${WORKDIR}/python
 	fi
 }
+
-- 
2.20.1

[PATCH 04/33] connman: update 1.40 -> 1.41

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0002-resolve-musl-does-not-implement-res_ninit.patch        | 2 +-
 .../connman/{connman_1.40.bb => connman_1.41.bb}                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/connman/{connman_1.40.bb => connman_1.41.bb} (85%)

diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 9dca21a02f..63a8fa81b1 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -1,4 +1,4 @@
-From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001
+From f2e6254a48fc0bb41b1617b7832aed4977230cf9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 6 Apr 2015 23:02:21 -0700
 Subject: [PATCH] resolve: musl does not implement res_ninit
diff --git a/meta/recipes-connectivity/connman/connman_1.40.bb b/meta/recipes-connectivity/connman/connman_1.41.bb
similarity index 85%
rename from meta/recipes-connectivity/connman/connman_1.40.bb
rename to meta/recipes-connectivity/connman/connman_1.41.bb
index edb23a1267..736b78eaeb 100644
--- a/meta/recipes-connectivity/connman/connman_1.40.bb
+++ b/meta/recipes-connectivity/connman/connman_1.41.bb
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
 
 SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
 
-SRC_URI[sha256sum] = "1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12"
+SRC_URI[sha256sum] = "79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589"
 
 RRECOMMENDS:${PN} = "connman-conf"
 RCONFLICTS:${PN} = "networkmanager"
-- 
2.20.1

[PATCH 05/33] util-linux: update 2.37.2 -> 2.37.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...til-linux-libuuid_2.37.2.bb => util-linux-libuuid_2.37.3.bb} | 0
 meta/recipes-core/util-linux/util-linux.inc                     | 2 +-
 .../util-linux/{util-linux_2.37.2.bb => util-linux_2.37.3.bb}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/util-linux/{util-linux-libuuid_2.37.2.bb => util-linux-libuuid_2.37.3.bb} (100%)
 rename meta/recipes-core/util-linux/{util-linux_2.37.2.bb => util-linux_2.37.3.bb} (100%)

diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.3.bb
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb
rename to meta/recipes-core/util-linux/util-linux-libuuid_2.37.3.bb
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 1e3cd28801..0309332722 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -37,4 +37,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
            file://avoid_parallel_tests.patch \
            "
 
-SRC_URI[sha256sum] = "6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9"
+SRC_URI[sha256sum] = "590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776"
diff --git a/meta/recipes-core/util-linux/util-linux_2.37.2.bb b/meta/recipes-core/util-linux/util-linux_2.37.3.bb
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux_2.37.2.bb
rename to meta/recipes-core/util-linux/util-linux_2.37.3.bb
-- 
2.20.1

[PATCH 06/33] cmake: update 3.22.1 -> 3.22.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../cmake/{cmake-native_3.22.1.bb => cmake-native_3.22.2.bb}    | 0
 meta/recipes-devtools/cmake/cmake.inc                           | 2 +-
 .../recipes-devtools/cmake/{cmake_3.22.1.bb => cmake_3.22.2.bb} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.22.1.bb => cmake-native_3.22.2.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.22.1.bb => cmake_3.22.2.bb} (100%)

diff --git a/meta/recipes-devtools/cmake/cmake-native_3.22.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.22.2.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.22.1.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.22.2.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 628734ac73..9276db3c56 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
 "
 
-SRC_URI[sha256sum] = "0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0"
+SRC_URI[sha256sum] = "3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
diff --git a/meta/recipes-devtools/cmake/cmake_3.22.1.bb b/meta/recipes-devtools/cmake/cmake_3.22.2.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.22.1.bb
rename to meta/recipes-devtools/cmake/cmake_3.22.2.bb
-- 
2.20.1

[PATCH 07/33] git: merge .inc into .bb

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/git/git.inc       | 141 -----------------------
 meta/recipes-devtools/git/git_2.34.1.bb | 142 +++++++++++++++++++++++-
 2 files changed, 141 insertions(+), 142 deletions(-)
 delete mode 100644 meta/recipes-devtools/git/git.inc

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
deleted file mode 100644
index 1d74270fdd..0000000000
--- a/meta/recipes-devtools/git/git.inc
+++ /dev/null
@@ -1,141 +0,0 @@
-SUMMARY = "Distributed version control system"
-HOMEPAGE = "http://git-scm.com"
-DESCRIPTION = "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
-SECTION = "console/utils"
-LICENSE = "GPLv2"
-DEPENDS = "openssl curl zlib expat"
-
-PROVIDES:append:class-native = " git-replacement-native"
-
-SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
-           ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \
-           file://fixsort.patch \
-"
-
-S = "${WORKDIR}/git-${PV}"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
-
-CVE_PRODUCT = "git-scm:git"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[cvsserver] = ""
-PACKAGECONFIG[svn] = ""
-
-EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
-		--without-tcltk \
-		--without-iconv \
-"
-EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig "
-
-# Needs brokensep as this doesn't use automake
-inherit autotools-brokensep perlnative bash-completion
-
-EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
-EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'"
-EXTRA_OEMAKE += "COMPUTE_HEADER_DEPENDENCIES=no"
-EXTRA_OEMAKE:append:class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1"
-
-do_compile:prepend () {
-	# Remove perl/perl.mak to fix the out-of-date perl.mak error
-	# during rebuild
-	rm -f perl/perl.mak
-}
-
-do_install () {
-	oe_runmake install DESTDIR="${D}" bindir=${bindir} \
-		template_dir=${datadir}/git-core/templates
-
-	for section in man1 man5 man7; do
-		install -d ${D}/${mandir}/$section
-		install -t ${D}/${mandir}/$section ${WORKDIR}/$section/*
-	done
-
-	install -d ${D}/${datadir}/bash-completion/completions/
-	install -m 644 ${S}/contrib/completion/git-completion.bash ${D}/${datadir}/bash-completion/completions/git
-}
-
-perl_native_fixup () {
-	sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
-	       -e 's#${libdir}/perl-native/#${libdir}/#' \
-	    ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')}
-
-	if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then
-		# Only install the git cvsserver command if explicitly requested
-		# as it requires the DBI Perl module, which does not exist in
-		# OE-Core.
-		rm ${D}${libexecdir}/git-core/git-cvsserver \
-		   ${D}${bindir}/git-cvsserver
-	fi
-
-	if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'svn', d)}" ]; then
-		# Only install the git svn command and all Git::SVN Perl modules
-		# if explicitly requested as they require the SVN::Core Perl
-		# module, which does not exist in OE-Core.
-		rm -r ${D}${libexecdir}/git-core/git-svn \
-		      ${D}${datadir}/perl5/Git/SVN*
-	fi
-}
-
-REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
-REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates"
-
-do_install:append:class-target () {
-	perl_native_fixup
-}
-
-do_install:append:class-native() {
-	create_wrapper ${D}${bindir}/git \
-		GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
-		GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
-}
-
-do_install:append:class-nativesdk() {
-	create_wrapper ${D}${bindir}/git \
-		GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
-		GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
-	perl_native_fixup
-}
-
-FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/"
-
-PERLTOOLS = " \
-    ${bindir}/git-cvsserver \
-    ${libexecdir}/git-core/git-add--interactive \
-    ${libexecdir}/git-core/git-archimport \
-    ${libexecdir}/git-core/git-cvsexportcommit \
-    ${libexecdir}/git-core/git-cvsimport \
-    ${libexecdir}/git-core/git-cvsserver \
-    ${libexecdir}/git-core/git-send-email \
-    ${libexecdir}/git-core/git-svn \
-    ${libexecdir}/git-core/git-instaweb \
-    ${datadir}/gitweb/gitweb.cgi \
-    ${datadir}/git-core/templates/hooks/prepare-commit-msg.sample \
-    ${datadir}/git-core/templates/hooks/pre-rebase.sample \
-    ${datadir}/git-core/templates/hooks/fsmonitor-watchman.sample \
-"
-
-# Git tools requiring perl
-PACKAGES =+ "${PN}-perltools"
-FILES:${PN}-perltools += " \
-    ${PERLTOOLS} \
-    ${libdir}/perl \
-    ${datadir}/perl5 \
-"
-
-RDEPENDS:${PN}-perltools = "${PN} perl perl-module-file-path findutils"
-
-# git-tk package with gitk and git-gui
-PACKAGES =+ "${PN}-tk"
-#RDEPENDS_${PN}-tk = "${PN} tk tcl"
-#EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh"
-FILES:${PN}-tk = " \
-    ${bindir}/gitk \
-    ${datadir}/gitk \
-"
-
-PACKAGES =+ "gitweb"
-FILES:gitweb = "${datadir}/gitweb/"
-RDEPENDS:gitweb = "perl"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/git/git_2.34.1.bb b/meta/recipes-devtools/git/git_2.34.1.bb
index 24081764a2..a762ebac99 100644
--- a/meta/recipes-devtools/git/git_2.34.1.bb
+++ b/meta/recipes-devtools/git/git_2.34.1.bb
@@ -1,4 +1,144 @@
-require git.inc
+SUMMARY = "Distributed version control system"
+HOMEPAGE = "http://git-scm.com"
+DESCRIPTION = "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+DEPENDS = "openssl curl zlib expat"
+
+PROVIDES:append:class-native = " git-replacement-native"
+
+SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
+           ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \
+           file://fixsort.patch \
+"
+
+S = "${WORKDIR}/git-${PV}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
+
+CVE_PRODUCT = "git-scm:git"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[cvsserver] = ""
+PACKAGECONFIG[svn] = ""
+
+EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
+		--without-tcltk \
+		--without-iconv \
+"
+EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig "
+
+# Needs brokensep as this doesn't use automake
+inherit autotools-brokensep perlnative bash-completion
+
+EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
+EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'"
+EXTRA_OEMAKE += "COMPUTE_HEADER_DEPENDENCIES=no"
+EXTRA_OEMAKE:append:class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1"
+
+do_compile:prepend () {
+	# Remove perl/perl.mak to fix the out-of-date perl.mak error
+	# during rebuild
+	rm -f perl/perl.mak
+}
+
+do_install () {
+	oe_runmake install DESTDIR="${D}" bindir=${bindir} \
+		template_dir=${datadir}/git-core/templates
+
+	for section in man1 man5 man7; do
+		install -d ${D}/${mandir}/$section
+		install -t ${D}/${mandir}/$section ${WORKDIR}/$section/*
+	done
+
+	install -d ${D}/${datadir}/bash-completion/completions/
+	install -m 644 ${S}/contrib/completion/git-completion.bash ${D}/${datadir}/bash-completion/completions/git
+}
+
+perl_native_fixup () {
+	sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
+	       -e 's#${libdir}/perl-native/#${libdir}/#' \
+	    ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')}
+
+	if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then
+		# Only install the git cvsserver command if explicitly requested
+		# as it requires the DBI Perl module, which does not exist in
+		# OE-Core.
+		rm ${D}${libexecdir}/git-core/git-cvsserver \
+		   ${D}${bindir}/git-cvsserver
+	fi
+
+	if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'svn', d)}" ]; then
+		# Only install the git svn command and all Git::SVN Perl modules
+		# if explicitly requested as they require the SVN::Core Perl
+		# module, which does not exist in OE-Core.
+		rm -r ${D}${libexecdir}/git-core/git-svn \
+		      ${D}${datadir}/perl5/Git/SVN*
+	fi
+}
+
+REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
+REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates"
+
+do_install:append:class-target () {
+	perl_native_fixup
+}
+
+do_install:append:class-native() {
+	create_wrapper ${D}${bindir}/git \
+		GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
+		GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
+}
+
+do_install:append:class-nativesdk() {
+	create_wrapper ${D}${bindir}/git \
+		GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
+		GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
+	perl_native_fixup
+}
+
+FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/"
+
+PERLTOOLS = " \
+    ${bindir}/git-cvsserver \
+    ${libexecdir}/git-core/git-add--interactive \
+    ${libexecdir}/git-core/git-archimport \
+    ${libexecdir}/git-core/git-cvsexportcommit \
+    ${libexecdir}/git-core/git-cvsimport \
+    ${libexecdir}/git-core/git-cvsserver \
+    ${libexecdir}/git-core/git-send-email \
+    ${libexecdir}/git-core/git-svn \
+    ${libexecdir}/git-core/git-instaweb \
+    ${datadir}/gitweb/gitweb.cgi \
+    ${datadir}/git-core/templates/hooks/prepare-commit-msg.sample \
+    ${datadir}/git-core/templates/hooks/pre-rebase.sample \
+    ${datadir}/git-core/templates/hooks/fsmonitor-watchman.sample \
+"
+
+# Git tools requiring perl
+PACKAGES =+ "${PN}-perltools"
+FILES:${PN}-perltools += " \
+    ${PERLTOOLS} \
+    ${libdir}/perl \
+    ${datadir}/perl5 \
+"
+
+RDEPENDS:${PN}-perltools = "${PN} perl perl-module-file-path findutils"
+
+# git-tk package with gitk and git-gui
+PACKAGES =+ "${PN}-tk"
+#RDEPENDS_${PN}-tk = "${PN} tk tcl"
+#EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh"
+FILES:${PN}-tk = " \
+    ${bindir}/gitk \
+    ${datadir}/gitk \
+"
+
+PACKAGES =+ "gitweb"
+FILES:gitweb = "${datadir}/gitweb/"
+RDEPENDS:gitweb = "perl"
+
+BBCLASSEXTEND = "native nativesdk"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-- 
2.20.1

[PATCH 08/33] git: build manpages from source subject to manpages PACKAGECONFIG

[Alexander Kanavin]

This allows automated updates, and better aligns with how
documentation is handled in oe-core.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/git/git_2.34.1.bb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/git/git_2.34.1.bb b/meta/recipes-devtools/git/git_2.34.1.bb
index a762ebac99..71ff6d444c 100644
--- a/meta/recipes-devtools/git/git_2.34.1.bb
+++ b/meta/recipes-devtools/git/git_2.34.1.bb
@@ -8,7 +8,6 @@ DEPENDS = "openssl curl zlib expat"
 PROVIDES:append:class-native = " git-replacement-native"
 
 SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
-           ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \
            file://fixsort.patch \
 "
 
@@ -21,6 +20,7 @@ CVE_PRODUCT = "git-scm:git"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[cvsserver] = ""
 PACKAGECONFIG[svn] = ""
+PACKAGECONFIG[manpages] = ",,asciidoc-native xmlto-native"
 
 EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
 		--without-tcltk \
@@ -29,7 +29,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
 EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig "
 
 # Needs brokensep as this doesn't use automake
-inherit autotools-brokensep perlnative bash-completion
+inherit autotools-brokensep perlnative bash-completion manpages
 
 EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
 EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'"
@@ -40,19 +40,22 @@ do_compile:prepend () {
 	# Remove perl/perl.mak to fix the out-of-date perl.mak error
 	# during rebuild
 	rm -f perl/perl.mak
+
+        if [ "${@bb.utils.filter('PACKAGECONFIG', 'manpages', d)}" ]; then
+            oe_runmake man
+        fi
 }
 
 do_install () {
 	oe_runmake install DESTDIR="${D}" bindir=${bindir} \
 		template_dir=${datadir}/git-core/templates
 
-	for section in man1 man5 man7; do
-		install -d ${D}/${mandir}/$section
-		install -t ${D}/${mandir}/$section ${WORKDIR}/$section/*
-	done
-
 	install -d ${D}/${datadir}/bash-completion/completions/
 	install -m 644 ${S}/contrib/completion/git-completion.bash ${D}/${datadir}/bash-completion/completions/git
+
+        if [ "${@bb.utils.filter('PACKAGECONFIG', 'manpages', d)}" ]; then
+            oe_runmake install-man DESTDIR="${D}"
+        fi
 }
 
 perl_native_fixup () {
@@ -146,4 +149,3 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
 SRC_URI[tarball.sha256sum] = "fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1"
-SRC_URI[manpages.sha256sum] = "220f1ed68582caeddf79c4db15e4eaa4808ec01fd11889e19232f0a74d7f31b0"
-- 
2.20.1

[PATCH 09/33] git: update 2.34.1 -> 2.35.1

[Alexander Kanavin]

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

diff --git a/meta/recipes-devtools/git/git_2.34.1.bb b/meta/recipes-devtools/git/git_2.35.1.bb
similarity index 98%
rename from meta/recipes-devtools/git/git_2.34.1.bb
rename to meta/recipes-devtools/git/git_2.35.1.bb
index 71ff6d444c..62017b98ef 100644
--- a/meta/recipes-devtools/git/git_2.34.1.bb
+++ b/meta/recipes-devtools/git/git_2.35.1.bb
@@ -148,4 +148,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1"
+SRC_URI[tarball.sha256sum] = "9845a37dd01f9faaa7d8aa2078399d3aea91b43819a5efea6e2877b0af09bd43"
-- 
2.20.1

[PATCH 10/33] python3-pycryptodome: update 3.12.0 -> 3.14.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/python/python-pycryptodome.inc         | 2 +-
 meta/recipes-devtools/python/python3-pycryptodome_3.12.0.bb  | 5 -----
 meta/recipes-devtools/python/python3-pycryptodome_3.14.0.bb  | 5 +++++
 ...cryptodomex_3.12.0.bb => python3-pycryptodomex_3.14.0.bb} | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-pycryptodome_3.12.0.bb
 create mode 100644 meta/recipes-devtools/python/python3-pycryptodome_3.14.0.bb
 rename meta/recipes-devtools/python/{python3-pycryptodomex_3.12.0.bb => python3-pycryptodomex_3.14.0.bb} (69%)

diff --git a/meta/recipes-devtools/python/python-pycryptodome.inc b/meta/recipes-devtools/python/python-pycryptodome.inc
index 071af557ea..29fe80d224 100644
--- a/meta/recipes-devtools/python/python-pycryptodome.inc
+++ b/meta/recipes-devtools/python/python-pycryptodome.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=29242a70410a4eeff488a28164e7ab93"
 
 inherit pypi
 
-PYPI_PACKAGE_EXT = "zip"
+PYPI_PACKAGE_EXT = "tar.gz"
 
 RDEPENDS:${PN} += " \
     ${PYTHON_PN}-io \
diff --git a/meta/recipes-devtools/python/python3-pycryptodome_3.12.0.bb b/meta/recipes-devtools/python/python3-pycryptodome_3.12.0.bb
deleted file mode 100644
index a732441a7a..0000000000
--- a/meta/recipes-devtools/python/python3-pycryptodome_3.12.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require python-pycryptodome.inc
-inherit setuptools3
-
-SRC_URI[sha256sum] = "12c7343aec5a3b3df5c47265281b12b611f26ec9367b6129199d67da54b768c1"
-
diff --git a/meta/recipes-devtools/python/python3-pycryptodome_3.14.0.bb b/meta/recipes-devtools/python/python3-pycryptodome_3.14.0.bb
new file mode 100644
index 0000000000..fb2f8d5ff0
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pycryptodome_3.14.0.bb
@@ -0,0 +1,5 @@
+require python-pycryptodome.inc
+inherit setuptools3
+
+SRC_URI[sha256sum] = "ceea92a4b8ba6c50d8d70f2efbb4ea14b002dac4160ce4dda33f1b7442f8158a"
+
diff --git a/meta/recipes-devtools/python/python3-pycryptodomex_3.12.0.bb b/meta/recipes-devtools/python/python3-pycryptodomex_3.14.0.bb
similarity index 69%
rename from meta/recipes-devtools/python/python3-pycryptodomex_3.12.0.bb
rename to meta/recipes-devtools/python/python3-pycryptodomex_3.14.0.bb
index 5f88419ce4..b83549840d 100644
--- a/meta/recipes-devtools/python/python3-pycryptodomex_3.12.0.bb
+++ b/meta/recipes-devtools/python/python3-pycryptodomex_3.14.0.bb
@@ -1,7 +1,7 @@
 require python-pycryptodome.inc
 inherit setuptools3
 
-SRC_URI[sha256sum] = "922e9dac0166e4617e5c7980d2cff6912a6eb5cb5c13e7ece222438650bd7f66"
+SRC_URI[sha256sum] = "2d8bda8f949b79b78b293706aa7fc1e5c171c62661252bfdd5d12c70acd03282"
 
 FILES:${PN}-tests = " \
     ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
-- 
2.20.1

[PATCH 11/33] at: update 3.2.2 -> 3.2.4

[Alexander Kanavin]

Drop patch for issue fixed upstream.

Change additional source copying to be a part of do_configure
to allow automated upgrades.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../at/at/fix_parallel_build_error.patch      | 37 -------------------
 .../at/{at_3.2.2.bb => at_3.2.4.bb}           | 24 ++++++------
 2 files changed, 11 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-extended/at/at/fix_parallel_build_error.patch
 rename meta/recipes-extended/at/{at_3.2.2.bb => at_3.2.4.bb} (81%)

diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/meta/recipes-extended/at/at/fix_parallel_build_error.patch
deleted file mode 100644
index e4f32b82b6..0000000000
--- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Wed, 5 Dec 2018 09:46:22 +0800
-Subject: [PATCH] fix parallel build error
-
-make -j was failing sometimesa like this
-| ccache i586-poky-linux-gcc -march=i586 --sysroot=/home/nitin/build/build0/tmp/sysroots/i586-poky-linux -I. -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -o atd atd.o daemon.o  -lfl  -lpam -Wl,-O1 -Wl,--as-needed
-| parsetime.l:5:19: fatal error: y.tab.h: No such file or directory
-| compilation terminated.
-| make: *** [lex.yy.o] Error 1
-| make: *** Waiting for unfinished jobs....
-
-Fixed the issue by adding a dependency in the makefile.
-Nitin <nitin.a.kamble@intel.com>
-2010/09/02
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- Makefile.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: at-3.2.1/Makefile.in
-===================================================================
---- at-3.2.1.orig/Makefile.in
-+++ at-3.2.1/Makefile.in
-@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y
- lex.yy.c: parsetime.l
- 	$(LEX) -i parsetime.l
- 
-+parsetime.l: y.tab.h
-+
- atd.service: atd.service.in
- 	cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@
- 
diff --git a/meta/recipes-extended/at/at_3.2.2.bb b/meta/recipes-extended/at/at_3.2.4.bb
similarity index 81%
rename from meta/recipes-extended/at/at_3.2.2.bb
rename to meta/recipes-extended/at/at_3.2.4.bb
index 14b9dace2a..af8c3d6b4c 100644
--- a/meta/recipes-extended/at/at_3.2.2.bb
+++ b/meta/recipes-extended/at/at_3.2.4.bb
@@ -23,21 +23,20 @@ RCONFLICTS:${PN} = "atd"
 RREPLACES:${PN} = "atd"
 
 SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \
-    file://fix_parallel_build_error.patch \
-    file://posixtm.c \
-    file://posixtm.h \
-    file://file_replacement_with_gplv2.patch \
-    file://atd.init \
-    file://atd.service \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
-    file://makefile-fix-parallel.patch \
-    file://0001-remove-glibc-assumption.patch \
-    "
+           file://posixtm.c \
+           file://posixtm.h \
+           file://file_replacement_with_gplv2.patch \
+           file://atd.init \
+           file://atd.service \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
+           file://makefile-fix-parallel.patch \
+           file://0001-remove-glibc-assumption.patch \
+           "
 
 PAM_SRC_URI = "file://pam.conf.patch \
                file://configure-add-enable-pam.patch"
 
-SRC_URI[sha256sum] = "2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088"
+SRC_URI[sha256sum] = "76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684"
 
 EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
                  --with-daemon_username=root \
@@ -53,10 +52,9 @@ INITSCRIPT_PARAMS = "defaults"
 
 SYSTEMD_SERVICE:${PN} = "atd.service"
 
-copy_sources() {
+do_configure:prepend() {
 	cp -f ${WORKDIR}/posixtm.[ch] ${S}
 }
-do_patch[postfuncs] += "copy_sources"
 
 do_install () {
 	oe_runmake -e "IROOT=${D}" install
-- 
2.20.1

[PATCH 12/33] sudo: update 1.9.8p2 -> 1.9.9

[Alexander Kanavin]

License-Update: markdown conversion, copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/sudo/sudo.inc                           | 2 +-
 meta/recipes-extended/sudo/{sudo_1.9.8p2.bb => sudo_1.9.9.bb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/sudo/{sudo_1.9.8p2.bb => sudo_1.9.9.bb} (96%)

diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 82040de8aa..05d030c2e9 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
 BUGTRACKER = "http://www.sudo.ws/bugs/"
 SECTION = "admin"
 LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=b969d389e79703121cbffc9f3ea18a8b \
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=16cf60b466f3a0606427a7b624a3a670 \
                     file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \
                     file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \
                     file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \
diff --git a/meta/recipes-extended/sudo/sudo_1.9.8p2.bb b/meta/recipes-extended/sudo/sudo_1.9.9.bb
similarity index 96%
rename from meta/recipes-extended/sudo/sudo_1.9.8p2.bb
rename to meta/recipes-extended/sudo/sudo_1.9.9.bb
index b2afd1f98c..f1c0339bb3 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.8p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.9.bb
@@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
 
 PAM_SRC_URI = "file://sudo.pam"
 
-SRC_URI[sha256sum] = "9e3b8b8da7def43b6e60c257abe80467205670fd0f7c081de1423c414b680f2d"
+SRC_URI[sha256sum] = "6d6ee863a3bc26c87661093a74ec63e10fd031ceba714642d21636dfe25e3e00"
 
 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
-- 
2.20.1

[PATCH 13/33] xf86-input-libinput: update 1.2.0 -> 1.2.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...86-input-libinput_1.2.0.bb => xf86-input-libinput_1.2.1.bb} | 3 ++-
 meta/recipes-graphics/xorg-driver/xorg-driver-common.inc       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-libinput_1.2.0.bb => xf86-input-libinput_1.2.1.bb} (67%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb
similarity index 67%
rename from meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb
index b0168df8d1..e1c47aa5e7 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a22925127bd3c827c384cedd23ed2309"
 
 DEPENDS += "libinput"
 
-SRC_URI[sha256sum] = "f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6"
+XORG_DRIVER_COMPRESSOR = ".tar.xz"
+SRC_URI[sha256sum] = "8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b"
 
 FILES:${PN} += "${datadir}/X11/xorg.conf.d"
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 65c5e3c48a..0b1df44fe0 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -8,7 +8,8 @@ PE = "2"
 
 DEPENDS = "virtual/xserver xorgproto util-macros"
 
-SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
+XORG_DRIVER_COMPRESSOR ?= ".tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}${XORG_DRIVER_COMPRESSOR}"
 
 FILES:${PN} += " ${libdir}/xorg/modules/drivers/*.so"
 
-- 
2.20.1

[PATCH 14/33] libgpg-error: update 1.43 -> 1.44

[Alexander Kanavin]

Drop accepted patch.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...not-hardcode-gnu-libc-when-generatin.patch | 27 -------------------
 ...gpg-error_1.43.bb => libgpg-error_1.44.bb} |  3 +--
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.43.bb => libgpg-error_1.44.bb} (89%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch
deleted file mode 100644
index ef7a7df1b8..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7437acb228678ea5d8288b930b4f5b72c3d449ed Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 24 May 2021 11:03:42 +0200
-Subject: [PATCH] configure.ac: do not hardcode gnu libc when generating
- lock-obj
-
-This erroneously excluded e.g. musl libc.
-
-Upstream-Status: Submitted [by email to gniibe@fsij.org,gnupg-devel@gnupg.org]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c0aab53..6d46d13 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -603,7 +603,7 @@ if test x"$gl_use_threads" = xno; then
-   AC_MSG_NOTICE([generated src/lock-obj-pub.native.h for $host])
- elif test x$cross_compiling = xyes; then
-   case $host in
--    *-*-linux-gnu*)
-+    *-*-linux-*)
-     AC_CHECK_TOOL(OBJDUMP, [objdump])
-     if test -n "$OBJDUMP"; then
-       lock_obj_h_generated=yes
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.43.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.44.bb
similarity index 89%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.44.bb
index fe3824b8e0..e3171f0f25 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.44.bb
@@ -17,10 +17,9 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
            file://0001-Do-not-fail-when-testing-config-scripts.patch \
-           file://0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch \
            "
 
-SRC_URI[sha256sum] = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf"
+SRC_URI[sha256sum] = "8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.20.1

[PATCH 15/33] ell: upgrade 0.47 -> 0.48

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-core/ell/{ell_0.47.bb => ell_0.48.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ell/{ell_0.47.bb => ell_0.48.bb} (89%)

diff --git a/meta/recipes-core/ell/ell_0.47.bb b/meta/recipes-core/ell/ell_0.48.bb
similarity index 89%
rename from meta/recipes-core/ell/ell_0.47.bb
rename to meta/recipes-core/ell/ell_0.48.bb
index 1db0065a37..737302a444 100644
--- a/meta/recipes-core/ell/ell_0.47.bb
+++ b/meta/recipes-core/ell/ell_0.48.bb
@@ -16,7 +16,7 @@ inherit autotools pkgconfig
 
 SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \
            "
-SRC_URI[sha256sum] = "4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9"
+SRC_URI[sha256sum] = "9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5"
 
 do_configure:prepend () {
     mkdir -p ${S}/build-aux
-- 
2.20.1

[PATCH 16/33] glib-2.0: upgrade 2.70.2 -> 2.70.3

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch      | 2 +-
 .../glib-2.0/{glib-2.0_2.70.2.bb => glib-2.0_2.70.3.bb}         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.70.2.bb => glib-2.0_2.70.3.bb} (96%)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index 2118c7e6b9..d3bb05e669 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,4 +1,4 @@
-From f4b144cbcd474d5f4982e654607fd609e056b532 Mon Sep 17 00:00:00 2001
+From d4e95568151cb7a62b6a29a4d2c3f532fd55c98c Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.70.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.70.3.bb
similarity index 96%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.70.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.70.3.bb
index df0dde5080..760f71dcda 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.70.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.70.3.bb
@@ -20,7 +20,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            "
 SRC_URI:append:class-native = " file://relocate-modules.patch"
 
-SRC_URI[sha256sum] = "0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f"
+SRC_URI[sha256sum] = "233fa4841c1e19e396db7607d58f6b75ba3313c50bf0fce07b2e3532d5eb7d46"
 
 # Find any meson cross files in FILESPATH that are relevant for the current
 # build (using siteinfo) and add them to EXTRA_OEMESON.
-- 
2.20.1

[PATCH 17/33] lua: upgrade 5.4.3 -> 5.4.4

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...9057a5146755e737c479850f87fd0e3b6868.patch | 43 -------------------
 .../lua/{lua_5.4.3.bb => lua_5.4.4.bb}        | 12 ++----
 2 files changed, 3 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-devtools/lua/lua/74d99057a5146755e737c479850f87fd0e3b6868.patch
 rename meta/recipes-devtools/lua/{lua_5.4.3.bb => lua_5.4.4.bb} (80%)

diff --git a/meta/recipes-devtools/lua/lua/74d99057a5146755e737c479850f87fd0e3b6868.patch b/meta/recipes-devtools/lua/lua/74d99057a5146755e737c479850f87fd0e3b6868.patch
deleted file mode 100644
index dcdc04837d..0000000000
--- a/meta/recipes-devtools/lua/lua/74d99057a5146755e737c479850f87fd0e3b6868.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 74d99057a5146755e737c479850f87fd0e3b6868 Mon Sep 17 00:00:00 2001
-From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
-Date: Wed, 3 Nov 2021 15:04:18 -0300
-Subject: [PATCH] Bug: C stack overflow with coroutines
-
-'coroutine.resume' did not increment counter of C calls when
-continuing execution after a protected error (that is,
-while running 'precover').
----
- ldo.c             |  6 ++++--
- testes/cstack.lua | 14 ++++++++++++++
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-Upstream-Status: Backport [https://github.com/lua/lua/commit/74d99057a5146755e737c479850f87fd0e3b6868.patch]
-CVE: CVE-2021-43519
-
-diff --git a/src/ldo.c b/src/ldo.c
-index d0edc8b4f..66f890364 100644
---- a/src/ldo.c
-+++ b/src/ldo.c
-@@ -759,11 +759,10 @@ static void resume (lua_State *L, void *ud) {
-   StkId firstArg = L->top - n;  /* first argument */
-   CallInfo *ci = L->ci;
-   if (L->status == LUA_OK)  /* starting a coroutine? */
--    ccall(L, firstArg - 1, LUA_MULTRET, 1);  /* just call its body */
-+    ccall(L, firstArg - 1, LUA_MULTRET, 0);  /* just call its body */
-   else {  /* resuming from previous yield */
-     lua_assert(L->status == LUA_YIELD);
-     L->status = LUA_OK;  /* mark that it is running (again) */
--    luaE_incCstack(L);  /* control the C stack */
-     if (isLua(ci)) {  /* yielded inside a hook? */
-       L->top = firstArg;  /* discard arguments */
-       luaV_execute(L, ci);  /* just continue running Lua code */
-@@ -814,6 +813,9 @@ LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs,
-   else if (L->status != LUA_YIELD)  /* ended with errors? */
-     return resume_error(L, "cannot resume dead coroutine", nargs);
-   L->nCcalls = (from) ? getCcalls(from) : 0;
-+  if (getCcalls(L) >= LUAI_MAXCCALLS)
-+    return resume_error(L, "C stack overflow", nargs);
-+  L->nCcalls++;
-   luai_userstateresume(L, nargs);
-   api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
-   status = luaD_rawrunprotected(L, resume, &nargs);
diff --git a/meta/recipes-devtools/lua/lua_5.4.3.bb b/meta/recipes-devtools/lua/lua_5.4.4.bb
similarity index 80%
rename from meta/recipes-devtools/lua/lua_5.4.3.bb
rename to meta/recipes-devtools/lua/lua_5.4.4.bb
index a204242bc0..f50328ecfd 100644
--- a/meta/recipes-devtools/lua/lua_5.4.3.bb
+++ b/meta/recipes-devtools/lua/lua_5.4.4.bb
@@ -7,19 +7,13 @@ HOMEPAGE = "http://www.lua.org/"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \
            file://lua.pc.in \
            ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest file://run-ptest ', '', d)} \
-           file://74d99057a5146755e737c479850f87fd0e3b6868.patch \
            "
 
 # if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release.
-PV_testsuites = "5.4.3"
+PV_testsuites = "5.4.4"
 
-SRC_URI[tarballsrc.sha256sum] = "f8612276169e3bfcbcfb8f226195bfc6e466fe13042f1076cbde92b7ec96bbfb"
-SRC_URI[tarballtest.sha256sum] = "5d29c3022897a8290f280ebe1c6853248dfa35a668e1fc02ba9c8cde4e7bf110"
-
-# remove at next version upgrade or when output changes
-# was added after intermittent repro failures poisoned the cache
-PR = "r1"
-HASHEQUIV_HASH_VERSION .= ".2"
+SRC_URI[tarballsrc.sha256sum] = "164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61"
+SRC_URI[tarballtest.sha256sum] = "04d28355cd67a2299dfe5708b55a0ff221ccb1a3907a3113cc103ccc05ac6aad"
 
 inherit pkgconfig binconfig ptest
 
-- 
2.20.1

[PATCH 18/33] mmc-utils: upgrade to latest revision

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 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 5ccdaceb79..918c0a429c 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d"
 
 SRCBRANCH ?= "master"
-SRCREV = "3969aa4804edb8aed7bcb3c958e49d0c7388b067"
+SRCREV = "fd41dca5b14df7faefdda5dc6c0bbcdc8f6facc0"
 
 PV = "0.1+git${SRCPV}"
 
-- 
2.20.1

[PATCH 19/33] python3-cython: upgrade 0.29.26 -> 0.29.27

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/python/python-cython.inc                  | 2 +-
 .../{python3-cython_0.29.26.bb => python3-cython_0.29.27.bb}    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-cython_0.29.26.bb => python3-cython_0.29.27.bb} (100%)

diff --git a/meta/recipes-devtools/python/python-cython.inc b/meta/recipes-devtools/python/python-cython.inc
index 278da5ea72..aeff3e77ef 100644
--- a/meta/recipes-devtools/python/python-cython.inc
+++ b/meta/recipes-devtools/python/python-cython.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa"
 PYPI_PACKAGE = "Cython"
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[sha256sum] = "af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312"
+SRC_URI[sha256sum] = "c6a442504db906dfc13a480e96850cced994ecdc076bcf492c43515b78f70da2"
 UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar"
 
 inherit pypi
diff --git a/meta/recipes-devtools/python/python3-cython_0.29.26.bb b/meta/recipes-devtools/python/python3-cython_0.29.27.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-cython_0.29.26.bb
rename to meta/recipes-devtools/python/python3-cython_0.29.27.bb
-- 
2.20.1

[PATCH 20/33] python3-hypothesis: upgrade 6.36.0 -> 6.36.1

[Alexander Kanavin]

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

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

diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.36.0.bb b/meta/recipes-devtools/python/python3-hypothesis_6.36.1.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.36.0.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.36.1.bb
index 3918d7d15c..24def74905 100644
--- a/meta/recipes-devtools/python/python3-hypothesis_6.36.0.bb
+++ b/meta/recipes-devtools/python/python3-hypothesis_6.36.1.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
     file://test_rle.py \
     "
 
-SRC_URI[sha256sum] = "2b9c56faa067d660f0802679689f825bf142eec8261ab9e2e6ea916b1d8278a1"
+SRC_URI[sha256sum] = "46cbee9d7aed822149af75ec63d5f86cd1042df69b2e8eae17b26a56a4dda781"
 
 RDEPENDS:${PN} += " \
     python3-attrs \
-- 
2.20.1

[PATCH 21/33] python3-pip: upgrade 21.3.1 -> 22.0.2

[Alexander Kanavin]

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

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../python/{python3-pip_21.3.1.bb => python3-pip_22.0.2.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-pip_21.3.1.bb => python3-pip_22.0.2.bb} (79%)

diff --git a/meta/recipes-devtools/python/python3-pip_21.3.1.bb b/meta/recipes-devtools/python/python3-pip_22.0.2.bb
similarity index 79%
rename from meta/recipes-devtools/python/python3-pip_21.3.1.bb
rename to meta/recipes-devtools/python/python3-pip_22.0.2.bb
index c893135059..e70a9556e3 100644
--- a/meta/recipes-devtools/python/python3-pip_21.3.1.bb
+++ b/meta/recipes-devtools/python/python3-pip_22.0.2.bb
@@ -2,7 +2,7 @@ SUMMARY = "The PyPA recommended tool for installing Python packages"
 HOMEPAGE = "https://pypi.org/project/pip"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030"
 
 DEPENDS += "python3 python3-setuptools-native"
 
@@ -10,7 +10,7 @@ inherit pypi setuptools3
 
 SRC_URI += "file://0001-change-shebang-to-python3.patch"
 
-SRC_URI[sha256sum] = "fd11ba3d0fdb4c07fbc5ecbba0b1b719809420f25038f8ee3cd913d3faa3033a"
+SRC_URI[sha256sum] = "27b4b70c34ec35f77947f777070d8331adbb1e444842e98e7150c288dc0caea4"
 
 do_install:append() {
     # Install as pip3 and leave pip2 as default
-- 
2.20.1

[PATCH 22/33] cups: upgrade 2.4.0 -> 2.4.1

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-extended/cups/{cups_2.4.0.bb => cups_2.4.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/cups/{cups_2.4.0.bb => cups_2.4.1.bb} (51%)

diff --git a/meta/recipes-extended/cups/cups_2.4.0.bb b/meta/recipes-extended/cups/cups_2.4.1.bb
similarity index 51%
rename from meta/recipes-extended/cups/cups_2.4.0.bb
rename to meta/recipes-extended/cups/cups_2.4.1.bb
index 42be34c4f3..27c88f82c7 100644
--- a/meta/recipes-extended/cups/cups_2.4.0.bb
+++ b/meta/recipes-extended/cups/cups_2.4.1.bb
@@ -2,4 +2,4 @@ require cups.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRC_URI[sha256sum] = "9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de"
+SRC_URI[sha256sum] = "c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178"
-- 
2.20.1

[PATCH 23/33] stress-ng: upgrade 0.13.10 -> 0.13.11

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../stress-ng/{stress-ng_0.13.10.bb => stress-ng_0.13.11.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/stress-ng/{stress-ng_0.13.10.bb => stress-ng_0.13.11.bb} (93%)

diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.13.10.bb b/meta/recipes-extended/stress-ng/stress-ng_0.13.11.bb
similarity index 93%
rename from meta/recipes-extended/stress-ng/stress-ng_0.13.10.bb
rename to meta/recipes-extended/stress-ng/stress-ng_0.13.11.bb
index 700ee1595e..72c9de38b1 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.13.10.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.13.11.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master"
-SRCREV = "b81116cb69a97aa671ab207a7f600aaacca091d1"
+SRCREV = "48be8ff4ffc4a04a0e3b5f2feaf63cce0cbd4f2b"
 S = "${WORKDIR}/git"
 
 DEPENDS = "coreutils-native"
-- 
2.20.1

[PATCH 24/33] harfbuzz: upgrade 3.2.0 -> 3.3.1

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../harfbuzz/{harfbuzz_3.2.0.bb => harfbuzz_3.3.1.bb}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_3.2.0.bb => harfbuzz_3.3.1.bb} (95%)

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_3.2.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_3.3.1.bb
similarity index 95%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_3.2.0.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_3.3.1.bb
index 647bafc4d3..656b556d29 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_3.2.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_3.3.1.bb
@@ -12,7 +12,7 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd"
+SRC_URI[sha256sum] = "8c083384838f39f4a4856a6584def595b10cc071754a08d5e999293462b34296"
 
 inherit meson pkgconfig lib_package gtk-doc gobject-introspection
 
-- 
2.20.1

[PATCH 25/33] mesa: upgrade 21.3.4 -> 21.3.5

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../mesa/{mesa-gl_21.3.4.bb => mesa-gl_21.3.5.bb}               | 0
 meta/recipes-graphics/mesa/mesa.inc                             | 2 +-
 meta/recipes-graphics/mesa/{mesa_21.3.4.bb => mesa_21.3.5.bb}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_21.3.4.bb => mesa-gl_21.3.5.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_21.3.4.bb => mesa_21.3.5.bb} (100%)

diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_21.3.5.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb
rename to meta/recipes-graphics/mesa/mesa-gl_21.3.5.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 71cc3b4617..e8093f5665 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch \
            "
 
-SRC_URI[sha256sum] = "77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d"
+SRC_URI[sha256sum] = "d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta/recipes-graphics/mesa/mesa_21.3.4.bb b/meta/recipes-graphics/mesa/mesa_21.3.5.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_21.3.4.bb
rename to meta/recipes-graphics/mesa/mesa_21.3.5.bb
-- 
2.20.1

[PATCH 26/33] piglit: upgrade to latest revision

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...file.py-make-test-lists-reproducible.patch | 31 -------------
 ...gen_tcs-tes_input_tests.py-do-not-ha.patch | 44 -------------------
 ...lizer.py-make-.gz-files-reproducible.patch | 30 -------------
 ...sort-the-file-list-before-working-on.patch | 28 ------------
 meta/recipes-graphics/piglit/piglit_git.bb    |  6 +--
 5 files changed, 1 insertion(+), 138 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-framework-profile.py-make-test-lists-reproducible.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-serializer.py-make-.gz-files-reproducible.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-shader.py-sort-the-file-list-before-working-on.patch

diff --git a/meta/recipes-graphics/piglit/piglit/0001-framework-profile.py-make-test-lists-reproducible.patch b/meta/recipes-graphics/piglit/piglit/0001-framework-profile.py-make-test-lists-reproducible.patch
deleted file mode 100644
index c90f601cfa..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-framework-profile.py-make-test-lists-reproducible.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9086d42df1f3134bafcfe33ff16db7bbb9d9a0fd Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 30 Nov 2020 23:08:22 +0000
-Subject: [PATCH] framework/profile.py: make test lists reproducible
-
-These are created with os.walk, which yields different
-order depending on where it's run.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- framework/profile.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/framework/profile.py b/framework/profile.py
-index c210e535e..9b5d51d68 100644
---- a/framework/profile.py
-+++ b/framework/profile.py
-@@ -528,7 +528,11 @@ class TestProfile(object):
-                 else:
-                     opts[n] = self.test_list[n]
-         else:
--            opts = self.test_list  # pylint: disable=redefined-variable-type
-+            opts = collections.OrderedDict()
-+            test_keys = list(self.test_list.keys())
-+            test_keys.sort()
-+            for k in test_keys:
-+                opts[k] = self.test_list[k]
- 
-         for k, v in self.filters.run(opts.items()):
-             yield k, v
diff --git a/meta/recipes-graphics/piglit/piglit/0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch b/meta/recipes-graphics/piglit/piglit/0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch
deleted file mode 100644
index cb675e8d99..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1b23539aece156f6fe0789cb988f22e5915228f6 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 10 Nov 2020 17:12:32 +0000
-Subject: [PATCH 1/2] generated_tests/gen_tcs/tes_input_tests.py: do not
- hardcode the full binary path
-
-This helps reproducibility.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- generated_tests/gen_tcs_input_tests.py | 2 +-
- generated_tests/gen_tes_input_tests.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/generated_tests/gen_tcs_input_tests.py b/generated_tests/gen_tcs_input_tests.py
-index face4f19a..e36671af4 100644
---- a/generated_tests/gen_tcs_input_tests.py
-+++ b/generated_tests/gen_tcs_input_tests.py
-@@ -272,7 +272,7 @@ class Test(object):
-             relative probe rgb (0.75, 0.75) (0.0, 1.0, 0.0)
-             """)
- 
--        test = test.format(self=self, generator_command=" ".join(sys.argv))
-+        test = test.format(self=self, generator_command="generated_tests/gen_tcs_input_tests.py")
- 
-         filename = self.filename()
-         dirname = os.path.dirname(filename)
-diff --git a/generated_tests/gen_tes_input_tests.py b/generated_tests/gen_tes_input_tests.py
-index 3d847b5cc..954840b20 100644
---- a/generated_tests/gen_tes_input_tests.py
-+++ b/generated_tests/gen_tes_input_tests.py
-@@ -301,7 +301,7 @@ class Test(object):
-             relative probe rgb (0.75, 0.75) (0.0, 1.0, 0.0)
-             """)
- 
--        test = test.format(self=self, generator_command=" ".join(sys.argv))
-+        test = test.format(self=self, generator_command="generated_tests/gen_tes_input_tests.py")
- 
-         filename = self.filename()
-         dirname = os.path.dirname(filename)
--- 
-2.17.1
-
diff --git a/meta/recipes-graphics/piglit/piglit/0001-serializer.py-make-.gz-files-reproducible.patch b/meta/recipes-graphics/piglit/piglit/0001-serializer.py-make-.gz-files-reproducible.patch
deleted file mode 100644
index a1db2987ac..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-serializer.py-make-.gz-files-reproducible.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1919bb7f4072d73dcbb64d0e06eff5b04529c3db Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 16 Nov 2020 18:01:02 +0000
-Subject: [PATCH] serializer.py: make .gz files reproducible
-
-.gz format contains mtime of the compressed data, and
-SOURCE_DATE_EPOCH is the standard way to make it reproducuble.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- tests/serializer.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/serializer.py b/tests/serializer.py
-index bd14bc3db..bc5b45d7f 100644
---- a/tests/serializer.py
-+++ b/tests/serializer.py
-@@ -138,7 +138,10 @@ def serializer(name, profile, outfile):
-                 et.SubElement(env, 'env', name=k, value=v)
- 
-     tree = et.ElementTree(root)
--    with gzip.open(outfile, 'wb') as f:
-+    reproducible_mtime = None
-+    if 'SOURCE_DATE_EPOCH' in os.environ:
-+        reproducible_mtime=os.environ['SOURCE_DATE_EPOCH']
-+    with gzip.GzipFile(outfile, 'wb', mtime=reproducible_mtime) as f:
-         tree.write(f, encoding='utf-8', xml_declaration=True)
- 
- 
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-shader.py-sort-the-file-list-before-working-on.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-shader.py-sort-the-file-list-before-working-on.patch
deleted file mode 100644
index dee876bcbe..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-shader.py-sort-the-file-list-before-working-on.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5bf89c6a314952313b2b762fff0d5501fe57ac53 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 2 Dec 2020 21:21:52 +0000
-Subject: [PATCH] tests/shader.py: sort the file list before working on it
-
-This allows later xml output to be reproducible.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- tests/shader.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/shader.py b/tests/shader.py
-index 849273660..e6e65d1ba 100644
---- a/tests/shader.py
-+++ b/tests/shader.py
-@@ -52,7 +52,9 @@ for basedir in [TESTS_DIR, GENERATED_TESTS_DIR]:
- for group, files in shader_tests.items():
-     assert group not in profile.test_list, 'duplicate group: {}'.format(group)
- 
--    # We'll end up with a list of tuples, split that into two lists
-+    # This makes the xml output reproducible, as os.walk() order is random
-+    files.sort()
-+    # We'll end up with a list of tuples, split that into two list
-     files, installedfiles = list(zip(*files))
-     files = list(files)
-     installedfiles = list(installedfiles)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 08bbbac05a..807b2a2819 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -10,15 +10,11 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
            file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
            file://0001-Add-a-missing-include-for-htobe32-definition.patch \
-           file://0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch \
            file://0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \
-           file://0001-serializer.py-make-.gz-files-reproducible.patch \
-           file://0001-framework-profile.py-make-test-lists-reproducible.patch \
-           file://0001-tests-shader.py-sort-the-file-list-before-working-on.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "11ee10ba04a95d4b36ef844420f0a5838002b5a8"
+SRCREV = "f328af2ddd0d1bab0f3d149373a36657b252b337"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
-- 
2.20.1

[PATCH 27/33] wayland-protocols: upgrade 1.24 -> 1.25

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../{wayland-protocols_1.24.bb => wayland-protocols_1.25.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/wayland/{wayland-protocols_1.24.bb => wayland-protocols_1.25.bb} (91%)

diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.24.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.25.bb
similarity index 91%
rename from meta/recipes-graphics/wayland/wayland-protocols_1.24.bb
rename to meta/recipes-graphics/wayland/wayland-protocols_1.25.bb
index 0cfdb90b68..074801b22d 100644
--- a/meta/recipes-graphics/wayland/wayland-protocols_1.24.bb
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.25.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            "
-SRC_URI[sha256sum] = "bff0d8cffeeceb35159d6f4aa6bab18c807b80642c9d50f66cba52ecf7338bc2"
+SRC_URI[sha256sum] = "f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
 
-- 
2.20.1

[PATCH 28/33] lttng-tools: upgrade 2.13.2 -> 2.13.4

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../lttng/{lttng-tools_2.13.2.bb => lttng-tools_2.13.4.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-kernel/lttng/{lttng-tools_2.13.2.bb => lttng-tools_2.13.4.bb} (98%)

diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.2.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
similarity index 98%
rename from meta/recipes-kernel/lttng/lttng-tools_2.13.2.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
index d6ce2c7e32..98b91270ba 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.2.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
@@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://disable-tests.patch \
            "
 
-SRC_URI[sha256sum] = "ced2ba00020da77fd17ac92b5a53825502409a07e3aeca28f9515d4a844fd7bd"
+SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6"
 
 inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
 
-- 
2.20.1

[PATCH 29/33] puzzles: upgrade to latest revision

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 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 0bf878fc96..381d3cc456 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"
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "229d062d6ce63f0a5e00d2de62ee0fb389ccfdb6"
+SRCREV = "c43a34fbfe430d235bafc379595761880a19ed9f"
 PE = "2"
 PV = "0.0+git${SRCPV}"
 
-- 
2.20.1

[PATCH 30/33] diffoscope: upgrade 201 -> 202

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../diffoscope/{diffoscope_201.bb => diffoscope_202.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/diffoscope/{diffoscope_201.bb => diffoscope_202.bb} (92%)

diff --git a/meta/recipes-support/diffoscope/diffoscope_201.bb b/meta/recipes-support/diffoscope/diffoscope_202.bb
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_201.bb
rename to meta/recipes-support/diffoscope/diffoscope_202.bb
index b3c25e1bda..8273056c59 100644
--- a/meta/recipes-support/diffoscope/diffoscope_201.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_202.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "07bd0b2972e7c4926db7f65bcf23fd106ad42169dbdaef3dc63278af82c5e38f"
+SRC_URI[sha256sum] = "cf0d4e1505818403ec8678fd9b8b4c3b955fb1d041c5d826e69f20021bff8a1e"
 
 RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
 
-- 
2.20.1

[PATCH 31/33] libcap: upgrade 2.62 -> 2.63

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...nativesdk-libcap-Raise-the-size-of-arrays-containing.patch | 4 ++--
 .../recipes-support/libcap/{libcap_2.62.bb => libcap_2.63.bb} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.62.bb => libcap_2.63.bb} (96%)

diff --git a/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch b/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
index 89f6bcd65f..9884fb5641 100644
--- a/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
+++ b/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
@@ -1,4 +1,4 @@
-From 42b3e19d4e584fb9b47fb471e02bb25de90ac641 Mon Sep 17 00:00:00 2001
+From fc60e000169618a4adced845b9462d36ced1efdd Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 14 Oct 2021 15:57:36 +0800
 Subject: [PATCH] nativesdk-libcap: Raise the size of arrays containing dl
@@ -20,7 +20,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libcap/execable.h b/libcap/execable.h
-index 0bcc5d4..6e2a080 100644
+index fee17b4..5bb0c55 100644
 --- a/libcap/execable.h
 +++ b/libcap/execable.h
 @@ -23,7 +23,7 @@
diff --git a/meta/recipes-support/libcap/libcap_2.62.bb b/meta/recipes-support/libcap/libcap_2.63.bb
similarity index 96%
rename from meta/recipes-support/libcap/libcap_2.62.bb
rename to meta/recipes-support/libcap/libcap_2.63.bb
index e08cac7218..4b7111890e 100644
--- a/meta/recipes-support/libcap/libcap_2.62.bb
+++ b/meta/recipes-support/libcap/libcap_2.63.bb
@@ -16,7 +16,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
 SRC_URI:append:class-nativesdk = " \
            file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \
            "
-SRC_URI[sha256sum] = "190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2"
+SRC_URI[sha256sum] = "0c637b8f44fc7d8627787e9cf57f15ac06c1ddccb53e41feec5496be3466f77f"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
 
-- 
2.20.1

[PATCH 32/33] libusb1: upgrade 1.0.24 -> 1.0.25

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../libusb/{libusb1_1.0.24.bb => libusb1_1.0.25.bb}             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/libusb/{libusb1_1.0.24.bb => libusb1_1.0.25.bb} (94%)

diff --git a/meta/recipes-support/libusb/libusb1_1.0.24.bb b/meta/recipes-support/libusb/libusb1_1.0.25.bb
similarity index 94%
rename from meta/recipes-support/libusb/libusb1_1.0.24.bb
rename to meta/recipes-support/libusb/libusb1_1.0.25.bb
index e70021f4f7..ca812b018e 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.24.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.25.bb
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/libusb/libusb/releases/download/v${PV}/libusb-${PV
 
 UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb/releases"
 
-SRC_URI[sha256sum] = "7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a"
+SRC_URI[sha256sum] = "8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849"
 
 S = "${WORKDIR}/libusb-${PV}"
 
-- 
2.20.1

[PATCH 33/33] re2c: upgrade 2.2 -> 3.0

[Alexander Kanavin]

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

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-support/re2c/{re2c_2.2.bb => re2c_3.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/re2c/{re2c_2.2.bb => re2c_3.0.bb} (91%)

diff --git a/meta/recipes-support/re2c/re2c_2.2.bb b/meta/recipes-support/re2c/re2c_3.0.bb
similarity index 91%
rename from meta/recipes-support/re2c/re2c_2.2.bb
rename to meta/recipes-support/re2c/re2c_3.0.bb
index 9a0968a984..ab047601ae 100644
--- a/meta/recipes-support/re2c/re2c_2.2.bb
+++ b/meta/recipes-support/re2c/re2c_3.0.bb
@@ -8,7 +8,7 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=64eca4d8a3b67f9dc7656094731a2c8d"
 
 SRC_URI = "https://github.com/skvadrik/re2c/releases/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda"
+SRC_URI[sha256sum] = "b3babbbb1461e13fe22c630a40c43885efcfbbbb585830c6f4c0d791cf82ba0b"
 UPSTREAM_CHECK_URI = "https://github.com/skvadrik/re2c/releases"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.20.1

Re: [OE-core] [PATCH 27/33] wayland-protocols: upgrade 1.24 -> 1.25

[Denys Dmytriyenko]

https://git.openembedded.org/openembedded-core/commit/?id=66dc75cf5e6b741ef7ba011841cd5ceeebf17b36


On Wed, Feb 02, 2022 at 07:27:52PM +0100, Alexander Kanavin wrote:
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  .../{wayland-protocols_1.24.bb => wayland-protocols_1.25.bb}    | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>  rename meta/recipes-graphics/wayland/{wayland-protocols_1.24.bb => wayland-protocols_1.25.bb} (91%)
> 
> diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.24.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.25.bb
> similarity index 91%
> rename from meta/recipes-graphics/wayland/wayland-protocols_1.24.bb
> rename to meta/recipes-graphics/wayland/wayland-protocols_1.25.bb
> index 0cfdb90b68..074801b22d 100644
> --- a/meta/recipes-graphics/wayland/wayland-protocols_1.24.bb
> +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.25.bb
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
>  
>  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
>             "
> -SRC_URI[sha256sum] = "bff0d8cffeeceb35159d6f4aa6bab18c807b80642c9d50f66cba52ecf7338bc2"
> +SRC_URI[sha256sum] = "f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460"
>  
>  UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
>  
> -- 
> 2.20.1
> 

Re: [OE-core] [PATCH 15/33] ell: upgrade 0.47 -> 0.48

[Denys Dmytriyenko]

https://git.openembedded.org/openembedded-core/commit/?id=53070e8e119d90b633db8b26ba002ae95f2cfcca


On Wed, Feb 02, 2022 at 07:27:40PM +0100, Alexander Kanavin wrote:
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/recipes-core/ell/{ell_0.47.bb => ell_0.48.bb} | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>  rename meta/recipes-core/ell/{ell_0.47.bb => ell_0.48.bb} (89%)
> 
> diff --git a/meta/recipes-core/ell/ell_0.47.bb b/meta/recipes-core/ell/ell_0.48.bb
> similarity index 89%
> rename from meta/recipes-core/ell/ell_0.47.bb
> rename to meta/recipes-core/ell/ell_0.48.bb
> index 1db0065a37..737302a444 100644
> --- a/meta/recipes-core/ell/ell_0.47.bb
> +++ b/meta/recipes-core/ell/ell_0.48.bb
> @@ -16,7 +16,7 @@ inherit autotools pkgconfig
>  
>  SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \
>             "
> -SRC_URI[sha256sum] = "4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9"
> +SRC_URI[sha256sum] = "9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5"
>  
>  do_configure:prepend () {
>      mkdir -p ${S}/build-aux
> -- 
> 2.20.1
> 

Re: [OE-core] [PATCH 28/33] lttng-tools: upgrade 2.13.2 -> 2.13.4

[Denys Dmytriyenko]

https://git.openembedded.org/openembedded-core/commit/?id=7de004c74447b3075abb9641843254a7a5c7233b


On Wed, Feb 02, 2022 at 07:27:53PM +0100, Alexander Kanavin wrote:
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  .../lttng/{lttng-tools_2.13.2.bb => lttng-tools_2.13.4.bb}      | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>  rename meta/recipes-kernel/lttng/{lttng-tools_2.13.2.bb => lttng-tools_2.13.4.bb} (98%)
> 
> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.2.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
> similarity index 98%
> rename from meta/recipes-kernel/lttng/lttng-tools_2.13.2.bb
> rename to meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
> index d6ce2c7e32..98b91270ba 100644
> --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.2.bb
> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
> @@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
>             file://disable-tests.patch \
>             "
>  
> -SRC_URI[sha256sum] = "ced2ba00020da77fd17ac92b5a53825502409a07e3aeca28f9515d4a844fd7bd"
> +SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6"
>  
>  inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
>  
> -- 
> 2.20.1
> 

Re: [OE-core] [PATCH 04/33] connman: update 1.40 -> 1.41

[Denys Dmytriyenko]

https://git.openembedded.org/openembedded-core/commit/?id=54c896c76ba5955990f27ed1ec5dd81d2f9d09e2


On Wed, Feb 02, 2022 at 07:27:29PM +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../0002-resolve-musl-does-not-implement-res_ninit.patch        | 2 +-
>  .../connman/{connman_1.40.bb => connman_1.41.bb}                | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-connectivity/connman/{connman_1.40.bb => connman_1.41.bb} (85%)
> 
> diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
> index 9dca21a02f..63a8fa81b1 100644
> --- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
> +++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
> @@ -1,4 +1,4 @@
> -From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001
> +From f2e6254a48fc0bb41b1617b7832aed4977230cf9 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Mon, 6 Apr 2015 23:02:21 -0700
>  Subject: [PATCH] resolve: musl does not implement res_ninit
> diff --git a/meta/recipes-connectivity/connman/connman_1.40.bb b/meta/recipes-connectivity/connman/connman_1.41.bb
> similarity index 85%
> rename from meta/recipes-connectivity/connman/connman_1.40.bb
> rename to meta/recipes-connectivity/connman/connman_1.41.bb
> index edb23a1267..736b78eaeb 100644
> --- a/meta/recipes-connectivity/connman/connman_1.40.bb
> +++ b/meta/recipes-connectivity/connman/connman_1.41.bb
> @@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
>  
>  SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
>  
> -SRC_URI[sha256sum] = "1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12"
> +SRC_URI[sha256sum] = "79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589"
>  
>  RRECOMMENDS:${PN} = "connman-conf"
>  RCONFLICTS:${PN} = "networkmanager"
> -- 
> 2.20.1
> 

Re: [OE-core] [PATCH 03/33] gdb: update 11.1 -> 11.2

[Denys Dmytriyenko]

https://git.openembedded.org/openembedded-core/commit/?id=f24c2bf93a9549ae5a21ce378a7bf47ef052ad65

I realize these are in master-next and haven't been merged to master yet. 
Richard mentioned there are some issues with one of the autobuilder nodes 
and hence master-next is taking longer to test lately.

I don't believe bombarding Richard with duplicate patches improves his 
productivity. :) On his behalf I'm asking for a bit more patience and 
understanding...


On Wed, Feb 02, 2022 at 07:27:28PM +0100, Alexander Kanavin wrote:
> Simplyfy .inc structure: merge gdb.inc into gdb_11.2.bb, rename
> gdb-${PV}.inc to gdb.inc. This will allow easier automatic updates.
> 
> Drop upstreamed patch.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/recipes-devtools/gdb/gdb-11.1.inc        |  19 --
>  ...ian_11.1.bb => gdb-cross-canadian_11.2.bb} |   2 +-
>  .../{gdb-cross_11.1.bb => gdb-cross_11.2.bb}  |   2 +-
>  meta/recipes-devtools/gdb/gdb.inc             |  27 +-
>  ...erver-register-set-selection-dynamic.patch | 317 ------------------
>  .../gdb/{gdb_11.1.bb => gdb_11.2.bb}          |  13 +-
>  6 files changed, 31 insertions(+), 349 deletions(-)
>  delete mode 100644 meta/recipes-devtools/gdb/gdb-11.1.inc
>  rename meta/recipes-devtools/gdb/{gdb-cross-canadian_11.1.bb => gdb-cross-canadian_11.2.bb} (71%)
>  rename meta/recipes-devtools/gdb/{gdb-cross_11.1.bb => gdb-cross_11.2.bb} (50%)
>  delete mode 100644 meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
>  rename meta/recipes-devtools/gdb/{gdb_11.1.bb => gdb_11.2.bb} (80%)
> 
> diff --git a/meta/recipes-devtools/gdb/gdb-11.1.inc b/meta/recipes-devtools/gdb/gdb-11.1.inc
> deleted file mode 100644
> index 5364a880e3..0000000000
> --- a/meta/recipes-devtools/gdb/gdb-11.1.inc
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
> -		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
> -		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
> -		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
> -
> -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
> -           file://0001-make-man-install-relative-to-DESTDIR.patch \
> -           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
> -           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
> -           file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \
> -           file://0006-use-asm-sgidefs.h.patch \
> -           file://0007-Change-order-of-CFLAGS.patch \
> -           file://0008-resolve-restrict-keyword-conflict.patch \
> -           file://0009-Fix-invalid-sigprocmask-call.patch \
> -           file://0010-gdbserver-ctrl-c-handling.patch \
> -           file://0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch \
> -           "
> -SRC_URI[sha256sum] = "cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94"
> diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
> similarity index 71%
> rename from meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb
> rename to meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
> index 301035940c..4ab2b7156d 100644
> --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_11.1.bb
> +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_11.2.bb
> @@ -1,3 +1,3 @@
>  require gdb-common.inc
>  require gdb-cross-canadian.inc
> -require gdb-${PV}.inc
> +require gdb.inc
> diff --git a/meta/recipes-devtools/gdb/gdb-cross_11.1.bb b/meta/recipes-devtools/gdb/gdb-cross_11.2.bb
> similarity index 50%
> rename from meta/recipes-devtools/gdb/gdb-cross_11.1.bb
> rename to meta/recipes-devtools/gdb/gdb-cross_11.2.bb
> index 50cf159fdb..3b654a2f0d 100644
> --- a/meta/recipes-devtools/gdb/gdb-cross_11.1.bb
> +++ b/meta/recipes-devtools/gdb/gdb-cross_11.2.bb
> @@ -1,2 +1,2 @@
>  require gdb-cross.inc
> -require gdb-${PV}.inc
> +require gdb.inc
> diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
> index 2c95ed3ca0..cf801b192b 100644
> --- a/meta/recipes-devtools/gdb/gdb.inc
> +++ b/meta/recipes-devtools/gdb/gdb.inc
> @@ -1,11 +1,18 @@
> -require gdb-common.inc
> -
> -inherit gettext pkgconfig
> -
> -#LDFLAGS:append = " -s"
> -#export CFLAGS:append=" -L${STAGING_LIBDIR}"
> -
> -# cross-canadian must not see this
> -PACKAGES =+ "gdbserver"
> -FILES:gdbserver = "${bindir}/gdbserver"
> +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
> +		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
> +		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
> +		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
>  
> +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
> +           file://0001-make-man-install-relative-to-DESTDIR.patch \
> +           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
> +           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
> +           file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \
> +           file://0006-use-asm-sgidefs.h.patch \
> +           file://0007-Change-order-of-CFLAGS.patch \
> +           file://0008-resolve-restrict-keyword-conflict.patch \
> +           file://0009-Fix-invalid-sigprocmask-call.patch \
> +           file://0010-gdbserver-ctrl-c-handling.patch \
> +           "
> +SRC_URI[sha256sum] = "1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32"
> diff --git a/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch b/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
> deleted file mode 100644
> index 6fc1859391..0000000000
> --- a/meta/recipes-devtools/gdb/gdb/0011-AArch64-Make-gdbserver-register-set-selection-dynamic.patch
> +++ /dev/null
> @@ -1,317 +0,0 @@
> -From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001
> -From: Luis Machado <luis.machado@linaro.org>
> -Date: Fri, 29 Oct 2021 14:54:36 -0300
> -Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic
> -
> -The current register set selection mechanism for AArch64 is static, based
> -on a pre-populated array of register sets.
> -
> -This means that we might potentially probe register sets that are not
> -available. This is OK if the kernel errors out during ptrace, but probing the
> -tag_ctl register, for example, does not result in a ptrace error if the kernel
> -supports the tagged address ABI but not MTE (PR 28355).
> -
> -Making the register set selection dynamic, based on feature checks, solves
> -this and simplifies the code a bit. It allows us to list all of the register
> -sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties.
> -
> -gdb/ChangeLog:
> -
> -2021-11-03  Luis Machado  <luis.machado@linaro.org>
> -
> -	PR gdb/28355
> -
> -	* arch/aarch64.h (struct aarch64_features): New struct.
> -
> -gdbserver/ChangeLog:
> -
> -2021-11-03  Luis Machado  <luis.machado@linaro.org>
> -
> -	PR gdb/28355
> -
> -	* linux-aarch64-low.cc (is_sve_tdesc): Remove.
> -	(aarch64_target::low_arch_setup): Rework to adjust the register sets.
> -	(aarch64_regsets): Update to list all register sets.
> -	(aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr.
> -	(aarch64_sve_regsets, aarch64_sve_regsets_info)
> -	(regs_info_aarch64_sve): Remove.
> -	(aarch64_adjust_register_sets): New.
> -	(aarch64_target::get_regs_info): Remove references to removed structs.
> -	(initialize_low_arch): Likewise.
> -
> -[ChangeLog entry stripped so that patch applies cleanly]
> -Upstream-Status: Accepted
> ----
> -
> -diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h
> -index 0eb702c5b5e..95edb664b55 100644
> ---- a/gdb/arch/aarch64.h
> -+++ b/gdb/arch/aarch64.h
> -@@ -22,6 +22,15 @@
> - 
> - #include "gdbsupport/tdesc.h"
> - 
> -+/* Holds information on what architectural features are available.  This is
> -+   used to select register sets.  */
> -+struct aarch64_features
> -+{
> -+  bool sve = false;
> -+  bool pauth = false;
> -+  bool mte = false;
> -+};
> -+
> - /* Create the aarch64 target description.  A non zero VQ value indicates both
> -    the presence of SVE and the Vector Quotient - the number of 128bit chunks in
> -    an SVE Z register.  HAS_PAUTH_P indicates the presence of the PAUTH
> -diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc
> -index daccfef746e..9a8cb4169a7 100644
> ---- a/gdbserver/linux-aarch64-low.cc
> -+++ b/gdbserver/linux-aarch64-low.cc
> -@@ -196,16 +196,6 @@ is_64bit_tdesc (void)
> -   return register_size (regcache->tdesc, 0) == 8;
> - }
> - 
> --/* Return true if the regcache contains the number of SVE registers.  */
> --
> --static bool
> --is_sve_tdesc (void)
> --{
> --  struct regcache *regcache = get_thread_regcache (current_thread, 0);
> --
> --  return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve");
> --}
> --
> - static void
> - aarch64_fill_gregset (struct regcache *regcache, void *buf)
> - {
> -@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent,
> -   *child->priv->arch_private = *parent->priv->arch_private;
> - }
> - 
> --/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
> --#define AARCH64_HWCAP_PACA (1 << 30)
> --
> --/* Implementation of linux target ops method "low_arch_setup".  */
> --
> --void
> --aarch64_target::low_arch_setup ()
> --{
> --  unsigned int machine;
> --  int is_elf64;
> --  int tid;
> --
> --  tid = lwpid_of (current_thread);
> --
> --  is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
> --
> --  if (is_elf64)
> --    {
> --      uint64_t vq = aarch64_sve_get_vq (tid);
> --      unsigned long hwcap = linux_get_hwcap (8);
> --      unsigned long hwcap2 = linux_get_hwcap2 (8);
> --      bool pauth_p = hwcap & AARCH64_HWCAP_PACA;
> --      /* MTE is AArch64-only.  */
> --      bool mte_p = hwcap2 & HWCAP2_MTE;
> --
> --      current_process ()->tdesc
> --	= aarch64_linux_read_description (vq, pauth_p, mte_p);
> --    }
> --  else
> --    current_process ()->tdesc = aarch32_linux_read_description ();
> --
> --  aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
> --}
> --
> - /* Wrapper for aarch64_sve_regs_copy_to_reg_buf.  */
> - 
> - static void
> -@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf)
> -   return aarch64_sve_regs_copy_from_reg_buf (regcache, buf);
> - }
> - 
> -+/* Array containing all the possible register sets for AArch64/Linux.  During
> -+   architecture setup, these will be checked against the HWCAP/HWCAP2 bits for
> -+   validity and enabled/disabled accordingly.
> -+
> -+   Their sizes are set to 0 here, but they will be adjusted later depending
> -+   on whether each register set is available or not.  */
> - static struct regset_info aarch64_regsets[] =
> - {
> -+  /* GPR registers.  */
> -   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
> --    sizeof (struct user_pt_regs), GENERAL_REGS,
> -+    0, GENERAL_REGS,
> -     aarch64_fill_gregset, aarch64_store_gregset },
> -+  /* Floating Point (FPU) registers.  */
> -   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET,
> --    sizeof (struct user_fpsimd_state), FP_REGS,
> -+    0, FP_REGS,
> -     aarch64_fill_fpregset, aarch64_store_fpregset
> -   },
> -+  /* Scalable Vector Extension (SVE) registers.  */
> -+  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
> -+    0, EXTENDED_REGS,
> -+    aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
> -+  },
> -+  /* PAC registers.  */
> -   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
> --    AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
> --    NULL, aarch64_store_pauthregset },
> -+    0, OPTIONAL_REGS,
> -+    nullptr, aarch64_store_pauthregset },
> -+  /* Tagged address control / MTE registers.  */
> -   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
> --    AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
> --    aarch64_store_mteregset },
> -+    0, OPTIONAL_REGS,
> -+    aarch64_fill_mteregset, aarch64_store_mteregset },
> -   NULL_REGSET
> - };
> - 
> -@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info =
> -   {
> -     aarch64_regsets, /* regsets */
> -     0, /* num_regsets */
> --    NULL, /* disabled_regsets */
> -+    nullptr, /* disabled_regsets */
> -   };
> - 
> - static struct regs_info regs_info_aarch64 =
> -   {
> --    NULL, /* regset_bitmap */
> --    NULL, /* usrregs */
> -+    nullptr, /* regset_bitmap */
> -+    nullptr, /* usrregs */
> -     &aarch64_regsets_info,
> -   };
> - 
> --static struct regset_info aarch64_sve_regsets[] =
> -+/* Given FEATURES, adjust the available register sets by setting their
> -+   sizes.  A size of 0 means the register set is disabled and won't be
> -+   used.  */
> -+
> -+static void
> -+aarch64_adjust_register_sets (const struct aarch64_features &features)
> - {
> --  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
> --    sizeof (struct user_pt_regs), GENERAL_REGS,
> --    aarch64_fill_gregset, aarch64_store_gregset },
> --  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
> --    SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS,
> --    aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
> --  },
> --  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
> --    AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
> --    NULL, aarch64_store_pauthregset },
> --  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
> --    AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
> --    aarch64_store_mteregset },
> --  NULL_REGSET
> --};
> -+  struct regset_info *regset;
> - 
> --static struct regsets_info aarch64_sve_regsets_info =
> --  {
> --    aarch64_sve_regsets, /* regsets.  */
> --    0, /* num_regsets.  */
> --    NULL, /* disabled_regsets.  */
> --  };
> -+  for (regset = aarch64_regsets; regset->size >= 0; regset++)
> -+    {
> -+      switch (regset->nt_type)
> -+	{
> -+	case NT_PRSTATUS:
> -+	  /* General purpose registers are always present.  */
> -+	  regset->size = sizeof (struct user_pt_regs);
> -+	  break;
> -+	case NT_FPREGSET:
> -+	  /* This is unavailable when SVE is present.  */
> -+	  if (!features.sve)
> -+	    regset->size = sizeof (struct user_fpsimd_state);
> -+	  break;
> -+	case NT_ARM_SVE:
> -+	  if (features.sve)
> -+	    regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE);
> -+	  break;
> -+	case NT_ARM_PAC_MASK:
> -+	  if (features.pauth)
> -+	    regset->size = AARCH64_PAUTH_REGS_SIZE;
> -+	  break;
> -+	case NT_ARM_TAGGED_ADDR_CTRL:
> -+	  if (features.mte)
> -+	    regset->size = AARCH64_LINUX_SIZEOF_MTE;
> -+	  break;
> -+	default:
> -+	  gdb_assert_not_reached ("Unknown register set found.");
> -+	}
> -+    }
> -+}
> - 
> --static struct regs_info regs_info_aarch64_sve =
> --  {
> --    NULL, /* regset_bitmap.  */
> --    NULL, /* usrregs.  */
> --    &aarch64_sve_regsets_info,
> --  };
> -+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
> -+#define AARCH64_HWCAP_PACA (1 << 30)
> -+
> -+/* Implementation of linux target ops method "low_arch_setup".  */
> -+
> -+void
> -+aarch64_target::low_arch_setup ()
> -+{
> -+  unsigned int machine;
> -+  int is_elf64;
> -+  int tid;
> -+
> -+  tid = lwpid_of (current_thread);
> -+
> -+  is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
> -+
> -+  if (is_elf64)
> -+    {
> -+      struct aarch64_features features;
> -+
> -+      uint64_t vq = aarch64_sve_get_vq (tid);
> -+      features.sve = (vq > 0);
> -+      /* A-profile PAC is 64-bit only.  */
> -+      features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA;
> -+      /* A-profile MTE is 64-bit only.  */
> -+      features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE;
> -+
> -+      current_process ()->tdesc
> -+	= aarch64_linux_read_description (vq, features.pauth, features.mte);
> -+
> -+      /* Adjust the register sets we should use for this particular set of
> -+	 features.  */
> -+      aarch64_adjust_register_sets (features);
> -+    }
> -+  else
> -+    current_process ()->tdesc = aarch32_linux_read_description ();
> -+
> -+  aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
> -+}
> - 
> - /* Implementation of linux target ops method "get_regs_info".  */
> - 
> -@@ -802,9 +821,7 @@ aarch64_target::get_regs_info ()
> -   if (!is_64bit_tdesc ())
> -     return &regs_info_aarch32;
> - 
> --  if (is_sve_tdesc ())
> --    return &regs_info_aarch64_sve;
> --
> -+  /* AArch64 64-bit registers.  */
> -   return &regs_info_aarch64;
> - }
> - 
> -@@ -3294,5 +3311,4 @@ initialize_low_arch (void)
> -   initialize_low_arch_aarch32 ();
> - 
> -   initialize_regsets_info (&aarch64_regsets_info);
> --  initialize_regsets_info (&aarch64_sve_regsets_info);
> - }
> --- 
> -2.27.0
> -
> diff --git a/meta/recipes-devtools/gdb/gdb_11.1.bb b/meta/recipes-devtools/gdb/gdb_11.2.bb
> similarity index 80%
> rename from meta/recipes-devtools/gdb/gdb_11.1.bb
> rename to meta/recipes-devtools/gdb/gdb_11.2.bb
> index e73e3a2c5c..9c6db4ca2c 100644
> --- a/meta/recipes-devtools/gdb/gdb_11.1.bb
> +++ b/meta/recipes-devtools/gdb/gdb_11.2.bb
> @@ -1,5 +1,15 @@
> +require gdb-common.inc
> +
> +inherit gettext pkgconfig
> +
> +#LDFLAGS:append = " -s"
> +#export CFLAGS:append=" -L${STAGING_LIBDIR}"
> +
> +# cross-canadian must not see this
> +PACKAGES =+ "gdbserver"
> +FILES:gdbserver = "${bindir}/gdbserver"
> +
>  require gdb.inc
> -require gdb-${PV}.inc
>  
>  inherit python3-dir
>  
> @@ -26,3 +36,4 @@ EOF
>  		chmod +x ${WORKDIR}/python
>  	fi
>  }
> +
> -- 
> 2.20.1
> 

Re: [OE-core] [PATCH 03/33] gdb: update 11.1 -> 11.2

[Richard Purdie]

On Wed, 2022-02-02 at 18:06 -0500, Denys Dmytriyenko wrote:
> https://git.openembedded.org/openembedded-core/commit/?id=f24c2bf93a9549ae5a21ce378a7bf47ef052ad65
> 
> I realize these are in master-next and haven't been merged to master yet. 
> Richard mentioned there are some issues with one of the autobuilder nodes 
> and hence master-next is taking longer to test lately.

There have been a few issues:

a) there is a nasty reproducibility failure which highlighted a hash equivalence
bug which is blocking one patch. It took a while to work out the cause though
and know which patch was causing the issues. Joshua and I have talked about a
fix on irc and one the team call on Tuesday, it isn't an easy one.

b) The Centos Stream workers pulled in a problem change which broke builds. When
that number of builds start failing, we can't trust the test run results which
makes it hard to know which patches to merge.

c) I've been unwell over the last few days and you've noticed my productivity
dip, I wasn't fixing the autobuilder issues or the hash issues as quickly as I
may have done usually. Similarly patch review slowed and so on. I did prioritise
meetings, status reports and so on but had limited energy to do everything.

For a), I'll send out some patches I have which seem to be working.

Once a) was understood, for b) I could merge some patches by multiple runs and
averaging but that is slow. We'll drop the number of stream workers we have in
the autobuilder as I'm not happy with the issues introduced and the lack of
response to fixing them. There is a make hang issue on stream that is unresolved
since November and we may drop all the workers if we can't figure that out, not
sure yet. Alex did help debug some of this yesterday which has unblocked us
(thanks).

For c), I'm hopefully recovering. It is a warning/reminder to people that we do
need other people stepping up and helping. I do my best but I am one person and
I can't change that.

> I don't believe bombarding Richard with duplicate patches improves his 
> productivity. :) On his behalf I'm asking for a bit more patience and 
> understanding...

Thanks, I know you've my interests at heart here :). Alex's series is a little
different in that he is rounding up the remaining AUH output and it can overlap
with what people send due to the review and testing timescales. I do prioritise
anything from others over what Alex has in a series like this, unless there is
some reason to do otherwise. Alex and I both have agreed that but it probably
isn't obvious on the list.

I do sometimes wish he'd rebase it before sending but that then doesn't
represent what he tested so there are pros and cons to that and skipping
overlapping patches isn't a huge deal. I can/will drop anything that doesn't
apply and let Alex sort it ;-).

Usually we don't see as much of this as things run faster. As things slowed down
it did make it more visible.

Cheers,

Richard

Re: [OE-core] [PATCH 01/33] seatd: add recipe

[Claudius Heine]

Hi Alexander,

On 2022-02-02 19:27, Alexander Kanavin wrote:
> This is needed to run weston properly as non-root in the absence
> of systemd-logind, and other compositors will likely require seatd
> as well.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   meta/conf/distro/include/maintainers.inc |  1 +
>   meta/recipes-core/seatd/seatd/init       | 45 ++++++++++++++++++++++++
>   meta/recipes-core/seatd/seatd_0.6.3.bb   | 29 +++++++++++++++
>   3 files changed, 75 insertions(+)
>   create mode 100644 meta/recipes-core/seatd/seatd/init
>   create mode 100644 meta/recipes-core/seatd/seatd_0.6.3.bb
> 
> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
> index ae25287c11..cb289a0eee 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <unassigned@yoctoproject.org>"
>   RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>"
>   RECIPE_MAINTAINER:pn-sbc = "Unassigned <unassigned@yoctoproject.org>"
>   RECIPE_MAINTAINER:pn-screen = "Anuj Mittal <anuj.mittal@intel.com>"
> +RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin <alex.kanavin@gmail.com>"
>   RECIPE_MAINTAINER:pn-sed = "Chen Qi <Qi.Chen@windriver.com>"
>   RECIPE_MAINTAINER:pn-serf = "Anuj Mittal <anuj.mittal@intel.com>"
>   RECIPE_MAINTAINER:pn-setserial = "Yi Zhao <yi.zhao@windriver.com>"
> diff --git a/meta/recipes-core/seatd/seatd/init b/meta/recipes-core/seatd/seatd/init
> new file mode 100644
> index 0000000000..0589c765ac
> --- /dev/null
> +++ b/meta/recipes-core/seatd/seatd/init
> @@ -0,0 +1,45 @@
> +#!/bin/sh
> +#
> +### BEGIN INIT INFO
> +# Provides: seatd
> +# Required-Start: $local_fs $remote_fs
> +# Required-Stop: $local_fs $remote_fs
> +# Default-Start:     2 3 4 5
> +# Default-Stop:      0 1 6
> +### END INIT INFO
> +
> +killproc() {
> +        pid=`/bin/pidof $1`
> +        [ "$pid" != "" ] && kill $pid
> +}
> +
> +case "$1" in
> +  start)
> +        seatd -g video -n 1 > /tmp/seatd-start-notify &
> +        [ -s /tmp/seatd-start-notify ] && exit 0
> +        sleep 0.1
> +        [ -s /tmp/seatd-start-notify ] && exit 0
> +        sleep 0.5
> +        [ -s /tmp/seatd-start-notify ] && exit 0
> +        sleep 5
> +        [ -s /tmp/seatd-start-notify ] && exit 0
> +        exit 1
> +  ;;
> +
> +  stop)
> +        echo "Stopping seatd"
> +        killproc seatd
> +  ;;
> +
> +  restart)
> +	$0 stop
> +        sleep 1
> +        $0 start
> +  ;;
> +
> +  *)
> +        echo "usage: $0 { start | stop | restart }"
> +  ;;
> +esac
> +
> +exit 0
> diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb b/meta/recipes-core/seatd/seatd_0.6.3.bb
> new file mode 100644
> index 0000000000..0e1a79dddf
> --- /dev/null
> +++ b/meta/recipes-core/seatd/seatd_0.6.3.bb
> @@ -0,0 +1,29 @@
> +SUMMARY = "A minimal seat management daemon, and a universal seat management library."
> +DESCRIPTION = "Seat management takes care of mediating access to shared devices (graphics, input), without requiring the applications needing access to be root."
> +HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd"
> +
> +LICENSE = "MIT"
> +
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
> +
> +SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master \
> +           file://init"
> +SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
> +S = "${WORKDIR}/git"
> +
> +inherit meson pkgconfig update-rc.d
> +
> +PACKAGECONFIG ?= "libseat-builtin"
> +
> +PACKAGECONFIG[libseat-builtin] = "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
> +
> +do_install:append() {
> +        if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
> +                install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/seatd
> +        fi
> +}
> +
> +INITSCRIPT_NAME = "seatd"
> +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> +INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}"
> +
> 

I was looking into seatd as well, in my recipe I split it up a bit:

```
PACKAGES =+ "${PN}-launch libseat libseat-dev"

FILES:${PN} = "${bindir}/seatd"
FILES:${PN}-launch = "${bindir}/seatd-launch"
FILES:libseat = "${libdir}/lib*${SOLIBS}"
FILES:libseat-dev = " \
        ${includedir} ${FILES_SOLIBSDEV} \
        ${libdir}/pkgconfig"

RDEPENDS:${PN} = "libseat (= ${EXTENDPKGV})"
RDEPENDS:${PN}-launch = "${PN} (= ${EXTENDPKGV})"
RDEPENDS:libseat-dev = "libseat (= ${EXTENDPKGV})"
```

regards,
Claudius

Re: [OE-core] [PATCH 01/33] seatd: add recipe

[Alexander Kanavin]

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

As far as I understand the library is not useful without the daemon, so
there is no point in packaging them separately. -dev stuff is split
automatically.

Alex

On Thu, 3 Feb 2022 at 13:55, Claudius Heine <ch@denx.de> wrote:

> Hi Alexander,
>
> On 2022-02-02 19:27, Alexander Kanavin wrote:
> > This is needed to run weston properly as non-root in the absence
> > of systemd-logind, and other compositors will likely require seatd
> > as well.
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >   meta/conf/distro/include/maintainers.inc |  1 +
> >   meta/recipes-core/seatd/seatd/init       | 45 ++++++++++++++++++++++++
> >   meta/recipes-core/seatd/seatd_0.6.3.bb   | 29 +++++++++++++++
> >   3 files changed, 75 insertions(+)
> >   create mode 100644 meta/recipes-core/seatd/seatd/init
> >   create mode 100644 meta/recipes-core/seatd/seatd_0.6.3.bb
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> > index ae25287c11..cb289a0eee 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <
> unassigned@yoctoproject.org>"
> >   RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <
> ross.burton@arm.com>"
> >   RECIPE_MAINTAINER:pn-sbc = "Unassigned <unassigned@yoctoproject.org>"
> >   RECIPE_MAINTAINER:pn-screen = "Anuj Mittal <anuj.mittal@intel.com>"
> > +RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin <alex.kanavin@gmail.com
> >"
> >   RECIPE_MAINTAINER:pn-sed = "Chen Qi <Qi.Chen@windriver.com>"
> >   RECIPE_MAINTAINER:pn-serf = "Anuj Mittal <anuj.mittal@intel.com>"
> >   RECIPE_MAINTAINER:pn-setserial = "Yi Zhao <yi.zhao@windriver.com>"
> > diff --git a/meta/recipes-core/seatd/seatd/init
> b/meta/recipes-core/seatd/seatd/init
> > new file mode 100644
> > index 0000000000..0589c765ac
> > --- /dev/null
> > +++ b/meta/recipes-core/seatd/seatd/init
> > @@ -0,0 +1,45 @@
> > +#!/bin/sh
> > +#
> > +### BEGIN INIT INFO
> > +# Provides: seatd
> > +# Required-Start: $local_fs $remote_fs
> > +# Required-Stop: $local_fs $remote_fs
> > +# Default-Start:     2 3 4 5
> > +# Default-Stop:      0 1 6
> > +### END INIT INFO
> > +
> > +killproc() {
> > +        pid=`/bin/pidof $1`
> > +        [ "$pid" != "" ] && kill $pid
> > +}
> > +
> > +case "$1" in
> > +  start)
> > +        seatd -g video -n 1 > /tmp/seatd-start-notify &
> > +        [ -s /tmp/seatd-start-notify ] && exit 0
> > +        sleep 0.1
> > +        [ -s /tmp/seatd-start-notify ] && exit 0
> > +        sleep 0.5
> > +        [ -s /tmp/seatd-start-notify ] && exit 0
> > +        sleep 5
> > +        [ -s /tmp/seatd-start-notify ] && exit 0
> > +        exit 1
> > +  ;;
> > +
> > +  stop)
> > +        echo "Stopping seatd"
> > +        killproc seatd
> > +  ;;
> > +
> > +  restart)
> > +     $0 stop
> > +        sleep 1
> > +        $0 start
> > +  ;;
> > +
> > +  *)
> > +        echo "usage: $0 { start | stop | restart }"
> > +  ;;
> > +esac
> > +
> > +exit 0
> > diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb
> b/meta/recipes-core/seatd/seatd_0.6.3.bb
> > new file mode 100644
> > index 0000000000..0e1a79dddf
> > --- /dev/null
> > +++ b/meta/recipes-core/seatd/seatd_0.6.3.bb
> > @@ -0,0 +1,29 @@
> > +SUMMARY = "A minimal seat management daemon, and a universal seat
> management library."
> > +DESCRIPTION = "Seat management takes care of mediating access to shared
> devices (graphics, input), without requiring the applications needing
> access to be root."
> > +HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd"
> > +
> > +LICENSE = "MIT"
> > +
> > +LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
> > +
> > +SRC_URI = "git://
> git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master \
> > +           file://init"
> > +SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
> > +S = "${WORKDIR}/git"
> > +
> > +inherit meson pkgconfig update-rc.d
> > +
> > +PACKAGECONFIG ?= "libseat-builtin"
> > +
> > +PACKAGECONFIG[libseat-builtin] =
> "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
> > +
> > +do_install:append() {
> > +        if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
> > +                install -Dm755 ${WORKDIR}/init
> ${D}/${sysconfdir}/init.d/seatd
> > +        fi
> > +}
> > +
> > +INITSCRIPT_NAME = "seatd"
> > +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> > +INHIBIT_UPDATERCD_BBCLASS =
> "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1',
> '', d)}"
> > +
> >
>
> I was looking into seatd as well, in my recipe I split it up a bit:
>
> ```
> PACKAGES =+ "${PN}-launch libseat libseat-dev"
>
> FILES:${PN} = "${bindir}/seatd"
> FILES:${PN}-launch = "${bindir}/seatd-launch"
> FILES:libseat = "${libdir}/lib*${SOLIBS}"
> FILES:libseat-dev = " \
>         ${includedir} ${FILES_SOLIBSDEV} \
>         ${libdir}/pkgconfig"
>
> RDEPENDS:${PN} = "libseat (= ${EXTENDPKGV})"
> RDEPENDS:${PN}-launch = "${PN} (= ${EXTENDPKGV})"
> RDEPENDS:libseat-dev = "libseat (= ${EXTENDPKGV})"
> ```
>
> regards,
> Claudius
>

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

Re: [OE-core] [PATCH 01/33] seatd: add recipe

[Claudius Heine]

On 2022-02-03 14:28, Alexander Kanavin wrote:
> As far as I understand the library is not useful without the daemon, so 
> there is no point in packaging them separately. -dev stuff is split 
> automatically.

That is not the impression I got from the readme:

 > # libseat
 >
 > A seat management library allowing applications to use whatever seat 
management is available.
 >
 > Supports:
 >
 >     seatd
 >     (e)logind
 >     embedded seatd for standalone operation
 >
 > Each backend can be compile-time included and is runtime 
auto-detected or manually selected with the LIBSEAT_BACKEND environment 
variable.
 >
 > Which backend is in use is transparent to the application, providing 
a simple common interface.

https://sr.ht/~kennylevinsen/seatd/#libseat

I guess the general question is if it makes sense to split them up for OE.

regards,
Claudius

> 
> Alex
> 
> On Thu, 3 Feb 2022 at 13:55, Claudius Heine <ch@denx.de 
> <mailto:ch@denx.de>> wrote:
> 
>     Hi Alexander,
> 
>     On 2022-02-02 19:27, Alexander Kanavin wrote:
>      > This is needed to run weston properly as non-root in the absence
>      > of systemd-logind, and other compositors will likely require seatd
>      > as well.
>      >
>      > Signed-off-by: Alexander Kanavin <alex@linutronix.de
>     <mailto:alex@linutronix.de>>
>      > ---
>      >   meta/conf/distro/include/maintainers.inc |  1 +
>      >   meta/recipes-core/seatd/seatd/init       | 45
>     ++++++++++++++++++++++++
>      >   meta/recipes-core/seatd/seatd_0.6.3.bb <http://seatd_0.6.3.bb> 
>       | 29 +++++++++++++++
>      >   3 files changed, 75 insertions(+)
>      >   create mode 100644 meta/recipes-core/seatd/seatd/init
>      >   create mode 100644 meta/recipes-core/seatd/seatd_0.6.3.bb
>     <http://seatd_0.6.3.bb>
>      >
>      > diff --git a/meta/conf/distro/include/maintainers.inc
>     b/meta/conf/distro/include/maintainers.inc
>      > index ae25287c11..cb289a0eee 100644
>      > --- a/meta/conf/distro/include/maintainers.inc
>      > +++ b/meta/conf/distro/include/maintainers.inc
>      > @@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode =
>     "Unassigned <unassigned@yoctoproject.org
>     <mailto:unassigned@yoctoproject.org>>"
>      >   RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton
>     <ross.burton@arm.com <mailto:ross.burton@arm.com>>"
>      >   RECIPE_MAINTAINER:pn-sbc = "Unassigned
>     <unassigned@yoctoproject.org <mailto:unassigned@yoctoproject.org>>"
>      >   RECIPE_MAINTAINER:pn-screen = "Anuj Mittal
>     <anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>>"
>      > +RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin
>     <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>>"
>      >   RECIPE_MAINTAINER:pn-sed = "Chen Qi <Qi.Chen@windriver.com
>     <mailto:Qi.Chen@windriver.com>>"
>      >   RECIPE_MAINTAINER:pn-serf = "Anuj Mittal <anuj.mittal@intel.com
>     <mailto:anuj.mittal@intel.com>>"
>      >   RECIPE_MAINTAINER:pn-setserial = "Yi Zhao
>     <yi.zhao@windriver.com <mailto:yi.zhao@windriver.com>>"
>      > diff --git a/meta/recipes-core/seatd/seatd/init
>     b/meta/recipes-core/seatd/seatd/init
>      > new file mode 100644
>      > index 0000000000..0589c765ac
>      > --- /dev/null
>      > +++ b/meta/recipes-core/seatd/seatd/init
>      > @@ -0,0 +1,45 @@
>      > +#!/bin/sh
>      > +#
>      > +### BEGIN INIT INFO
>      > +# Provides: seatd
>      > +# Required-Start: $local_fs $remote_fs
>      > +# Required-Stop: $local_fs $remote_fs
>      > +# Default-Start:     2 3 4 5
>      > +# Default-Stop:      0 1 6
>      > +### END INIT INFO
>      > +
>      > +killproc() {
>      > +        pid=`/bin/pidof $1`
>      > +        [ "$pid" != "" ] && kill $pid
>      > +}
>      > +
>      > +case "$1" in
>      > +  start)
>      > +        seatd -g video -n 1 > /tmp/seatd-start-notify &
>      > +        [ -s /tmp/seatd-start-notify ] && exit 0
>      > +        sleep 0.1
>      > +        [ -s /tmp/seatd-start-notify ] && exit 0
>      > +        sleep 0.5
>      > +        [ -s /tmp/seatd-start-notify ] && exit 0
>      > +        sleep 5
>      > +        [ -s /tmp/seatd-start-notify ] && exit 0
>      > +        exit 1
>      > +  ;;
>      > +
>      > +  stop)
>      > +        echo "Stopping seatd"
>      > +        killproc seatd
>      > +  ;;
>      > +
>      > +  restart)
>      > +     $0 stop
>      > +        sleep 1
>      > +        $0 start
>      > +  ;;
>      > +
>      > +  *)
>      > +        echo "usage: $0 { start | stop | restart }"
>      > +  ;;
>      > +esac
>      > +
>      > +exit 0
>      > diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb
>     <http://seatd_0.6.3.bb> b/meta/recipes-core/seatd/seatd_0.6.3.bb
>     <http://seatd_0.6.3.bb>
>      > new file mode 100644
>      > index 0000000000..0e1a79dddf
>      > --- /dev/null
>      > +++ b/meta/recipes-core/seatd/seatd_0.6.3.bb <http://seatd_0.6.3.bb>
>      > @@ -0,0 +1,29 @@
>      > +SUMMARY = "A minimal seat management daemon, and a universal
>     seat management library."
>      > +DESCRIPTION = "Seat management takes care of mediating access to
>     shared devices (graphics, input), without requiring the applications
>     needing access to be root."
>      > +HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd
>     <https://git.sr.ht/~kennylevinsen/seatd>"
>      > +
>      > +LICENSE = "MIT"
>      > +
>      > +LIC_FILES_CHKSUM =
>     "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
>      > +
>      > +SRC_URI =
>     "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master
>     <http://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master> \
>      > +           file://init"
>      > +SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
>      > +S = "${WORKDIR}/git"
>      > +
>      > +inherit meson pkgconfig update-rc.d
>      > +
>      > +PACKAGECONFIG ?= "libseat-builtin"
>      > +
>      > +PACKAGECONFIG[libseat-builtin] =
>     "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
>      > +
>      > +do_install:append() {
>      > +        if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
>      > +                install -Dm755 ${WORKDIR}/init
>     ${D}/${sysconfdir}/init.d/seatd
>      > +        fi
>      > +}
>      > +
>      > +INITSCRIPT_NAME = "seatd"
>      > +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
>      > +INHIBIT_UPDATERCD_BBCLASS =
>     "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd',
>     '1', '', d)}"
>      > +
>      >
> 
>     I was looking into seatd as well, in my recipe I split it up a bit:
> 
>     ```
>     PACKAGES =+ "${PN}-launch libseat libseat-dev"
> 
>     FILES:${PN} = "${bindir}/seatd"
>     FILES:${PN}-launch = "${bindir}/seatd-launch"
>     FILES:libseat = "${libdir}/lib*${SOLIBS}"
>     FILES:libseat-dev = " \
>              ${includedir} ${FILES_SOLIBSDEV} \
>              ${libdir}/pkgconfig"
> 
>     RDEPENDS:${PN} = "libseat (= ${EXTENDPKGV})"
>     RDEPENDS:${PN}-launch = "${PN} (= ${EXTENDPKGV})"
>     RDEPENDS:libseat-dev = "libseat (= ${EXTENDPKGV})"
>     ```
> 
>     regards,
>     Claudius
> 

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

Re: [OE-core] [PATCH 01/33] seatd: add recipe

[Alexander Kanavin]

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

The current recipe doesn't enable (or allow to enable) those alternatives,
so unless someone needs them, and tests that they work, there is still no
point in splitting.

Alex

On Thu, 3 Feb 2022 at 14:36, Claudius Heine <ch@denx.de> wrote:

> On 2022-02-03 14:28, Alexander Kanavin wrote:
> > As far as I understand the library is not useful without the daemon, so
> > there is no point in packaging them separately. -dev stuff is split
> > automatically.
>
> That is not the impression I got from the readme:
>
>  > # libseat
>  >
>  > A seat management library allowing applications to use whatever seat
> management is available.
>  >
>  > Supports:
>  >
>  >     seatd
>  >     (e)logind
>  >     embedded seatd for standalone operation
>  >
>  > Each backend can be compile-time included and is runtime
> auto-detected or manually selected with the LIBSEAT_BACKEND environment
> variable.
>  >
>  > Which backend is in use is transparent to the application, providing
> a simple common interface.
>
> https://sr.ht/~kennylevinsen/seatd/#libseat
>
> I guess the general question is if it makes sense to split them up for OE.
>
> regards,
> Claudius
>
> >
> > Alex
> >
> > On Thu, 3 Feb 2022 at 13:55, Claudius Heine <ch@denx.de
> > <mailto:ch@denx.de>> wrote:
> >
> >     Hi Alexander,
> >
> >     On 2022-02-02 19:27, Alexander Kanavin wrote:
> >      > This is needed to run weston properly as non-root in the absence
> >      > of systemd-logind, and other compositors will likely require seatd
> >      > as well.
> >      >
> >      > Signed-off-by: Alexander Kanavin <alex@linutronix.de
> >     <mailto:alex@linutronix.de>>
> >      > ---
> >      >   meta/conf/distro/include/maintainers.inc |  1 +
> >      >   meta/recipes-core/seatd/seatd/init       | 45
> >     ++++++++++++++++++++++++
> >      >   meta/recipes-core/seatd/seatd_0.6.3.bb <http://seatd_0.6.3.bb>
> >       | 29 +++++++++++++++
> >      >   3 files changed, 75 insertions(+)
> >      >   create mode 100644 meta/recipes-core/seatd/seatd/init
> >      >   create mode 100644 meta/recipes-core/seatd/seatd_0.6.3.bb
> >     <http://seatd_0.6.3.bb>
> >      >
> >      > diff --git a/meta/conf/distro/include/maintainers.inc
> >     b/meta/conf/distro/include/maintainers.inc
> >      > index ae25287c11..cb289a0eee 100644
> >      > --- a/meta/conf/distro/include/maintainers.inc
> >      > +++ b/meta/conf/distro/include/maintainers.inc
> >      > @@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode =
> >     "Unassigned <unassigned@yoctoproject.org
> >     <mailto:unassigned@yoctoproject.org>>"
> >      >   RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton
> >     <ross.burton@arm.com <mailto:ross.burton@arm.com>>"
> >      >   RECIPE_MAINTAINER:pn-sbc = "Unassigned
> >     <unassigned@yoctoproject.org <mailto:unassigned@yoctoproject.org>>"
> >      >   RECIPE_MAINTAINER:pn-screen = "Anuj Mittal
> >     <anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>>"
> >      > +RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin
> >     <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>>"
> >      >   RECIPE_MAINTAINER:pn-sed = "Chen Qi <Qi.Chen@windriver.com
> >     <mailto:Qi.Chen@windriver.com>>"
> >      >   RECIPE_MAINTAINER:pn-serf = "Anuj Mittal <anuj.mittal@intel.com
> >     <mailto:anuj.mittal@intel.com>>"
> >      >   RECIPE_MAINTAINER:pn-setserial = "Yi Zhao
> >     <yi.zhao@windriver.com <mailto:yi.zhao@windriver.com>>"
> >      > diff --git a/meta/recipes-core/seatd/seatd/init
> >     b/meta/recipes-core/seatd/seatd/init
> >      > new file mode 100644
> >      > index 0000000000..0589c765ac
> >      > --- /dev/null
> >      > +++ b/meta/recipes-core/seatd/seatd/init
> >      > @@ -0,0 +1,45 @@
> >      > +#!/bin/sh
> >      > +#
> >      > +### BEGIN INIT INFO
> >      > +# Provides: seatd
> >      > +# Required-Start: $local_fs $remote_fs
> >      > +# Required-Stop: $local_fs $remote_fs
> >      > +# Default-Start:     2 3 4 5
> >      > +# Default-Stop:      0 1 6
> >      > +### END INIT INFO
> >      > +
> >      > +killproc() {
> >      > +        pid=`/bin/pidof $1`
> >      > +        [ "$pid" != "" ] && kill $pid
> >      > +}
> >      > +
> >      > +case "$1" in
> >      > +  start)
> >      > +        seatd -g video -n 1 > /tmp/seatd-start-notify &
> >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
> >      > +        sleep 0.1
> >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
> >      > +        sleep 0.5
> >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
> >      > +        sleep 5
> >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
> >      > +        exit 1
> >      > +  ;;
> >      > +
> >      > +  stop)
> >      > +        echo "Stopping seatd"
> >      > +        killproc seatd
> >      > +  ;;
> >      > +
> >      > +  restart)
> >      > +     $0 stop
> >      > +        sleep 1
> >      > +        $0 start
> >      > +  ;;
> >      > +
> >      > +  *)
> >      > +        echo "usage: $0 { start | stop | restart }"
> >      > +  ;;
> >      > +esac
> >      > +
> >      > +exit 0
> >      > diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb
> >     <http://seatd_0.6.3.bb> b/meta/recipes-core/seatd/seatd_0.6.3.bb
> >     <http://seatd_0.6.3.bb>
> >      > new file mode 100644
> >      > index 0000000000..0e1a79dddf
> >      > --- /dev/null
> >      > +++ b/meta/recipes-core/seatd/seatd_0.6.3.bb <
> http://seatd_0.6.3.bb>
> >      > @@ -0,0 +1,29 @@
> >      > +SUMMARY = "A minimal seat management daemon, and a universal
> >     seat management library."
> >      > +DESCRIPTION = "Seat management takes care of mediating access to
> >     shared devices (graphics, input), without requiring the applications
> >     needing access to be root."
> >      > +HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd
> >     <https://git.sr.ht/~kennylevinsen/seatd>"
> >      > +
> >      > +LICENSE = "MIT"
> >      > +
> >      > +LIC_FILES_CHKSUM =
> >     "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
> >      > +
> >      > +SRC_URI =
> >     "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master
> >     <http://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master>
> \
> >      > +           file://init"
> >      > +SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
> >      > +S = "${WORKDIR}/git"
> >      > +
> >      > +inherit meson pkgconfig update-rc.d
> >      > +
> >      > +PACKAGECONFIG ?= "libseat-builtin"
> >      > +
> >      > +PACKAGECONFIG[libseat-builtin] =
> >     "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
> >      > +
> >      > +do_install:append() {
> >      > +        if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ];
> then
> >      > +                install -Dm755 ${WORKDIR}/init
> >     ${D}/${sysconfdir}/init.d/seatd
> >      > +        fi
> >      > +}
> >      > +
> >      > +INITSCRIPT_NAME = "seatd"
> >      > +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> >      > +INHIBIT_UPDATERCD_BBCLASS =
> >     "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd',
> >     '1', '', d)}"
> >      > +
> >      >
> >
> >     I was looking into seatd as well, in my recipe I split it up a bit:
> >
> >     ```
> >     PACKAGES =+ "${PN}-launch libseat libseat-dev"
> >
> >     FILES:${PN} = "${bindir}/seatd"
> >     FILES:${PN}-launch = "${bindir}/seatd-launch"
> >     FILES:libseat = "${libdir}/lib*${SOLIBS}"
> >     FILES:libseat-dev = " \
> >              ${includedir} ${FILES_SOLIBSDEV} \
> >              ${libdir}/pkgconfig"
> >
> >     RDEPENDS:${PN} = "libseat (= ${EXTENDPKGV})"
> >     RDEPENDS:${PN}-launch = "${PN} (= ${EXTENDPKGV})"
> >     RDEPENDS:libseat-dev = "libseat (= ${EXTENDPKGV})"
> >     ```
> >
> >     regards,
> >     Claudius
> >
>
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
>

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

Re: [OE-core] [PATCH 01/33] seatd: add recipe

[Claudius Heine]

On 2022-02-03 14:46, Alexander Kanavin wrote:
> The current recipe doesn't enable (or allow to enable) those 
> alternatives, so unless someone needs them, and tests that they work, 
> there is still no point in splitting.
> 

That is reasonable. I was just a bit concerned about possible RDPENDS 
for other software packages. Depending on `libseat` seems to be more 
future-proof than `seatd` if only the library is required, whatever the 
backend is.

But I don't feel too strongly about this, so your call ;)

> Alex
> 
> On Thu, 3 Feb 2022 at 14:36, Claudius Heine <ch@denx.de 
> <mailto:ch@denx.de>> wrote:
> 
>     On 2022-02-03 14:28, Alexander Kanavin wrote:
>      > As far as I understand the library is not useful without the
>     daemon, so
>      > there is no point in packaging them separately. -dev stuff is split
>      > automatically.
> 
>     That is not the impression I got from the readme:
> 
>       > # libseat
>       >
>       > A seat management library allowing applications to use whatever
>     seat
>     management is available.
>       >
>       > Supports:
>       >
>       >     seatd
>       >     (e)logind
>       >     embedded seatd for standalone operation
>       >
>       > Each backend can be compile-time included and is runtime
>     auto-detected or manually selected with the LIBSEAT_BACKEND environment
>     variable.
>       >
>       > Which backend is in use is transparent to the application,
>     providing
>     a simple common interface.
> 
>     https://sr.ht/~kennylevinsen/seatd/#libseat
>     <https://sr.ht/~kennylevinsen/seatd/#libseat>
> 
>     I guess the general question is if it makes sense to split them up
>     for OE.
> 
>     regards,
>     Claudius
> 
>      >
>      > Alex
>      >
>      > On Thu, 3 Feb 2022 at 13:55, Claudius Heine <ch@denx.de
>     <mailto:ch@denx.de>
>      > <mailto:ch@denx.de <mailto:ch@denx.de>>> wrote:
>      >
>      >     Hi Alexander,
>      >
>      >     On 2022-02-02 19:27, Alexander Kanavin wrote:
>      >      > This is needed to run weston properly as non-root in the
>     absence
>      >      > of systemd-logind, and other compositors will likely
>     require seatd
>      >      > as well.
>      >      >
>      >      > Signed-off-by: Alexander Kanavin <alex@linutronix.de
>     <mailto:alex@linutronix.de>
>      >     <mailto:alex@linutronix.de <mailto:alex@linutronix.de>>>
>      >      > ---
>      >      >   meta/conf/distro/include/maintainers.inc |  1 +
>      >      >   meta/recipes-core/seatd/seatd/init       | 45
>      >     ++++++++++++++++++++++++
>      >      >   meta/recipes-core/seatd/seatd_0.6.3.bb
>     <http://seatd_0.6.3.bb> <http://seatd_0.6.3.bb <http://seatd_0.6.3.bb>>
>      >       | 29 +++++++++++++++
>      >      >   3 files changed, 75 insertions(+)
>      >      >   create mode 100644 meta/recipes-core/seatd/seatd/init
>      >      >   create mode 100644
>     meta/recipes-core/seatd/seatd_0.6.3.bb <http://seatd_0.6.3.bb>
>      >     <http://seatd_0.6.3.bb <http://seatd_0.6.3.bb>>
>      >      >
>      >      > diff --git a/meta/conf/distro/include/maintainers.inc
>      >     b/meta/conf/distro/include/maintainers.inc
>      >      > index ae25287c11..cb289a0eee 100644
>      >      > --- a/meta/conf/distro/include/maintainers.inc
>      >      > +++ b/meta/conf/distro/include/maintainers.inc
>      >      > @@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode =
>      >     "Unassigned <unassigned@yoctoproject.org
>     <mailto:unassigned@yoctoproject.org>
>      >     <mailto:unassigned@yoctoproject.org
>     <mailto:unassigned@yoctoproject.org>>>"
>      >      >   RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton
>      >     <ross.burton@arm.com <mailto:ross.burton@arm.com>
>     <mailto:ross.burton@arm.com <mailto:ross.burton@arm.com>>>"
>      >      >   RECIPE_MAINTAINER:pn-sbc = "Unassigned
>      >     <unassigned@yoctoproject.org
>     <mailto:unassigned@yoctoproject.org>
>     <mailto:unassigned@yoctoproject.org
>     <mailto:unassigned@yoctoproject.org>>>"
>      >      >   RECIPE_MAINTAINER:pn-screen = "Anuj Mittal
>      >     <anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>
>     <mailto:anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>>>"
>      >      > +RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin
>      >     <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>
>     <mailto:alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>>>"
>      >      >   RECIPE_MAINTAINER:pn-sed = "Chen Qi
>     <Qi.Chen@windriver.com <mailto:Qi.Chen@windriver.com>
>      >     <mailto:Qi.Chen@windriver.com <mailto:Qi.Chen@windriver.com>>>"
>      >      >   RECIPE_MAINTAINER:pn-serf = "Anuj Mittal
>     <anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>
>      >     <mailto:anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>>>"
>      >      >   RECIPE_MAINTAINER:pn-setserial = "Yi Zhao
>      >     <yi.zhao@windriver.com <mailto:yi.zhao@windriver.com>
>     <mailto:yi.zhao@windriver.com <mailto:yi.zhao@windriver.com>>>"
>      >      > diff --git a/meta/recipes-core/seatd/seatd/init
>      >     b/meta/recipes-core/seatd/seatd/init
>      >      > new file mode 100644
>      >      > index 0000000000..0589c765ac
>      >      > --- /dev/null
>      >      > +++ b/meta/recipes-core/seatd/seatd/init
>      >      > @@ -0,0 +1,45 @@
>      >      > +#!/bin/sh
>      >      > +#
>      >      > +### BEGIN INIT INFO
>      >      > +# Provides: seatd
>      >      > +# Required-Start: $local_fs $remote_fs
>      >      > +# Required-Stop: $local_fs $remote_fs
>      >      > +# Default-Start:     2 3 4 5
>      >      > +# Default-Stop:      0 1 6
>      >      > +### END INIT INFO
>      >      > +
>      >      > +killproc() {
>      >      > +        pid=`/bin/pidof $1`
>      >      > +        [ "$pid" != "" ] && kill $pid
>      >      > +}
>      >      > +
>      >      > +case "$1" in
>      >      > +  start)
>      >      > +        seatd -g video -n 1 > /tmp/seatd-start-notify &
>      >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
>      >      > +        sleep 0.1
>      >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
>      >      > +        sleep 0.5
>      >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
>      >      > +        sleep 5
>      >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
>      >      > +        exit 1
>      >      > +  ;;
>      >      > +
>      >      > +  stop)
>      >      > +        echo "Stopping seatd"
>      >      > +        killproc seatd
>      >      > +  ;;
>      >      > +
>      >      > +  restart)
>      >      > +     $0 stop
>      >      > +        sleep 1
>      >      > +        $0 start
>      >      > +  ;;
>      >      > +
>      >      > +  *)
>      >      > +        echo "usage: $0 { start | stop | restart }"
>      >      > +  ;;
>      >      > +esac
>      >      > +
>      >      > +exit 0
>      >      > diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb
>     <http://seatd_0.6.3.bb>
>      >     <http://seatd_0.6.3.bb <http://seatd_0.6.3.bb>>
>     b/meta/recipes-core/seatd/seatd_0.6.3.bb <http://seatd_0.6.3.bb>
>      >     <http://seatd_0.6.3.bb <http://seatd_0.6.3.bb>>
>      >      > new file mode 100644
>      >      > index 0000000000..0e1a79dddf
>      >      > --- /dev/null
>      >      > +++ b/meta/recipes-core/seatd/seatd_0.6.3.bb
>     <http://seatd_0.6.3.bb> <http://seatd_0.6.3.bb <http://seatd_0.6.3.bb>>
>      >      > @@ -0,0 +1,29 @@
>      >      > +SUMMARY = "A minimal seat management daemon, and a universal
>      >     seat management library."
>      >      > +DESCRIPTION = "Seat management takes care of mediating
>     access to
>      >     shared devices (graphics, input), without requiring the
>     applications
>      >     needing access to be root."
>      >      > +HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd
>     <https://git.sr.ht/~kennylevinsen/seatd>
>      >     <https://git.sr.ht/~kennylevinsen/seatd
>     <https://git.sr.ht/~kennylevinsen/seatd>>"
>      >      > +
>      >      > +LICENSE = "MIT"
>      >      > +
>      >      > +LIC_FILES_CHKSUM =
>      >     "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
>      >      > +
>      >      > +SRC_URI =
>      >   
>       "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master
>     <http://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master>
>      >   
>       <http://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master <http://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master>> \
>      >      > +           file://init"
>      >      > +SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
>      >      > +S = "${WORKDIR}/git"
>      >      > +
>      >      > +inherit meson pkgconfig update-rc.d
>      >      > +
>      >      > +PACKAGECONFIG ?= "libseat-builtin"
>      >      > +
>      >      > +PACKAGECONFIG[libseat-builtin] =
>      >     "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
>      >      > +
>      >      > +do_install:append() {
>      >      > +        if [ "${VIRTUAL-RUNTIME_init_manager}" !=
>     "systemd" ]; then
>      >      > +                install -Dm755 ${WORKDIR}/init
>      >     ${D}/${sysconfdir}/init.d/seatd
>      >      > +        fi
>      >      > +}
>      >      > +
>      >      > +INITSCRIPT_NAME = "seatd"
>      >      > +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
>      >      > +INHIBIT_UPDATERCD_BBCLASS =
>      >     "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager',
>     'systemd',
>      >     '1', '', d)}"
>      >      > +
>      >      >
>      >
>      >     I was looking into seatd as well, in my recipe I split it up
>     a bit:
>      >
>      >     ```
>      >     PACKAGES =+ "${PN}-launch libseat libseat-dev"
>      >
>      >     FILES:${PN} = "${bindir}/seatd"
>      >     FILES:${PN}-launch = "${bindir}/seatd-launch"
>      >     FILES:libseat = "${libdir}/lib*${SOLIBS}"
>      >     FILES:libseat-dev = " \
>      >              ${includedir} ${FILES_SOLIBSDEV} \
>      >              ${libdir}/pkgconfig"
>      >
>      >     RDEPENDS:${PN} = "libseat (= ${EXTENDPKGV})"
>      >     RDEPENDS:${PN}-launch = "${PN} (= ${EXTENDPKGV})"
>      >     RDEPENDS:libseat-dev = "libseat (= ${EXTENDPKGV})"
>      >     ```
>      >
>      >     regards,
>      >     Claudius
>      >
> 
>     -- 
>     DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
>     HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
>     Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email:
>     ch@denx.de <mailto:ch@denx.de>
> 

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

Re: [OE-core] [PATCH 01/33] seatd: add recipe

[Alexander Kanavin]

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

Shared library RDEPENDS don't need to be explicitly listed in consumer
recipes, you only need to have DEPENDS contains the seatd recipe so it's
present at build time. Bitbake magic will figure out which package provides
the library automatically.

Alex

On Thu, 3 Feb 2022 at 14:52, Claudius Heine <ch@denx.de> wrote:

> On 2022-02-03 14:46, Alexander Kanavin wrote:
> > The current recipe doesn't enable (or allow to enable) those
> > alternatives, so unless someone needs them, and tests that they work,
> > there is still no point in splitting.
> >
>
> That is reasonable. I was just a bit concerned about possible RDPENDS
> for other software packages. Depending on `libseat` seems to be more
> future-proof than `seatd` if only the library is required, whatever the
> backend is.
>
> But I don't feel too strongly about this, so your call ;)
>
> > Alex
> >
> > On Thu, 3 Feb 2022 at 14:36, Claudius Heine <ch@denx.de
> > <mailto:ch@denx.de>> wrote:
> >
> >     On 2022-02-03 14:28, Alexander Kanavin wrote:
> >      > As far as I understand the library is not useful without the
> >     daemon, so
> >      > there is no point in packaging them separately. -dev stuff is
> split
> >      > automatically.
> >
> >     That is not the impression I got from the readme:
> >
> >       > # libseat
> >       >
> >       > A seat management library allowing applications to use whatever
> >     seat
> >     management is available.
> >       >
> >       > Supports:
> >       >
> >       >     seatd
> >       >     (e)logind
> >       >     embedded seatd for standalone operation
> >       >
> >       > Each backend can be compile-time included and is runtime
> >     auto-detected or manually selected with the LIBSEAT_BACKEND
> environment
> >     variable.
> >       >
> >       > Which backend is in use is transparent to the application,
> >     providing
> >     a simple common interface.
> >
> >     https://sr.ht/~kennylevinsen/seatd/#libseat
> >     <https://sr.ht/~kennylevinsen/seatd/#libseat>
> >
> >     I guess the general question is if it makes sense to split them up
> >     for OE.
> >
> >     regards,
> >     Claudius
> >
> >      >
> >      > Alex
> >      >
> >      > On Thu, 3 Feb 2022 at 13:55, Claudius Heine <ch@denx.de
> >     <mailto:ch@denx.de>
> >      > <mailto:ch@denx.de <mailto:ch@denx.de>>> wrote:
> >      >
> >      >     Hi Alexander,
> >      >
> >      >     On 2022-02-02 19:27, Alexander Kanavin wrote:
> >      >      > This is needed to run weston properly as non-root in the
> >     absence
> >      >      > of systemd-logind, and other compositors will likely
> >     require seatd
> >      >      > as well.
> >      >      >
> >      >      > Signed-off-by: Alexander Kanavin <alex@linutronix.de
> >     <mailto:alex@linutronix.de>
> >      >     <mailto:alex@linutronix.de <mailto:alex@linutronix.de>>>
> >      >      > ---
> >      >      >   meta/conf/distro/include/maintainers.inc |  1 +
> >      >      >   meta/recipes-core/seatd/seatd/init       | 45
> >      >     ++++++++++++++++++++++++
> >      >      >   meta/recipes-core/seatd/seatd_0.6.3.bb
> >     <http://seatd_0.6.3.bb> <http://seatd_0.6.3.bb <
> http://seatd_0.6.3.bb>>
> >      >       | 29 +++++++++++++++
> >      >      >   3 files changed, 75 insertions(+)
> >      >      >   create mode 100644 meta/recipes-core/seatd/seatd/init
> >      >      >   create mode 100644
> >     meta/recipes-core/seatd/seatd_0.6.3.bb <http://seatd_0.6.3.bb>
> >      >     <http://seatd_0.6.3.bb <http://seatd_0.6.3.bb>>
> >      >      >
> >      >      > diff --git a/meta/conf/distro/include/maintainers.inc
> >      >     b/meta/conf/distro/include/maintainers.inc
> >      >      > index ae25287c11..cb289a0eee 100644
> >      >      > --- a/meta/conf/distro/include/maintainers.inc
> >      >      > +++ b/meta/conf/distro/include/maintainers.inc
> >      >      > @@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode =
> >      >     "Unassigned <unassigned@yoctoproject.org
> >     <mailto:unassigned@yoctoproject.org>
> >      >     <mailto:unassigned@yoctoproject.org
> >     <mailto:unassigned@yoctoproject.org>>>"
> >      >      >   RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton
> >      >     <ross.burton@arm.com <mailto:ross.burton@arm.com>
> >     <mailto:ross.burton@arm.com <mailto:ross.burton@arm.com>>>"
> >      >      >   RECIPE_MAINTAINER:pn-sbc = "Unassigned
> >      >     <unassigned@yoctoproject.org
> >     <mailto:unassigned@yoctoproject.org>
> >     <mailto:unassigned@yoctoproject.org
> >     <mailto:unassigned@yoctoproject.org>>>"
> >      >      >   RECIPE_MAINTAINER:pn-screen = "Anuj Mittal
> >      >     <anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>
> >     <mailto:anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>>>"
> >      >      > +RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin
> >      >     <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>
> >     <mailto:alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>>>"
> >      >      >   RECIPE_MAINTAINER:pn-sed = "Chen Qi
> >     <Qi.Chen@windriver.com <mailto:Qi.Chen@windriver.com>
> >      >     <mailto:Qi.Chen@windriver.com <mailto:Qi.Chen@windriver.com
> >>>"
> >      >      >   RECIPE_MAINTAINER:pn-serf = "Anuj Mittal
> >     <anuj.mittal@intel.com <mailto:anuj.mittal@intel.com>
> >      >     <mailto:anuj.mittal@intel.com <mailto:anuj.mittal@intel.com
> >>>"
> >      >      >   RECIPE_MAINTAINER:pn-setserial = "Yi Zhao
> >      >     <yi.zhao@windriver.com <mailto:yi.zhao@windriver.com>
> >     <mailto:yi.zhao@windriver.com <mailto:yi.zhao@windriver.com>>>"
> >      >      > diff --git a/meta/recipes-core/seatd/seatd/init
> >      >     b/meta/recipes-core/seatd/seatd/init
> >      >      > new file mode 100644
> >      >      > index 0000000000..0589c765ac
> >      >      > --- /dev/null
> >      >      > +++ b/meta/recipes-core/seatd/seatd/init
> >      >      > @@ -0,0 +1,45 @@
> >      >      > +#!/bin/sh
> >      >      > +#
> >      >      > +### BEGIN INIT INFO
> >      >      > +# Provides: seatd
> >      >      > +# Required-Start: $local_fs $remote_fs
> >      >      > +# Required-Stop: $local_fs $remote_fs
> >      >      > +# Default-Start:     2 3 4 5
> >      >      > +# Default-Stop:      0 1 6
> >      >      > +### END INIT INFO
> >      >      > +
> >      >      > +killproc() {
> >      >      > +        pid=`/bin/pidof $1`
> >      >      > +        [ "$pid" != "" ] && kill $pid
> >      >      > +}
> >      >      > +
> >      >      > +case "$1" in
> >      >      > +  start)
> >      >      > +        seatd -g video -n 1 > /tmp/seatd-start-notify &
> >      >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
> >      >      > +        sleep 0.1
> >      >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
> >      >      > +        sleep 0.5
> >      >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
> >      >      > +        sleep 5
> >      >      > +        [ -s /tmp/seatd-start-notify ] && exit 0
> >      >      > +        exit 1
> >      >      > +  ;;
> >      >      > +
> >      >      > +  stop)
> >      >      > +        echo "Stopping seatd"
> >      >      > +        killproc seatd
> >      >      > +  ;;
> >      >      > +
> >      >      > +  restart)
> >      >      > +     $0 stop
> >      >      > +        sleep 1
> >      >      > +        $0 start
> >      >      > +  ;;
> >      >      > +
> >      >      > +  *)
> >      >      > +        echo "usage: $0 { start | stop | restart }"
> >      >      > +  ;;
> >      >      > +esac
> >      >      > +
> >      >      > +exit 0
> >      >      > diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb
> >     <http://seatd_0.6.3.bb>
> >      >     <http://seatd_0.6.3.bb <http://seatd_0.6.3.bb>>
> >     b/meta/recipes-core/seatd/seatd_0.6.3.bb <http://seatd_0.6.3.bb>
> >      >     <http://seatd_0.6.3.bb <http://seatd_0.6.3.bb>>
> >      >      > new file mode 100644
> >      >      > index 0000000000..0e1a79dddf
> >      >      > --- /dev/null
> >      >      > +++ b/meta/recipes-core/seatd/seatd_0.6.3.bb
> >     <http://seatd_0.6.3.bb> <http://seatd_0.6.3.bb <
> http://seatd_0.6.3.bb>>
> >      >      > @@ -0,0 +1,29 @@
> >      >      > +SUMMARY = "A minimal seat management daemon, and a
> universal
> >      >     seat management library."
> >      >      > +DESCRIPTION = "Seat management takes care of mediating
> >     access to
> >      >     shared devices (graphics, input), without requiring the
> >     applications
> >      >     needing access to be root."
> >      >      > +HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd
> >     <https://git.sr.ht/~kennylevinsen/seatd>
> >      >     <https://git.sr.ht/~kennylevinsen/seatd
> >     <https://git.sr.ht/~kennylevinsen/seatd>>"
> >      >      > +
> >      >      > +LICENSE = "MIT"
> >      >      > +
> >      >      > +LIC_FILES_CHKSUM =
> >      >     "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
> >      >      > +
> >      >      > +SRC_URI =
> >      >
> >       "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master
> >     <http://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master>
> >      >
> >       <
> http://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master <
> http://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master>> \
> >      >      > +           file://init"
> >      >      > +SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
> >      >      > +S = "${WORKDIR}/git"
> >      >      > +
> >      >      > +inherit meson pkgconfig update-rc.d
> >      >      > +
> >      >      > +PACKAGECONFIG ?= "libseat-builtin"
> >      >      > +
> >      >      > +PACKAGECONFIG[libseat-builtin] =
> >      >     "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
> >      >      > +
> >      >      > +do_install:append() {
> >      >      > +        if [ "${VIRTUAL-RUNTIME_init_manager}" !=
> >     "systemd" ]; then
> >      >      > +                install -Dm755 ${WORKDIR}/init
> >      >     ${D}/${sysconfdir}/init.d/seatd
> >      >      > +        fi
> >      >      > +}
> >      >      > +
> >      >      > +INITSCRIPT_NAME = "seatd"
> >      >      > +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> >      >      > +INHIBIT_UPDATERCD_BBCLASS =
> >      >     "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager',
> >     'systemd',
> >      >     '1', '', d)}"
> >      >      > +
> >      >      >
> >      >
> >      >     I was looking into seatd as well, in my recipe I split it up
> >     a bit:
> >      >
> >      >     ```
> >      >     PACKAGES =+ "${PN}-launch libseat libseat-dev"
> >      >
> >      >     FILES:${PN} = "${bindir}/seatd"
> >      >     FILES:${PN}-launch = "${bindir}/seatd-launch"
> >      >     FILES:libseat = "${libdir}/lib*${SOLIBS}"
> >      >     FILES:libseat-dev = " \
> >      >              ${includedir} ${FILES_SOLIBSDEV} \
> >      >              ${libdir}/pkgconfig"
> >      >
> >      >     RDEPENDS:${PN} = "libseat (= ${EXTENDPKGV})"
> >      >     RDEPENDS:${PN}-launch = "${PN} (= ${EXTENDPKGV})"
> >      >     RDEPENDS:libseat-dev = "libseat (= ${EXTENDPKGV})"
> >      >     ```
> >      >
> >      >     regards,
> >      >     Claudius
> >      >
> >
> >     --
> >     DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> >     HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> >     Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email:
> >     ch@denx.de <mailto:ch@denx.de>
> >
>
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
>

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

Re: [OE-core] [PATCH 01/33] seatd: add recipe

[Khem Raj]

fails on mips/arm64

https://errors.yoctoproject.org/Errors/Details/623915/

you might need something like
https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch

On Wed, Feb 2, 2022 at 10:28 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> This is needed to run weston properly as non-root in the absence
> of systemd-logind, and other compositors will likely require seatd
> as well.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/conf/distro/include/maintainers.inc |  1 +
>  meta/recipes-core/seatd/seatd/init       | 45 ++++++++++++++++++++++++
>  meta/recipes-core/seatd/seatd_0.6.3.bb   | 29 +++++++++++++++
>  3 files changed, 75 insertions(+)
>  create mode 100644 meta/recipes-core/seatd/seatd/init
>  create mode 100644 meta/recipes-core/seatd/seatd_0.6.3.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
> index ae25287c11..cb289a0eee 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <unassigned@yoctoproject.org>"
>  RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>"
>  RECIPE_MAINTAINER:pn-sbc = "Unassigned <unassigned@yoctoproject.org>"
>  RECIPE_MAINTAINER:pn-screen = "Anuj Mittal <anuj.mittal@intel.com>"
> +RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin <alex.kanavin@gmail.com>"
>  RECIPE_MAINTAINER:pn-sed = "Chen Qi <Qi.Chen@windriver.com>"
>  RECIPE_MAINTAINER:pn-serf = "Anuj Mittal <anuj.mittal@intel.com>"
>  RECIPE_MAINTAINER:pn-setserial = "Yi Zhao <yi.zhao@windriver.com>"
> diff --git a/meta/recipes-core/seatd/seatd/init b/meta/recipes-core/seatd/seatd/init
> new file mode 100644
> index 0000000000..0589c765ac
> --- /dev/null
> +++ b/meta/recipes-core/seatd/seatd/init
> @@ -0,0 +1,45 @@
> +#!/bin/sh
> +#
> +### BEGIN INIT INFO
> +# Provides: seatd
> +# Required-Start: $local_fs $remote_fs
> +# Required-Stop: $local_fs $remote_fs
> +# Default-Start:     2 3 4 5
> +# Default-Stop:      0 1 6
> +### END INIT INFO
> +
> +killproc() {
> +        pid=`/bin/pidof $1`
> +        [ "$pid" != "" ] && kill $pid
> +}
> +
> +case "$1" in
> +  start)
> +        seatd -g video -n 1 > /tmp/seatd-start-notify &
> +        [ -s /tmp/seatd-start-notify ] && exit 0
> +        sleep 0.1
> +        [ -s /tmp/seatd-start-notify ] && exit 0
> +        sleep 0.5
> +        [ -s /tmp/seatd-start-notify ] && exit 0
> +        sleep 5
> +        [ -s /tmp/seatd-start-notify ] && exit 0
> +        exit 1
> +  ;;
> +
> +  stop)
> +        echo "Stopping seatd"
> +        killproc seatd
> +  ;;
> +
> +  restart)
> +       $0 stop
> +        sleep 1
> +        $0 start
> +  ;;
> +
> +  *)
> +        echo "usage: $0 { start | stop | restart }"
> +  ;;
> +esac
> +
> +exit 0
> diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb b/meta/recipes-core/seatd/seatd_0.6.3.bb
> new file mode 100644
> index 0000000000..0e1a79dddf
> --- /dev/null
> +++ b/meta/recipes-core/seatd/seatd_0.6.3.bb
> @@ -0,0 +1,29 @@
> +SUMMARY = "A minimal seat management daemon, and a universal seat management library."
> +DESCRIPTION = "Seat management takes care of mediating access to shared devices (graphics, input), without requiring the applications needing access to be root."
> +HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd"
> +
> +LICENSE = "MIT"
> +
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
> +
> +SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master \
> +           file://init"
> +SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
> +S = "${WORKDIR}/git"
> +
> +inherit meson pkgconfig update-rc.d
> +
> +PACKAGECONFIG ?= "libseat-builtin"
> +
> +PACKAGECONFIG[libseat-builtin] = "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
> +
> +do_install:append() {
> +        if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
> +                install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/seatd
> +        fi
> +}
> +
> +INITSCRIPT_NAME = "seatd"
> +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> +INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}"
> +
> --
> 2.20.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#161226): https://lists.openembedded.org/g/openembedded-core/message/161226
> Mute This Topic: https://lists.openembedded.org/mt/88865275/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>