diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-06-09 15:03:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-11 10:28:22 +0100 |
commit | 0490b2675aa1dbbd17c1ab876f16da0b50f09328 (patch) | |
tree | 6c4a5dab18f5d422bec68408ae9c31a8892563be /meta/recipes-core/systemd | |
parent | 504b13b61581e3e7a238cb24c709da4d22006f40 (diff) | |
download | poky-0490b2675aa1dbbd17c1ab876f16da0b50f09328.tar.gz |
systemd: Fix build without utmp
* backport the fix for regression in v251.2
(From OE-Core rev: 4cf536b44a6f3fdd5f31e5ddb91184bce05651b9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch | 32 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_251.2.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch b/meta/recipes-core/systemd/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch new file mode 100644 index 0000000000..2bb9565bf2 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From d6e2c2d34d336398f5948a8b731fefff3dc0ff12 Mon Sep 17 00:00:00 2001 | ||
2 | From: Christian Hesse <mail@eworm.de> | ||
3 | Date: Thu, 2 Jun 2022 20:49:46 +0200 | ||
4 | Subject: [PATCH] shared/utmp-wtmp: fix build without utmp | ||
5 | |||
6 | Commit 16618332388442f2f1c3e52b0a9fde00121564a3 changed a function to | ||
7 | add an extra argument. The data types used when building without utmp | ||
8 | missed the change. | ||
9 | |||
10 | Upstream-Status: Backport [d6e2c2d34d336398f5948a8b731fefff3dc0ff12] | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | |||
13 | --- | ||
14 | src/shared/utmp-wtmp.h | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h | ||
18 | index 36e4203b4f..188d011fdd 100644 | ||
19 | --- a/src/shared/utmp-wtmp.h | ||
20 | +++ b/src/shared/utmp-wtmp.h | ||
21 | @@ -59,7 +59,7 @@ static inline int utmp_wall( | ||
22 | const char *message, | ||
23 | const char *username, | ||
24 | const char *origin_tty, | ||
25 | - bool (*match_tty)(const char *tty, void *userdata), | ||
26 | + bool (*match_tty)(const char *tty, bool is_local, void *userdata), | ||
27 | void *userdata) { | ||
28 | return 0; | ||
29 | } | ||
30 | -- | ||
31 | 2.36.1 | ||
32 | |||
diff --git a/meta/recipes-core/systemd/systemd_251.2.bb b/meta/recipes-core/systemd/systemd_251.2.bb index 80f80849d0..8370bec0ca 100644 --- a/meta/recipes-core/systemd/systemd_251.2.bb +++ b/meta/recipes-core/systemd/systemd_251.2.bb | |||
@@ -24,6 +24,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
24 | file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ | 24 | file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ |
25 | file://0003-implment-systemd-sysv-install-for-OE.patch \ | 25 | file://0003-implment-systemd-sysv-install-for-OE.patch \ |
26 | file://0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ | 26 | file://0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ |
27 | file://0001-shared-utmp-wtmp-fix-build-without-utmp.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | # patches needed by musl | 30 | # patches needed by musl |