Skip to contentSkip to conversation

gdk-pixbuf: update a patch status

PATCH In review Alexander Kanavin 4 participants 29 messages May 24, 2021 – May 28, 2021 Arm/Amlogic Meson SoC support Page 2 of 2

lore
Share & tools
lore
#6 lore raw

Re: [OE-core] [PATCH 02/21] systemd: update 247.6 -> 248.3

In reply to Khem Raj

Sorry, but that is not a good answer. If the next version upgrade is a pain because of those patches, I will actually make a patch that drops them.

Alex

Quoted 1,905 lines · Khem Raj
Quoted 8 lines · Alexander Kanavin

I have to ask: should musl patches for systemd be maintained separately? It's a big pile, they aren't accepted by upstream, they aren't tested on the AB (hence I didn't even notice the breakage), and they cause rebase problems at every version upgrade.

I would propose that a separate recipe is made that takes the sources from a repo, rather than carry the patches in oe-core.

It’s fine as it is

Quoted 1,888 lines

Alex

On Tue, 25 May 2021 at 03:41, Khem Raj <[email protected]> wrote:

since master-next broke my CI, I have sent a fix on top of this. Please include that

Quoted 10 lines · Khem Raj

Fails to compile for musl

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

src/basic/percent-util.c source file needs to include

#include "missing_stdlib.h"

like other files in

0005-src-basic-missing.h-check-for-missing-strndupa.patch

Quoted 16 lines
Quoted 13 lines · Alexander Kanavin

Drop backports:
48fff0a2af3f62acd446ebec8081b039b72caad8.patch 7c5fd25119a495009ea62f79e5daec34cc464628.patch 0001-analyze-resolve-executable-path-if-it-is-relative.patch 0001-analyze-resolve-executable-path-if-it-is-relative.patch

Drop 0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch as difficult to rebase; please resend if you feel strongly that it is needed.

Rebase the big pile of musl patches.

Quoted 8 lines
Quoted 8 lines
---
 ...f0a2af3f62acd446ebec8081b039b72caad8.patch | 179 --------------
 ...d25119a495009ea62f79e5daec34cc464628.patch |  53 ----
 ...md-boot_247.6.bb => systemd-boot_248.3.bb} |   0
 meta/recipes-core/systemd/systemd.inc         |   6 +-
 ...ve-executable-path-if-it-is-relative.patch |  39 ---
 ...chvt-as-non-root-user-without-polkit.patch | 227

------------------

Quoted 20 lines
Quoted 20 lines
 ...002-don-t-use-glibc-specific-qsort_r.patch |  29 ++-
 ...dd-__compare_fn_t-and-comparison_fn_.patch |  26 +-
 ...k-parse_printf_format-implementation.patch |  46 ++--
 ...missing.h-check-for-missing-strndupa.patch | 204 ++++++++++++----
 .../0006-Include-netinet-if_ether.h.patch     |  56 +++--
 ...OB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch |  17 +-
 ...008-add-missing-FTW_-macros-for-musl.patch |   8 +-
 ..._register_atfork-for-non-glibc-build.patch |  12 +-
 ...10-Use-uintmax_t-for-handling-rlim_t.patch |  18 +-
 ...sable-tests-for-missing-typedefs-in-.patch |   9 +-
 ...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch |  19 +-
 ...patible-basename-for-non-glibc-syste.patch |  11 +-
 ...uffering-when-writing-to-oom_score_a.patch |  12 +-
 ...compliant-strerror_r-from-GNU-specif.patch |  46 ++--
 ...S_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch |   8 +-
 ...ype.h-add-__compar_d_fn_t-definition.patch |   8 +-
 ...definition-of-prctl_mm_map-structure.patch |   8 +-
 .../systemd/0019-Handle-missing-LOCK_EX.patch |  10 +-
 ...ible-pointer-type-struct-sockaddr_un.patch |  12 +-
 .../0021-test-json.c-define-M_PIl.patch       |   8 +-
Quoted 8 lines
Quoted 8 lines
 ...-not-disable-buffer-in-writing-files.patch | 116 ++++-----
 .../0025-Handle-__cpu_mask-usage.patch        |   8 +-
 .../systemd/0026-Handle-missing-gshadow.patch |  20 +-
 ...r-mount-error-with-invalid-options-o.patch |  97 --------
 ...l.h-Define-MIPS-ABI-defines-for-musl.patch |  16 +-
 .../{systemd_247.6.bb => systemd_248.3.bb}    |  11 +-
 32 files changed, 388 insertions(+), 951 deletions(-)
 delete mode 100644

meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch

Quoted 1 line
Quoted 1 line
 delete mode 100644

meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch

Quoted 1 line
Quoted 1 line
 rename meta/recipes-core/systemd/{systemd-boot_247.6.bb =>

systemd-boot_248.3.bb} (100%)

Quoted 1 line
Quoted 1 line
 delete mode 100644

meta/recipes-core/systemd/systemd/0001-analyze-resolve-executable-path-if-it-is-relative.patch

Quoted 1 line
Quoted 1 line
 delete mode 100644

meta/recipes-core/systemd/systemd/0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch

Quoted 1 line
Quoted 1 line
 delete mode 100644

meta/recipes-core/systemd/systemd/0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch

Quoted 1 line
Quoted 1 line
 rename meta/recipes-core/systemd/{systemd_247.6.bb =>

systemd_248.3.bb} (99%)

Quoted 2 lines
Quoted 2 lines

diff --git

a/meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch b/meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch

Quoted 3 lines
Quoted 3 lines

deleted file mode 100644
index e3ce296741..0000000000
---

a/meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch

Quoted 3 lines

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,179 +0,0 @@
-From 48fff0a2af3f62acd446ebec8081b039b72caad8 Mon Sep 17 00:00:00

2001

Quoted 8 lines
Quoted 8 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -8
-From: Daan De Meyer <[email protected]>
-Date: Fri, 12 Mar 2021 22:09:44 +0000
-Subject: [PATCH] boot: Move console declarations to missing_efi.h
-
-These were added to eficonex.h in gnu-efi 3.0.13. Let's move them
-to missing_efi.h behind an appropriate guard to fix the build with
-recent versions of gnu-efi.
-
Quoted 8 lines

meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch

Quoted 8 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -8
-(cherry picked from commit 95ba433a5f34baf92921fb58051bc8241f908c0e)
-
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- src/boot/efi/console.c     | 57 --------------------------------
- src/boot/efi/console.h     |  6 +---
- src/boot/efi/missing_efi.h | 67

++++++++++++++++++++++++++++++++++++++

Quoted 4 lines
Quoted 4 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -4
- 3 files changed, 68 insertions(+), 62 deletions(-)
-
-diff --git a/src/boot/efi/console.c b/src/boot/efi/console.c
-index 2dd4543d51..1d6dfeeea2 100644
Quoted 8 lines

meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch

Quoted 8 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -8
---- a/src/boot/efi/console.c
-+++ b/src/boot/efi/console.c
-@@ -9,63 +9,6 @@
- #define SYSTEM_FONT_WIDTH 8
- #define SYSTEM_FONT_HEIGHT 19
-
--#define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \
--        { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85,

0x17, 0xa6, 0x25, 0xaa } }

Quoted 49 lines
Quoted 49 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -49
--
--struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL;
--
--typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)(
--        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
--        BOOLEAN ExtendedVerification
--);
--
--typedef UINT8 EFI_KEY_TOGGLE_STATE;
--
--typedef struct {
--        UINT32 KeyShiftState;
--        EFI_KEY_TOGGLE_STATE KeyToggleState;
--} EFI_KEY_STATE;
--
--typedef struct {
--        EFI_INPUT_KEY Key;
--        EFI_KEY_STATE KeyState;
--} EFI_KEY_DATA;
--
--typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)(
--        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
--        EFI_KEY_DATA *KeyData
--);
--
--typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)(
--        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
--        EFI_KEY_TOGGLE_STATE *KeyToggleState
--);
--
--typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)(
--        EFI_KEY_DATA *KeyData
--);
--
--typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)(
--        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
--        EFI_KEY_DATA KeyData,
--        EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction,
--        VOID **NotifyHandle
--);
--
--typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)(
--        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
--        VOID *NotificationHandle
--);
--
--typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL {
--        EFI_INPUT_RESET_EX Reset;
--        EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx;
Quoted 8 lines

meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch

Quoted 8 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -8
--        EFI_EVENT WaitForKeyEx;
--        EFI_SET_STATE SetState;
--        EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify;
--        EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify;
--} EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL;
--
- EFI_STATUS console_key_read(UINT64 *key, BOOLEAN wait) {
-         EFI_GUID EfiSimpleTextInputExProtocolGuid =

EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID;

Quoted 9 lines
Quoted 9 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -9
-         static EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *TextInputEx;
-diff --git a/src/boot/efi/console.h b/src/boot/efi/console.h
-index 41df3a406e..2c69af552a 100644
---- a/src/boot/efi/console.h
-+++ b/src/boot/efi/console.h
-@@ -1,11 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- #pragma once
-
Quoted 8 lines

meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch

Quoted 8 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -8
--#define EFI_SHIFT_STATE_VALID           0x80000000
--#define EFI_RIGHT_CONTROL_PRESSED       0x00000004
--#define EFI_LEFT_CONTROL_PRESSED        0x00000008
--#define EFI_RIGHT_ALT_PRESSED           0x00000010
--#define EFI_LEFT_ALT_PRESSED            0x00000020
-+#include "missing_efi.h"
-
- #define EFI_CONTROL_PRESSED

(EFI_RIGHT_CONTROL_PRESSED|EFI_LEFT_CONTROL_PRESSED)

Quoted 1 line

Review line 104

Quoted 1 line
(quoted diff) +0 -1
- #define EFI_ALT_PRESSED

(EFI_RIGHT_ALT_PRESSED|EFI_LEFT_ALT_PRESSED)

Quoted 5 lines
Quoted 5 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -5
-diff --git a/src/boot/efi/missing_efi.h b/src/boot/efi/missing_efi.h
-index 1b838af2a4..b6aae1eb5b 100644
---- a/src/boot/efi/missing_efi.h
-+++ b/src/boot/efi/missing_efi.h
-@@ -53,3 +53,70 @@ typedef struct _EFI_RNG_PROTOCOL {
Quoted 8 lines

meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch

Quoted 8 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -8
- } EFI_RNG_PROTOCOL;
-
- #endif
-+
-+#ifndef EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID
-+
-+#define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \
-+        { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85,

0x17, 0xa6, 0x25, 0xaa } }

Quoted 55 lines
Quoted 55 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -55
-+
-+#define EFI_SHIFT_STATE_VALID           0x80000000
-+#define EFI_RIGHT_CONTROL_PRESSED       0x00000004
-+#define EFI_LEFT_CONTROL_PRESSED        0x00000008
-+#define EFI_RIGHT_ALT_PRESSED           0x00000010
-+#define EFI_LEFT_ALT_PRESSED            0x00000020
-+
-+struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL;
-+
-+typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)(
-+        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+        BOOLEAN ExtendedVerification
-+);
-+
-+typedef UINT8 EFI_KEY_TOGGLE_STATE;
-+
-+typedef struct {
-+        UINT32 KeyShiftState;
-+        EFI_KEY_TOGGLE_STATE KeyToggleState;
-+} EFI_KEY_STATE;
-+
-+typedef struct {
-+        EFI_INPUT_KEY Key;
-+        EFI_KEY_STATE KeyState;
-+} EFI_KEY_DATA;
-+
-+typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)(
-+        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+        EFI_KEY_DATA *KeyData
-+);
-+
-+typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)(
-+        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+        EFI_KEY_TOGGLE_STATE *KeyToggleState
-+);
-+
-+typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)(
-+        EFI_KEY_DATA *KeyData
-+);
-+
-+typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)(
-+        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+        EFI_KEY_DATA KeyData,
-+        EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction,
-+        VOID **NotifyHandle
-+);
-+
-+typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)(
-+        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+        VOID *NotificationHandle
-+);
-+
-+typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL {
-+        EFI_INPUT_RESET_EX Reset;
-+        EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx;
Quoted 8 lines
Quoted 8 lines
meta/recipes-core/systemd/files/48fff0a2af3f62acd446ebec8081b039b72caad8.patch deleted +0 -7
-+        EFI_EVENT WaitForKeyEx;
-+        EFI_SET_STATE SetState;
-+        EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify;
-+        EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify;
-+} EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL;
-+
-+#endif

diff --git

a/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch b/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch

Quoted 3 lines
Quoted 3 lines

deleted file mode 100644
index ae449791f1..0000000000
---

a/meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch

Quoted 3 lines

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,53 +0,0 @@
-From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00

2001

Quoted 1 line

Review line 2

Quoted 1 line
(quoted diff) +0 -1
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <

[email protected]>

Quoted 2 lines

Review line 4

Quoted 2 lines
(quoted diff) +0 -2
-Date: Mon, 12 Apr 2021 14:03:32 +0200
-Subject: [PATCH] meson: do not fail if rsync is not installed with

meson

Quoted 42 lines
Quoted 42 lines
meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch deleted +0 -42
- 0.57.2
-
-https://github.com/mesonbuild/meson/issues/8641
-
-Our CI started to fail. Even if the change is reverted in meson,
-we need a quick workaround here.
-
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- man/meson.build | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/man/meson.build b/man/meson.build
-index 3cae8446cda..f9c4b83dc81 100644
---- a/man/meson.build
-+++ b/man/meson.build
-@@ -184,17 +184,20 @@ html = custom_target(
-         depends : html_pages,
-         command : ['echo'])
-
--run_target(
--        'doc-sync',
--        depends : man_pages + html_pages,
--        command : ['rsync', '-rlv',
--                   '--delete-excluded',
--                   '--include=man',
--                   '--include=*.html',
--                   '--exclude=*',
--                   '--omit-dir-times',
--                   meson.current_build_dir(),
--                   get_option('www-target')])
-+rsync = find_program('rsync', required : false)
-+if rsync.found()
-+        run_target(
-+                'doc-sync',
-+                depends : man_pages + html_pages,
-+                command : [rsync, '-rlv',
-+                           '--delete-excluded',
-+                           '--include=man',
-+                           '--include=*.html',
-+                           '--exclude=*',
Quoted 8 lines

Review

Quoted 8 lines
meta/recipes-core/systemd/files/7c5fd25119a495009ea62f79e5daec34cc464628.patch deleted +0 -7
-+                           '--omit-dir-times',
-+                           meson.current_build_dir(),
-+                           get_option('www-target')])
-+endif
-
- ############################################################
-
(quoted diff) +0 -0

b/meta/recipes-core/systemd/systemd-boot_248.3.bb

Quoted 4 lines

Review

Quoted 4 lines

similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_247.6.bb rename to meta/recipes-core/systemd/systemd-boot_248.3.bb

(quoted diff) +0 -0

b/meta/recipes-core/systemd/systemd.inc

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc LICENSE = "GPLv2 & LGPLv2.1" · line 14

Quoted 5 lines

index 88dddb309c..0524a25008 100644

meta/recipes-core/systemd/systemd.inc +0 -0
@@ -14,11 +14,9 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM =

"file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \

Quoted 1 line
Quoted 1 line

file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"

Quoted 6 lines

meta/recipes-core/systemd/systemd.inc LICENSE = "GPLv2 & LGPLv2.1"

Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +2 -2
-SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5"
-SRCBRANCH = "v247-stable"
+SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76"
+SRCBRANCH = "v248-stable"
 SRC_URI = "git://

github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}
<http://github.com/systemd/systemd-stable.git;protocol=git;branch=$%7BSRCBRANCH%7D>
\

Quoted 6 lines
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +0 -2
-           file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \
-           file://48fff0a2af3f62acd446ebec8081b039b72caad8.patch \
 "
 
 S = "${WORKDIR}/git"

diff --git

a/meta/recipes-core/systemd/systemd/0001-analyze-resolve-executable-path-if-it-is-relative.patch b/meta/recipes-core/systemd/systemd/0001-analyze-resolve-executable-path-if-it-is-relative.patch

Quoted 3 lines
Quoted 3 lines

deleted file mode 100644
index fd7f94a61d..0000000000
---

a/meta/recipes-core/systemd/systemd/0001-analyze-resolve-executable-path-if-it-is-relative.patch

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc line 1

Quoted 3 lines

+++ /dev/null

meta/recipes-core/systemd/systemd.inc +0 -1
@@ -1,39 +0,0 @@
-From b9b7a8e3825f0433e120f7a6d7d5d635a839cab9 Mon Sep 17 00:00:00

2001

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc line 6

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +0 -5
-From: Mingli Yu <[email protected]>
-Date: Thu, 21 Jan 2021 06:19:44 +0000
-Subject: [PATCH] analyze: resolve executable path if it is relative
-
-Upstream-Status: Backport [

https://github.com/systemd/systemd/commit/f1fb046a985521f7d4a662f02546686ff20b7e5d
]

Quoted 7 lines

meta/recipes-core/systemd/systemd.inc line 13

Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +0 -7
-
-Signed-off-by: Mingli Yu <[email protected]>
----
- src/analyze/analyze-verify.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/analyze/analyze-verify.c

b/src/analyze/analyze-verify.c

Quoted 9 lines
Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +0 -9
-index a9c89173bf..969523df18 100644
---- a/src/analyze/analyze-verify.c
-+++ b/src/analyze/analyze-verify.c
-@@ -115,14 +115,17 @@ static int verify_socket(Unit *u) {
- }
-
- int verify_executable(Unit *u, const ExecCommand *exec) {
-+        int r;
-+
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 30

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
-         if (!exec)
-                 return 0;
-
-         if (exec->flags & EXEC_COMMAND_IGNORE_FAILURE)
-                 return 0;
-
--        if (access(exec->path, X_OK) < 0)
--                return log_unit_error_errno(u, errno, "Command %s

is not executable: %m", exec->path);

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc line 33

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +0 -3
-+        r = find_executable_full(exec->path, false, NULL);
-+        if (r < 0)
-+                return log_unit_error_errno(u, r, "Command %s is

not executable: %m", exec->path);

Quoted 7 lines
Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +0 -6
-
-         return 0;
- }
---
-2.26.2
-

diff --git

a/meta/recipes-core/systemd/systemd/0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch b/meta/recipes-core/systemd/systemd/0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch

Quoted 3 lines
Quoted 3 lines

deleted file mode 100644
index 89ef39bc3e..0000000000
---

a/meta/recipes-core/systemd/systemd/0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc line 1

Quoted 3 lines

+++ /dev/null

meta/recipes-core/systemd/systemd.inc +0 -1
@@ -1,227 +0,0 @@
-From 150d9cade6d475570395cb418b824524dead9577 Mon Sep 17 00:00:00

2001

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc line 6

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +0 -5
-From: Joshua Watt <[email protected]>
-Date: Fri, 30 Oct 2020 08:15:43 -0500
-Subject: [PATCH] logind: Restore chvt as non-root user without polkit
-
-4acf0cfd2f ("logind: check PolicyKit before allowing VT switch")

broke

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc line 10

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +0 -4
-the ability to write user sessions that run graphical sessions (e.g.
-weston/X11). This was partially amended in 19bb87fbfa ("login: allow
-non-console sessions to change vt") by changing the default PolicyKit
-policy so that non-root users are again allowed to switch the VT.

This

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 12

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -2
-makes the policy when PolKit is not enabled (as on many embedded
-systems) match the default PolKit policy and allows launching

graphical

Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 20

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
-sessions as a non-root user.
-
-Closes #17473
----
- src/login/logind-dbus.c         | 11 ++-------
- src/login/logind-polkit.c       | 26 +++++++++++++++++++++
- src/login/logind-polkit.h       | 10 ++++++++
- src/login/logind-seat-dbus.c    | 41

++++-----------------------------

Quoted 11 lines
Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +0 -11
- src/login/logind-session-dbus.c | 11 ++-------
- src/login/meson.build           |  1 +
- 6 files changed, 46 insertions(+), 54 deletions(-)
- create mode 100644 src/login/logind-polkit.c
- create mode 100644 src/login/logind-polkit.h
-
-diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index 0f83ed99bc..a3765d88ba 100644
---- a/src/login/logind-dbus.c
-+++ b/src/login/logind-dbus.c
-@@ -30,6 +30,7 @@
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 39

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
- #include "format-util.h"
- #include "fs-util.h"
- #include "logind-dbus.h"
-+#include "logind-polkit.h"
- #include "logind-seat-dbus.h"
- #include "logind-session-dbus.h"
- #include "logind-user-dbus.h"
-@@ -1047,15 +1048,7 @@ static int

method_activate_session_on_seat(sd_bus_message *message, void *userda

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 40

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -1
-                 return sd_bus_error_setf(error,

BUS_ERROR_SESSION_NOT_ON_SEAT,

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 41

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -1
-                                          "Session %s not on seat

%s", session_name, seat_name);

Quoted 20 lines
Quoted 20 lines
meta/recipes-core/systemd/systemd.inc +0 -20
-
--        r = bus_verify_polkit_async(
--                        message,
--                        CAP_SYS_ADMIN,
--                        "org.freedesktop.login1.chvt",
--                        NULL,
--                        false,
--                        UID_INVALID,
--                        &m->polkit_registry,
--                        error);
-+        r = check_polkit_chvt(message, m, error);
-         if (r < 0)
-                 return r;
-         if (r == 0)
-diff --git a/src/login/logind-polkit.c b/src/login/logind-polkit.c
-new file mode 100644
-index 0000000000..9072570cc6
---- /dev/null
-+++ b/src/login/logind-polkit.c
-@@ -0,0 +1,26 @@
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 69

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
-+/* SPDX-License-Identifier: LGPL-2.1+ */
-+
-+#include "bus-polkit.h"
-+#include "logind-polkit.h"
-+#include "missing_capability.h"
-+#include "user-util.h"
-+
-+int check_polkit_chvt(sd_bus_message *message, Manager *manager,

sd_bus_error *error) {

Quoted 4 lines
Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +0 -4
-+#if ENABLE_POLKIT
-+        return bus_verify_polkit_async(
-+                        message,
-+                        CAP_SYS_ADMIN,
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 81

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
-+                        "org.freedesktop.login1.chvt",
-+                        NULL,
-+                        false,
-+                        UID_INVALID,
-+                        &manager->polkit_registry,
-+                        error);
-+#else
-+        /* Allow chvt when polkit is not present. This allows a

service to start a graphical session as a

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 82

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -1
-+         * non-root user when polkit is not compiled in, matching

the default polkit policy */

Quoted 12 lines
Quoted 12 lines
meta/recipes-core/systemd/systemd.inc +0 -12
-+        return 1;
-+#endif
-+}
-+
-+
-diff --git a/src/login/logind-polkit.h b/src/login/logind-polkit.h
-new file mode 100644
-index 0000000000..476c077a8a
---- /dev/null
-+++ b/src/login/logind-polkit.h
-@@ -0,0 +1,10 @@
-+/* SPDX-License-Identifier: LGPL-2.1+ */
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 102

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
-+#pragma once
-+
-+#include "sd-bus.h"
-+
-+#include "bus-object.h"
-+#include "logind.h"
-+
-+int check_polkit_chvt(sd_bus_message *message, Manager *manager,

sd_bus_error *error);

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 104

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -2
-+
-diff --git a/src/login/logind-seat-dbus.c

b/src/login/logind-seat-dbus.c

Quoted 4 lines
Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +0 -4
-index a945132284..f22e9e2734 100644
---- a/src/login/logind-seat-dbus.c
-+++ b/src/login/logind-seat-dbus.c
-@@ -9,6 +9,7 @@
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 116

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
- #include "bus-polkit.h"
- #include "bus-util.h"
- #include "logind-dbus.h"
-+#include "logind-polkit.h"
- #include "logind-seat-dbus.h"
- #include "logind-seat.h"
- #include "logind-session-dbus.h"
-@@ -179,15 +180,7 @@ static int

method_activate_session(sd_bus_message *message, void *userdata, sd_b

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 118

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -2
-         if (session->seat != s)
-                 return sd_bus_error_setf(error,

BUS_ERROR_SESSION_NOT_ON_SEAT, "Session %s not on seat %s", name, s->id);

Quoted 7 lines
Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +0 -7
-
--        r = bus_verify_polkit_async(
--                        message,
--                        CAP_SYS_ADMIN,
--                        "org.freedesktop.login1.chvt",
--                        NULL,
--                        false,
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 133

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
--                        UID_INVALID,
--                        &s->manager->polkit_registry,
--                        error);
-+        r = check_polkit_chvt(message, s->manager, error);
-         if (r < 0)
-                 return r;
-         if (r == 0)
-@@ -215,15 +208,7 @@ static int method_switch_to(sd_bus_message

*message, void *userdata, sd_bus_erro

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 135

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -2
-         if (to <= 0)
-                 return sd_bus_error_setf(error,

SD_BUS_ERROR_INVALID_ARGS, "Invalid virtual terminal");

Quoted 7 lines
Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +0 -7
-
--        r = bus_verify_polkit_async(
--                        message,
--                        CAP_SYS_ADMIN,
--                        "org.freedesktop.login1.chvt",
--                        NULL,
--                        false,
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 150

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
--                        UID_INVALID,
--                        &s->manager->polkit_registry,
--                        error);
-+        r = check_polkit_chvt(message, s->manager, error);
-         if (r < 0)
-                 return r;
-         if (r == 0)
-@@ -243,15 +228,7 @@ static int method_switch_to_next(sd_bus_message

*message, void *userdata, sd_bus

Quoted 9 lines
Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +0 -9
-         assert(message);
-         assert(s);
-
--        r = bus_verify_polkit_async(
--                        message,
--                        CAP_SYS_ADMIN,
--                        "org.freedesktop.login1.chvt",
--                        NULL,
--                        false,
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 167

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
--                        UID_INVALID,
--                        &s->manager->polkit_registry,
--                        error);
-+        r = check_polkit_chvt(message, s->manager, error);
-         if (r < 0)
-                 return r;
-         if (r == 0)
-@@ -271,15 +248,7 @@ static int

method_switch_to_previous(sd_bus_message *message, void *userdata, sd

Quoted 9 lines
Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +0 -9
-         assert(message);
-         assert(s);
-
--        r = bus_verify_polkit_async(
--                        message,
--                        CAP_SYS_ADMIN,
--                        "org.freedesktop.login1.chvt",
--                        NULL,
--                        false,
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 184

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
--                        UID_INVALID,
--                        &s->manager->polkit_registry,
--                        error);
-+        r = check_polkit_chvt(message, s->manager, error);
-         if (r < 0)
-                 return r;
-         if (r == 0)
-diff --git a/src/login/logind-session-dbus.c

b/src/login/logind-session-dbus.c

Quoted 4 lines
Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +0 -4
-index ccc5ac8df2..57c8a4e900 100644
---- a/src/login/logind-session-dbus.c
-+++ b/src/login/logind-session-dbus.c
-@@ -11,6 +11,7 @@
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc line 196

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -8
- #include "fd-util.h"
- #include "logind-brightness.h"
- #include "logind-dbus.h"
-+#include "logind-polkit.h"
- #include "logind-seat-dbus.h"
- #include "logind-session-dbus.h"
- #include "logind-session-device.h"
-@@ -192,15 +193,7 @@ int bus_session_method_activate(sd_bus_message

*message, void *userdata, sd_bus_

Quoted 24 lines
Quoted 24 lines
meta/recipes-core/systemd/systemd.inc +0 -24
-         assert(message);
-         assert(s);
-
--        r = bus_verify_polkit_async(
--                        message,
--                        CAP_SYS_ADMIN,
--                        "org.freedesktop.login1.chvt",
--                        NULL,
--                        false,
--                        UID_INVALID,
--                        &s->manager->polkit_registry,
--                        error);
-+        r = check_polkit_chvt(message, s->manager, error);
-         if (r < 0)
-                 return r;
-         if (r == 0)
-diff --git a/src/login/meson.build b/src/login/meson.build
-index 0a7d3d5440..7e46be2add 100644
---- a/src/login/meson.build
-+++ b/src/login/meson.build
-@@ -26,6 +26,7 @@ liblogind_core_sources = files('''
-         logind-device.h
-         logind-inhibit.c
-         logind-inhibit.h
Quoted 8 lines
Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +0 -7
-+        logind-polkit.c
-         logind-seat-dbus.c
-         logind-seat-dbus.h
-         logind-seat.c
---
-2.28.0
-

diff --git

a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch

Quoted 2 lines
Quoted 2 lines

index d856bcb583..4cdf66e767 100644
---

a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch

Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 1

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -1
@@ -1,7 +1,7 @@
-From 66ece0b870b3a34fdabc48b88437e6cc354e9fce Mon Sep 17 00:00:00

2001

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 1

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+From 159c53612444ec1df492bae528a5a88a275b93bf Mon Sep 17 00:00:00

2001

Quoted 7 lines
Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +1 -1
 From: Chen Qi <[email protected]>
 Date: Mon, 25 Feb 2019 13:41:41 +0800
-Subject: [PATCH 02/26] don't use glibc-specific qsort_r
+Subject: [PATCH] don't use glibc-specific qsort_r
 
 Upstream-Status: Inappropriate [musl specific]
 
Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -0
@@ -12,6 +12,7 @@ Signed-off-by: Chen Qi <[email protected]>
 Signed-off-by: Andrej Valek <[email protected]>
 [Rebased for v247]
 Signed-off-by: Luca Boccassi <[email protected]>
+
 ---
  src/basic/sort-util.h              | 14 ------------
  src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++-----
@@ -19,14 +20,13 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 8 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 25

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -2
  3 files changed, 38 insertions(+), 31 deletions(-)
 
 diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
-index 1d194a1f04..3394c9eb72 100644
+index 49586a4a24..d92a5ab0ed 100644
 --- a/src/basic/sort-util.h
 +++ b/src/basic/sort-util.h
-@@ -54,17 +54,3 @@ static inline void _qsort_safe(void *base, size_t

nmemb, size_t size, __compar_f

Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 26

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -1
-                 int (*_func_)(const typeof(p[0])*, const

typeof(p[0])*) = func; \

Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 26

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+@@ -55,18 +55,4 @@ static inline void _qsort_safe(void *base, size_t

nmemb, size_t size, __compar_f

Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 27

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -0
                  _qsort_safe((p), (n), sizeof((p)[0]),

(__compar_fn_t) _func_); \

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 30

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -1
          })
--
+
 -static inline void qsort_r_safe(void *base, size_t nmemb, size_t

size, __compar_d_fn_t compar, void *userdata) {

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc index 1d194a1f04..3394c9eb72 100644 · line 40

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +0 -0
 -        if (nmemb <= 1)
 -                return;
@@ -40,11 +40,13 @@ index 1d194a1f04..3394c9eb72 100644
 -                int (*_func_)(const typeof(p[0])*, const

typeof(p[0])*, typeof(userdata)) = func; \

Quoted 1 line

meta/recipes-core/systemd/systemd.inc index 1d194a1f04..3394c9eb72 100644 · line 41

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -0
 -                qsort_r_safe((p), (n), sizeof((p)[0]),

(__compar_d_fn_t) _func_, userdata); \

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc index 1d194a1f04..3394c9eb72 100644 · line 45

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +2 -0
 -        })
+-
+ int cmp_int(const int *a, const int *b);
 diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c

b/src/libsystemd/sd-hwdb/hwdb-util.c

Quoted 6 lines

meta/recipes-core/systemd/systemd.inc index 1d194a1f04..3394c9eb72 100644 · line 49

Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +2 -2
-index 4c94ba9c88..95495dba6d 100644
+index fd45ff0f54..ac4b63c49b 100644
 --- a/src/libsystemd/sd-hwdb/hwdb-util.c
 +++ b/src/libsystemd/sd-hwdb/hwdb-util.c
-@@ -126,9 +126,13 @@ static void trie_free(struct trie *trie) {
+@@ -126,9 +126,13 @@ static struct trie* trie_free(struct trie

*trie) {

Quoted 6 lines
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free);
 
@@ -85,10 +87,10 @@ index 4c94ba9c88..95495dba6d 100644
  }
 
Quoted 6 lines

meta/recipes-core/systemd/systemd.inc index 4c94ba9c88..95495dba6d 100644 · line 91

Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +1 -2
 diff --git a/src/shared/format-table.c b/src/shared/format-table.c
-index a13a198b7a..bce10bc607 100644
+index dccb796b26..c3ab8ac296 100644
 --- a/src/shared/format-table.c
 +++ b/src/shared/format-table.c
-@@ -1243,30 +1243,32 @@ static int cell_data_compare(TableData *a,

size_t index_a, TableData *b, size_t

Quoted 1 line

meta/recipes-core/systemd/systemd.inc index 4c94ba9c88..95495dba6d 100644 · line 93

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+@@ -1290,30 +1290,32 @@ static int cell_data_compare(TableData *a,

size_t index_a, TableData *b, size_t

Quoted 7 lines

meta/recipes-core/systemd/systemd.inc index a13a198b7a..bce10bc607 100644 · line 135

Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +0 -0
          return CMP(index_a, index_b);
  }
 
@@ -131,7 +133,7 @@ index a13a198b7a..bce10bc607 100644
          }
 
          /* Order identical lines by the order there were originally

added in */

Quoted 10 lines

meta/recipes-core/systemd/systemd.inc index a13a198b7a..bce10bc607 100644 · line 148

Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +1 -2
-@@ -1844,7 +1846,12 @@ int table_print(Table *t, FILE *f) {
+@@ -1952,7 +1954,12 @@ int table_print(Table *t, FILE *f) {
                  for (size_t i = 0; i < n_rows; i++)
                          sorted[i] = i * t->n_columns;
 
@@ -145,7 +147,7 @@ index a13a198b7a..bce10bc607 100644
          }
 
          if (t->display_map)
-@@ -2440,7 +2447,12 @@ int table_to_json(Table *t, JsonVariant

**ret) {

Quoted 1 line

meta/recipes-core/systemd/systemd.inc index a13a198b7a..bce10bc607 100644 · line 150

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+@@ -2580,7 +2587,12 @@ int table_to_json(Table *t, JsonVariant

**ret) {

Quoted 11 lines
Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +0 -3
                  for (size_t i = 0; i < n_rows; i++)
                          sorted[i] = i * t->n_columns;
 
@@ -159,6 +161,3 @@ index a13a198b7a..bce10bc607 100644
          }
 
          if (t->display_map)
---
-2.27.0
-

diff --git

a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch

Quoted 2 lines
Quoted 2 lines

index f43a22aa8b..9b1768d9ca 100644
---

a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch

Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 1

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -1
@@ -1,7 +1,7 @@
-From 9f0d5996bbb2db3679a4075fa8301750b786c03b Mon Sep 17 00:00:00

2001

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 1

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+From 4afb8adc83348bf75964fc10af7902e04dd62637 Mon Sep 17 00:00:00

2001

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc line 4

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +0 -1
 From: Chen Qi <[email protected]>
 Date: Mon, 25 Feb 2019 13:55:12 +0800
-Subject: [PATCH 03/26] missing_type.h: add __compare_fn_t and

comparison_fn_t

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 4

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+Subject: [PATCH] missing_type.h: add __compare_fn_t and

comparison_fn_t

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Alex Kiernan <

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +0 -0
 Make it work with musl where comparison_fn_t and __compare_fn_t
 is not provided.
@@ -13,11 +13,12 @@ Signed-off-by: Alex Kiernan <

[email protected]>

Quoted 27 lines
Quoted 27 lines
meta/recipes-core/systemd/systemd.inc +6 -5
 Signed-off-by: Chen Qi <[email protected]>
 [Rebased for v242]
 Signed-off-by: Andrej Valek <[email protected]>
+
 ---
- src/basic/missing_type.h | 9 +++++++++
- src/basic/sort-util.h    | 1 +
- src/core/kmod-setup.c    | 1 +
- src/journal/catalog.c    | 1 +
+ src/basic/missing_type.h            | 9 +++++++++
+ src/basic/sort-util.h               | 1 +
+ src/core/kmod-setup.c               | 1 +
+ src/libsystemd/sd-journal/catalog.c | 1 +
  4 files changed, 12 insertions(+)
 
 diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
@@ -38,7 +39,7 @@ index f6233090a9..aeaf6ad5ec 100644
 +typedef int (*__compar_fn_t)(const void *, const void *);
 +#endif
 diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
-index 3394c9eb72..d9cb2aecb6 100644
+index d92a5ab0ed..a63867c716 100644
 --- a/src/basic/sort-util.h
 +++ b/src/basic/sort-util.h
 @@ -4,6 +4,7 @@
@@ -61,10 +62,10 @@ index 8a7f82812a..a56f12f47f 100644
 
Quoted 7 lines

meta/recipes-core/systemd/systemd.inc index 8a7f82812a..a56f12f47f 100644 · line 65

Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +1 -4
  #if HAVE_KMOD
  #include "module-util.h"
-diff --git a/src/journal/catalog.c b/src/journal/catalog.c
-index 0f6ad8a29e..4e1077ade4 100644
---- a/src/journal/catalog.c
-+++ b/src/journal/catalog.c
+diff --git a/src/libsystemd/sd-journal/catalog.c

b/src/libsystemd/sd-journal/catalog.c

Quoted 8 lines
Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +3 -0
+index aea3241d18..75e6c56a28 100644
+--- a/src/libsystemd/sd-journal/catalog.c
++++ b/src/libsystemd/sd-journal/catalog.c
 @@ -28,6 +28,7 @@
  #include "string-util.h"
  #include "strv.h"
@@ -73,6 +74,3 @@ index 0f6ad8a29e..4e1077ade4 100644
 
Quoted 6 lines
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +0 -3
  const char * const catalog_file_dirs[] = {
          "/usr/local/lib/systemd/catalog/",
---
-2.27.0
-

diff --git

a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch

Quoted 2 lines
Quoted 2 lines

index bdd64a0252..dc40a2fe8d 100644
---

a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch

Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 1

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -1
@@ -1,7 +1,7 @@
-From f3dbe29f7620a063af4d8eb3ea7c48ecd410200d Mon Sep 17 00:00:00

2001

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc line 4

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +0 -3
-From: Chen Qi <[email protected]>
-Date: Mon, 25 Feb 2019 14:04:21 +0800
-Subject: [PATCH 04/26] add fallback parse_printf_format

implementation

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 1

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+From 6c18e5f9373da3e3b38f2c5727e2aefe07fcbbd9 Mon Sep 17 00:00:00

2001

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc line 4

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +3 -0
+From: Alexander Kanavin <[email protected]>
+Date: Sat, 22 May 2021 20:26:24 +0200
+Subject: [PATCH] [PATCH] add fallback parse_printf_format

implementation

Quoted 10 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Chen Qi <[email protected]> · line 16

Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +0 -3
 Upstream-Status: Inappropriate [musl specific]
 
@@ -11,21 +11,21 @@ Signed-off-by: Chen Qi <[email protected]>
 [rebased for systemd 243]
 Signed-off-by: Scott Murray <[email protected]>
 ---
- meson.build                     |   1 +
- src/basic/meson.build           |   5 +
- src/basic/parse-printf-format.c | 273

++++++++++++++++++++++++++++++++

Quoted 6 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Chen Qi <[email protected]> · line 16

Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +3 -3
- src/basic/parse-printf-format.h |  57 +++++++
- src/basic/stdio-util.h          |   2 +-
- src/journal/journal-send.c      |   2 +-
+ meson.build                              |   1 +
+ src/basic/meson.build                    |   5 +
+ src/basic/parse-printf-format.c          | 273

+++++++++++++++++++++++

Quoted 18 lines
Quoted 18 lines
meta/recipes-core/systemd/systemd.inc +5 -2
+ src/basic/parse-printf-format.h          |  57 +++++
+ src/basic/stdio-util.h                   |   2 +-
+ src/libsystemd/sd-journal/journal-send.c |   2 +-
  6 files changed, 338 insertions(+), 2 deletions(-)
  create mode 100644 src/basic/parse-printf-format.c
  create mode 100644 src/basic/parse-printf-format.h
 
 diff --git a/meson.build b/meson.build
-index f406d595e6..6aa47fc755 100644
+index 27186d63a3..2abb7b3188 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -646,6 +646,7 @@ endif
+@@ -675,6 +675,7 @@ endif
  foreach header : ['crypt.h',
                    'linux/memfd.h',
                    'linux/vm_sockets.h',
@@ -34,21 +34,21 @@ index f406d595e6..6aa47fc755 100644
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc index f406d595e6..6aa47fc755 100644 · line 40

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -2
                    'valgrind/memcheck.h',
                    'valgrind/valgrind.h',
 diff --git a/src/basic/meson.build b/src/basic/meson.build
-index 1183ea83ad..aa5c958850 100644
+index 60ef801a25..aba2172edd 100644
 --- a/src/basic/meson.build
 +++ b/src/basic/meson.build
-@@ -322,6 +322,11 @@ foreach item : [['af',     af_list_txt,

'af', ''],

Quoted 18 lines
Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +2 -2
- endforeach
+@@ -341,6 +341,11 @@ endforeach
 
  basic_sources += generated_gperf_headers
-+
+
 +if conf.get('HAVE_PRINTF_H') != 1
 +        basic_sources += [files('parse-printf-format.c')]

meta/recipes-core/systemd/systemd.inc index f406d595e6..6aa47fc755 100644 · line 52

Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +4 -3
 +endif
 +
- basic_gcrypt_sources = files(
-         'gcrypt-util.c',
-         'gcrypt-util.h')
++
+ ############################################################
+
+ arch_list = [
 diff --git a/src/basic/parse-printf-format.c

b/src/basic/parse-printf-format.c

Quoted 8 lines

meta/recipes-core/systemd/systemd.inc index 6dc1e72312..cea76b36cf 100644 · line 413

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -1
 new file mode 100644
 index 0000000000..49437e5445
@@ -410,10 +410,10 @@ index 6dc1e72312..cea76b36cf 100644
 
  #define snprintf_ok(buf, len, fmt, ...) \
          ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))
-diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
+diff --git a/src/libsystemd/sd-journal/journal-send.c

b/src/libsystemd/sd-journal/journal-send.c

Quoted 11 lines
Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +2 -2
 index fd3fd7ef9c..e8e6ad555b 100644
---- a/src/journal/journal-send.c
-+++ b/src/journal/journal-send.c
+--- a/src/libsystemd/sd-journal/journal-send.c
++++ b/src/libsystemd/sd-journal/journal-send.c
 @@ -2,7 +2,6 @@
 
  #include <errno.h>
@@ -431,5 +431,5 @@ index fd3fd7ef9c..e8e6ad555b 100644
  #define SNDBUF_SIZE (8*1024*1024)
 
Quoted 5 lines
Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -1
 --
-2.27.0
+2.24.0
 

diff --git

a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch

Quoted 2 lines
Quoted 2 lines

index d63e3c0d09..a0d757b3f3 100644
---

a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch

Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 1

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -1
@@ -1,7 +1,7 @@
-From 5aeae0ea89f5af74ed5d95bed1d87a03b3801ff0 Mon Sep 17 00:00:00

2001

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 1

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+From 6b0732ac7164914ce16e231e35980b849bdfc4c8 Mon Sep 17 00:00:00

2001

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc line 4

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +0 -1
 From: Chen Qi <[email protected]>
 Date: Mon, 25 Feb 2019 14:18:21 +0800
-Subject: [PATCH 05/26] src/basic/missing.h: check for missing

strndupa

Quoted 6 lines
Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+Subject: [PATCH] src/basic/missing.h: check for missing strndupa
 
 include missing.h  for definition of strndupa
 
@@ -17,6 +17,7 @@ Signed-off-by: Alex Kiernan <[email protected]
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -0
 [rebased for systemd 244]
 [Rebased for v247]
 Signed-off-by: Luca Boccassi <[email protected]>
+
 ---
  meson.build                                |  1 +
  src/backlight/backlight.c                  |  1 +
@@ -25,6 +26,7 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 8 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  src/basic/log.c                            |  1 +
  src/basic/missing_stdlib.h                 | 12 ++++++++++++
  src/basic/mkdir.c                          |  1 +
+ src/basic/mountpoint-util.c                |  1 +
  src/basic/parse-util.c                     |  1 +
  src/basic/path-lookup.c                    |  1 +
  src/basic/proc-cmdline.c                   |  1 +
@@ -41,12 +43,12 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 6 lines
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +0 -1
  src/coredump/coredump-vacuum.c             |  1 +
  src/journal-remote/journal-remote-main.c   |  1 +
  src/journal/journalctl.c                   |  1 +
- src/journal/sd-journal.c                   |  1 +
  src/libsystemd/sd-bus/bus-message.c        |  1 +
  src/libsystemd/sd-bus/bus-objects.c        |  1 +
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  src/libsystemd/sd-bus/bus-socket.c         |  1 +
  src/libsystemd/sd-bus/sd-bus.c             |  1 +
  src/libsystemd/sd-bus/test-bus-benchmark.c |  1 +
+ src/libsystemd/sd-journal/sd-journal.c     |  1 +
  src/locale/keymap-util.c                   |  1 +
  src/login/pam_systemd.c                    |  1 +
  src/network/generator/network-generator.c  |  1 +
@@ -68,18 +70,22 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 20 lines
Quoted 20 lines
meta/recipes-core/systemd/systemd.inc +6 -4
  src/udev/udev-builtin-path_id.c            |  1 +
  src/udev/udev-event.c                      |  1 +
  src/udev/udev-rules.c                      |  1 +
- 50 files changed, 61 insertions(+)
+ 51 files changed, 62 insertions(+)
 
+diff --git a/meson.build b/meson.build
+index 2abb7b3188..c97f09062b 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -535,6 +535,7 @@ foreach ident : [
-                                  #include <sys/wait.h>'''],
-         ['mallinfo',          '''#include <malloc.h>'''],
+@@ -550,6 +550,7 @@ foreach ident : [
+         ['execveat',          '''#include <unistd.h>'''],
          ['close_range',       '''#include <unistd.h>'''],
+         ['epoll_pwait2',      '''#include <sys/epoll.h>'''],
 +        ['strndupa' ,         '''#include <string.h>'''],
  ]
 
Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 86

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -0
          have = cc.has_function(ident[0], prefix : ident[1], args :

'-D_GNU_SOURCE')

Quoted 6 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +2 -0
+diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
+index 86927be62e..a34be158a0 100644
 --- a/src/backlight/backlight.c
 +++ b/src/backlight/backlight.c
 @@ -19,6 +19,7 @@
@@ -90,6 +96,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  static int help(void) {
          _cleanup_free_ char *link = NULL;
+diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
+index 8dd3f8cd95..50c1ae1b2b 100644
 --- a/src/basic/cgroup-util.c
 +++ b/src/basic/cgroup-util.c
 @@ -38,6 +38,7 @@
@@ -100,9 +108,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 108

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  static int cg_enumerate_items(const char *controller, const char

*path, FILE **_f, const char *item) {

Quoted 11 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +3 -1
          _cleanup_free_ char *fs = NULL;
+diff --git a/src/basic/env-util.c b/src/basic/env-util.c
+index c110a750a5..e1f091b01e 100644
 --- a/src/basic/env-util.c
 +++ b/src/basic/env-util.c
-@@ -15,6 +15,7 @@
+@@ -18,6 +18,7 @@
  #include "string-util.h"
  #include "strv.h"
  #include "utf8.h"
@@ -110,6 +120,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 120

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  /* We follow bash for the character set. Different shells have

different rules. */

Quoted 7 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  #define VALID_BASH_ENV_NAME_CHARS               \
+diff --git a/src/basic/log.c b/src/basic/log.c
+index 595db0c395..daff8eb68a 100644
 --- a/src/basic/log.c
 +++ b/src/basic/log.c
 @@ -36,6 +36,7 @@
@@ -120,6 +132,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  #define SNDBUF_SIZE (8*1024*1024)
 
+diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
+index 8c76f93eb2..9068bfb4f0 100644
 --- a/src/basic/missing_stdlib.h
 +++ b/src/basic/missing_stdlib.h
 @@ -11,3 +11,15 @@
@@ -138,6 +152,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
 +    (char *)memcpy(__new, __old, __len); \
 +  })
 +#endif
+diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
+index f91f8f7a08..fb31596216 100644
 --- a/src/basic/mkdir.c
 +++ b/src/basic/mkdir.c
 @@ -14,6 +14,7 @@
@@ -148,9 +164,23 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 166

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  int mkdir_safe_internal(
                  const char *path,
+diff --git a/src/basic/mountpoint-util.c

b/src/basic/mountpoint-util.c

Quoted 13 lines
Quoted 13 lines
meta/recipes-core/systemd/systemd.inc +13 -0
+index 1d617e87b2..346f9a47d7 100644
+--- a/src/basic/mountpoint-util.c
++++ b/src/basic/mountpoint-util.c
+@@ -12,6 +12,7 @@
+ #include "missing_stat.h"
+ #include "missing_syscall.h"
+ #include "mkdir.h"
++#include "missing_stdlib.h"
+ #include "mountpoint-util.h"
+ #include "parse-util.h"
+ #include "path-util.h"
+diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
+index b79c885dfd..6dabda5691 100644
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -1
 --- a/src/basic/parse-util.c
 +++ b/src/basic/parse-util.c
-@@ -22,6 +22,7 @@
+@@ -19,6 +19,7 @@
  #include "stat-util.h"
  #include "string-util.h"
  #include "strv.h"
@@ -158,6 +188,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  int parse_boolean(const char *v) {
          if (!v)
+diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
+index e53c2302b1..ca1d40ccbe 100644
 --- a/src/basic/path-lookup.c
 +++ b/src/basic/path-lookup.c
 @@ -15,6 +15,7 @@
@@ -168,6 +200,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  int xdg_user_runtime_dir(char **ret, const char *suffix) {
          const char *e;
+diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
+index 410b8a3eb5..f2c4355609 100644
 --- a/src/basic/proc-cmdline.c
 +++ b/src/basic/proc-cmdline.c
 @@ -15,6 +15,7 @@
@@ -178,6 +212,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  int proc_cmdline(char **ret) {
          const char *e;
+diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
+index ccab71f7d2..8f9eee8d36 100644
 --- a/src/basic/procfs-util.c
 +++ b/src/basic/procfs-util.c
 @@ -11,6 +11,7 @@
@@ -188,6 +224,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  int procfs_tasks_get_limit(uint64_t *ret) {
          _cleanup_free_ char *value = NULL;
+diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
+index ee9e34ed47..96c1e9362d 100644
 --- a/src/basic/selinux-util.c
 +++ b/src/basic/selinux-util.c
 @@ -27,6 +27,7 @@
@@ -197,7 +235,9 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 11 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +3 -1
 +#include "missing_stdlib.h"
 
  #if HAVE_SELINUX
- DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free);
+ DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(context_t, context_free, NULL);
+diff --git a/src/basic/time-util.c b/src/basic/time-util.c
+index 78d0390a00..47c38ca691 100644
 --- a/src/basic/time-util.c
 +++ b/src/basic/time-util.c
 @@ -27,6 +27,7 @@
@@ -208,6 +248,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  static clockid_t map_clock_id(clockid_t c) {
 
+diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
+index 97ad1e0cb5..9d60f3cc79 100644
 --- a/src/boot/bless-boot.c
 +++ b/src/boot/bless-boot.c
 @@ -18,6 +18,7 @@
@@ -218,16 +260,20 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 15 lines
Quoted 15 lines
meta/recipes-core/systemd/systemd.inc +4 -2
  static char **arg_path = NULL;
 
+diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
+index 04d2ba34f3..651ca9412e 100644
 --- a/src/core/dbus-cgroup.c
 +++ b/src/core/dbus-cgroup.c
-@@ -16,6 +16,7 @@
- #include "fileio.h"
+@@ -17,6 +17,7 @@
  #include "limits-util.h"
  #include "path-util.h"
+ #include "percent-util.h"
 +#include "missing_stdlib.h"
 
Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 272

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -0
  BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax,

tasks_max_resolve);

Quoted 7 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +2 -0
+diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
+index 5239c41d67..0f604efe98 100644
 --- a/src/core/dbus-execute.c
 +++ b/src/core/dbus-execute.c
 @@ -41,6 +41,7 @@
@@ -238,9 +284,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 284

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output,

exec_output, ExecOutput);

Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 285

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -0
  static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input,

exec_input, ExecInput);

Quoted 10 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +3 -1
+diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
+index 44a2ccfca0..3926ccfa4a 100644
 --- a/src/core/dbus-util.c
 +++ b/src/core/dbus-util.c
-@@ -7,6 +7,7 @@
+@@ -9,6 +9,7 @@
  #include "unit-printf.h"
  #include "user-util.h"
  #include "unit.h"
@@ -248,16 +296,20 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 14 lines
Quoted 14 lines
meta/recipes-core/systemd/systemd.inc +3 -1
  int bus_property_get_triggered_unit(
                  sd_bus *bus,
+diff --git a/src/core/execute.c b/src/core/execute.c
+index 922913e7af..f82fc294c0 100644
 --- a/src/core/execute.c
 +++ b/src/core/execute.c
 @@ -96,6 +96,7 @@
- #include "unit.h"
+ #include "unit-serialize.h"
  #include "user-util.h"
  #include "utmp-wtmp.h"
 +#include "missing_stdlib.h"
 
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
  #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
+diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
+index a56f12f47f..6b8729ef67 100644
 --- a/src/core/kmod-setup.c
 +++ b/src/core/kmod-setup.c
 @@ -11,6 +11,7 @@
@@ -268,6 +320,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  #if HAVE_KMOD
  #include "module-util.h"
+diff --git a/src/core/service.c b/src/core/service.c
+index 4c5bfb17fb..8c05f36119 100644
 --- a/src/core/service.c
 +++ b/src/core/service.c
 @@ -41,6 +41,7 @@
@@ -278,6 +332,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 332

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  static const UnitActiveState

state_translation_table[_SERVICE_STATE_MAX] = {

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 334

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +1 -0
          [SERVICE_DEAD] = UNIT_INACTIVE,
+diff --git a/src/coredump/coredump-vacuum.c

b/src/coredump/coredump-vacuum.c

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+index 95c3fca661..d4a9f27b08 100644
 --- a/src/coredump/coredump-vacuum.c
 +++ b/src/coredump/coredump-vacuum.c
 @@ -16,6 +16,7 @@
@@ -288,9 +344,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 344

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL)
       /* 1 MiB */
Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 345

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -0
  #define DEFAULT_MAX_USE_UPPER (uint64_t)

(4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */

Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 346

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+diff --git a/src/journal-remote/journal-remote-main.c

b/src/journal-remote/journal-remote-main.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -1
+index ae1d43756a..24de98c9f3 100644
 --- a/src/journal-remote/journal-remote-main.c
 +++ b/src/journal-remote/journal-remote-main.c
-@@ -22,6 +22,7 @@
+@@ -24,6 +24,7 @@
  #include "stat-util.h"
  #include "string-table.h"
  #include "strv.h"
@@ -298,9 +356,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 13 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 13 lines
meta/recipes-core/systemd/systemd.inc +3 -1
  #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
  #define CERT_FILE     CERTIFICATE_ROOT "/certs/journal-remote.pem"
+diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
+index 76d05c1eee..0beb77b2e5 100644
 --- a/src/journal/journalctl.c
 +++ b/src/journal/journalctl.c
-@@ -73,6 +73,7 @@
+@@ -72,6 +72,7 @@
  #include "unit-name.h"
  #include "user-util.h"
  #include "varlink.h"
@@ -308,19 +368,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 369

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
  #define PROCESS_INOTIFY_INTERVAL 1024   /* Every 1,024 messages

processed */

Quoted 11 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 370

Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +1 -10
---- a/src/journal/sd-journal.c
-+++ b/src/journal/sd-journal.c
-@@ -40,6 +40,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "syslog-util.h"
-+#include "missing_stdlib.h"
-
- #define JOURNAL_FILES_MAX 7168
-
+diff --git a/src/libsystemd/sd-bus/bus-message.c

b/src/libsystemd/sd-bus/bus-message.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -1
+index b25064b672..b3bbe63a91 100644
 --- a/src/libsystemd/sd-bus/bus-message.c
 +++ b/src/libsystemd/sd-bus/bus-message.c
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,7 @@
  #include "strv.h"
  #include "time-util.h"
  #include "utf8.h"
@@ -328,9 +380,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 380

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  static int message_append_basic(sd_bus_message *m, char type, const

void *p, const void **stored);

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 381

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+diff --git a/src/libsystemd/sd-bus/bus-objects.c

b/src/libsystemd/sd-bus/bus-objects.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -1
+index bfd42aea7d..daefc56e3e 100644
 --- a/src/libsystemd/sd-bus/bus-objects.c
 +++ b/src/libsystemd/sd-bus/bus-objects.c
-@@ -13,6 +13,7 @@
+@@ -12,6 +12,7 @@
  #include "set.h"
  #include "string-util.h"
  #include "strv.h"
@@ -338,6 +392,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 394

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  static int node_vtable_get_userdata(
                  sd_bus *bus,
+diff --git a/src/libsystemd/sd-bus/bus-socket.c

b/src/libsystemd/sd-bus/bus-socket.c

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+index 832526cc1b..7bff701806 100644
 --- a/src/libsystemd/sd-bus/bus-socket.c
 +++ b/src/libsystemd/sd-bus/bus-socket.c
 @@ -28,6 +28,7 @@
@@ -348,29 +404,47 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 406

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  #define SNDBUF_SIZE (8*1024*1024)
 
+diff --git a/src/libsystemd/sd-bus/sd-bus.c

b/src/libsystemd/sd-bus/sd-bus.c

Quoted 11 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 416

Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +2 -1
+index e719c74370..ac2a605680 100644
 --- a/src/libsystemd/sd-bus/sd-bus.c
 +++ b/src/libsystemd/sd-bus/sd-bus.c
 @@ -41,6 +41,7 @@
- #include "process-util.h"
  #include "string-util.h"
  #include "strv.h"
+ #include "user-util.h"
 +#include "missing_stdlib.h"
 
  #define log_debug_bus_message(m)
     \
Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 417

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +0 -0
          do {
     \
Quoted 1 line

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 418

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c

b/src/libsystemd/sd-bus/test-bus-benchmark.c

Quoted 10 lines
Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +2 -1
+index 13c08fe295..9aae83486e 100644
 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c
 +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
 @@ -14,6 +14,7 @@
- #include "missing_resource.h"
+ #include "string-util.h"
  #include "time-util.h"
  #include "util.h"
 +#include "missing_stdlib.h"
 
Quoted 3 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 430

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  #define MAX_SIZE (2*1024*1024)
 
+diff --git a/src/libsystemd/sd-journal/sd-journal.c

b/src/libsystemd/sd-journal/sd-journal.c

Quoted 13 lines
Quoted 13 lines
meta/recipes-core/systemd/systemd.inc +13 -0
+index c90b4c926e..0efdccff5d 100644
+--- a/src/libsystemd/sd-journal/sd-journal.c
++++ b/src/libsystemd/sd-journal/sd-journal.c
+@@ -40,6 +40,7 @@
+ #include "string-util.h"
+ #include "strv.h"
+ #include "syslog-util.h"
++#include "missing_stdlib.h"
+
+ #define JOURNAL_FILES_MAX 7168
+
+diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
+index d2f0566dbc..3b7746557e 100644
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -1
 --- a/src/locale/keymap-util.c
 +++ b/src/locale/keymap-util.c
-@@ -21,6 +21,7 @@
+@@ -24,6 +24,7 @@
  #include "string-util.h"
  #include "strv.h"
  #include "tmpfile-util.h"
@@ -378,6 +452,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  static bool startswith_comma(const char *s, const char *prefix) {
          s = startswith(s, prefix);
+diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
+index 2021c31bd5..58eb09808d 100644
 --- a/src/login/pam_systemd.c
 +++ b/src/login/pam_systemd.c
 @@ -31,6 +31,7 @@
@@ -388,6 +464,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 467

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  #include "pam-util.h"
  #include "parse-util.h"
  #include "path-util.h"
+diff --git a/src/network/generator/network-generator.c

b/src/network/generator/network-generator.c

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+index ae673ddf5b..a79e5114ca 100644
 --- a/src/network/generator/network-generator.c
 +++ b/src/network/generator/network-generator.c
 @@ -13,6 +13,7 @@
@@ -398,6 +476,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 478

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  /*
    # .network
+diff --git a/src/nspawn/nspawn-settings.c

b/src/nspawn/nspawn-settings.c

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+index d4619bead5..0e832fd994 100644
 --- a/src/nspawn/nspawn-settings.c
 +++ b/src/nspawn/nspawn-settings.c
 @@ -16,6 +16,7 @@
@@ -408,19 +488,23 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 490

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  Settings *settings_new(void) {
          Settings *s;
+diff --git a/src/nss-mymachines/nss-mymachines.c

b/src/nss-mymachines/nss-mymachines.c

Quoted 10 lines
Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +2 -1
+index 44715bb3e5..bc1e688b5e 100644
 --- a/src/nss-mymachines/nss-mymachines.c
 +++ b/src/nss-mymachines/nss-mymachines.c
-@@ -19,6 +19,7 @@
+@@ -21,6 +21,7 @@
  #include "nss-util.h"
  #include "signal-util.h"
  #include "string-util.h"
 +#include "missing_stdlib.h"
 
Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 501

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +2 -2
- NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
- NSS_GETPW_PROTOTYPES(mymachines);
+ static void setup_logging(void) {
+         /* We need a dummy function because log_parse_environment

is a macro. */

Quoted 10 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +3 -1
+diff --git a/src/portable/portable.c b/src/portable/portable.c
+index f201f52531..c78ad0f471 100644
 --- a/src/portable/portable.c
 +++ b/src/portable/portable.c
-@@ -31,6 +31,7 @@
+@@ -32,6 +32,7 @@
  #include "strv.h"
  #include "tmpfile-util.h"
  #include "user-util.h"
@@ -428,9 +512,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 512

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  static const char profile_dirs[] =

CONF_PATHS_NULSTR("systemd/portable/profile");

Quoted 11 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +3 -1
+diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
+index 52bbae3293..4ccbae09c4 100644
 --- a/src/resolve/resolvectl.c
 +++ b/src/resolve/resolvectl.c
-@@ -37,6 +37,7 @@
+@@ -41,6 +41,7 @@
  #include "terminal-util.h"
  #include "utf8.h"
  #include "verbs.h"
@@ -438,6 +524,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 526

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  static int arg_family = AF_UNSPEC;
  static int arg_ifindex = 0;
+diff --git a/src/shared/bus-get-properties.c

b/src/shared/bus-get-properties.c

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+index feb6d3807f..eb11d29e50 100644
 --- a/src/shared/bus-get-properties.c
 +++ b/src/shared/bus-get-properties.c
 @@ -4,6 +4,7 @@
@@ -448,6 +536,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 538

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  int bus_property_get_bool(
                  sd_bus *bus,
+diff --git a/src/shared/bus-unit-procs.c

b/src/shared/bus-unit-procs.c

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+index b76125e551..2e0892242f 100644
 --- a/src/shared/bus-unit-procs.c
 +++ b/src/shared/bus-unit-procs.c
 @@ -10,6 +10,7 @@
@@ -458,9 +548,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 13 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 13 lines
meta/recipes-core/systemd/systemd.inc +3 -1
  struct CGroupInfo {
          char *cgroup_path;
+diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
+index a75178068b..3de06e2bd5 100644
 --- a/src/shared/bus-unit-util.c
 +++ b/src/shared/bus-unit-util.c
-@@ -44,6 +44,7 @@
+@@ -45,6 +45,7 @@
  #include "unit-def.h"
  #include "user-util.h"
  #include "utf8.h"
@@ -468,6 +560,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
          assert(message);
+diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
+index 64ca67993c..31e3d148ea 100644
 --- a/src/shared/bus-util.c
 +++ b/src/shared/bus-util.c
 @@ -21,6 +21,7 @@
@@ -478,6 +572,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 572

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  static int name_owner_change_callback(sd_bus_message *m, void

*userdata, sd_bus_error *ret_error) {

Quoted 7 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +2 -0
          sd_event *e = userdata;
+diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
+index e43aa12882..cec9b413c1 100644
 --- a/src/shared/dns-domain.c
 +++ b/src/shared/dns-domain.c
 @@ -17,6 +17,7 @@
@@ -488,6 +584,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 584

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  int dns_label_unescape(const char **name, char *dest, size_t sz,

DNSLabelFlags flags) {

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 586

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +1 -0
          const char *n;
+diff --git a/src/shared/journal-importer.c

b/src/shared/journal-importer.c

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+index b2785f0552..5f00902882 100644
 --- a/src/shared/journal-importer.c
 +++ b/src/shared/journal-importer.c
 @@ -14,6 +14,7 @@
@@ -498,6 +596,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 597

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  enum {
          IMPORTER_STATE_LINE = 0,    /* waiting to read, or reading

line */

Quoted 6 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +2 -0
+diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
+index e63c59bd94..dd9773c009 100644
 --- a/src/shared/logs-show.c
 +++ b/src/shared/logs-show.c
 @@ -41,6 +41,7 @@
@@ -508,6 +608,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 608

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  /* up to three lines (each up to 100 characters) or 300 characters,

whichever is less */

Quoted 7 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  #define PRINT_LINE_THRESHOLD 3
+diff --git a/src/shared/pager.c b/src/shared/pager.c
+index 4bbad7e37b..eefcdd068c 100644
 --- a/src/shared/pager.c
 +++ b/src/shared/pager.c
 @@ -26,6 +26,7 @@
@@ -518,6 +620,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  static pid_t pager_pid = 0;
 
+diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
+index 5d5bf7f21d..f1002ffa6c 100644
 --- a/src/shared/uid-range.c
 +++ b/src/shared/uid-range.c
 @@ -9,6 +9,7 @@
@@ -528,6 +632,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 632

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  static bool uid_range_intersect(UidRange *range, uid_t start, uid_t

nr) {

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 634

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +1 -0
          assert(range);
+diff --git a/src/socket-proxy/socket-proxyd.c

b/src/socket-proxy/socket-proxyd.c

Quoted 5 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 5 lines
meta/recipes-core/systemd/systemd.inc +1 -0
+index 6e3ee0d76b..7727e33d95 100644
 --- a/src/socket-proxy/socket-proxyd.c
 +++ b/src/socket-proxy/socket-proxyd.c
 @@ -26,6 +26,7 @@
@@ -538,6 +644,8 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +2 -0
  #define BUFFER_SIZE (256 * 1024)
 
+diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
+index c9d318b8d1..fcb8d40805 100644
 --- a/src/test/test-hexdecoct.c
 +++ b/src/test/test-hexdecoct.c
 @@ -6,6 +6,7 @@
@@ -548,19 +656,23 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 4 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 658

Quoted 4 lines
meta/recipes-core/systemd/systemd.inc +1 -0
  static void test_hexchar(void) {
          assert_se(hexchar(0xa) == 'a');
+diff --git a/src/udev/udev-builtin-path_id.c

b/src/udev/udev-builtin-path_id.c

Quoted 10 lines
Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +2 -1
+index 09cc1c3bd8..8a7d3152a7 100644
 --- a/src/udev/udev-builtin-path_id.c
 +++ b/src/udev/udev-builtin-path_id.c
 @@ -22,6 +22,7 @@
- #include "strv.h"
  #include "sysexits.h"
  #include "udev-builtin.h"
+ #include "udev-util.h"
 +#include "missing_stdlib.h"
 
Quoted 12 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 12 lines
meta/recipes-core/systemd/systemd.inc +3 -1
  _printf_(2,3)
  static void path_prepend(char **path, const char *fmt, ...) {
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index 12597194a9..208b2458b5 100644
 --- a/src/udev/udev-event.c
 +++ b/src/udev/udev-event.c
-@@ -34,6 +34,7 @@
+@@ -33,6 +33,7 @@
  #include "udev-util.h"
  #include "udev-watch.h"
  #include "user-util.h"
@@ -568,9 +680,11 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 13 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 13 lines
meta/recipes-core/systemd/systemd.inc +3 -1
  typedef struct Spawn {
          sd_device *device;
+diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
+index 57ede6a197..dc59857765 100644
 --- a/src/udev/udev-rules.c
 +++ b/src/udev/udev-rules.c
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
  #include "udev-rules.h"
  #include "user-util.h"
  #include "virt.h"
@@ -578,13 +692,3 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 692

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  #define RULES_DIRS (const char* const*)

CONF_PATHS_STRV("udev/rules.d")

Quoted 12 lines
Quoted 11 lines
meta/recipes-core/systemd/systemd.inc +0 -10
---- a/src/basic/mountpoint-util.c
-+++ b/src/basic/mountpoint-util.c
-@@ -10,6 +10,7 @@
- #include "fs-util.h"
- #include "missing_stat.h"
- #include "missing_syscall.h"
-+#include "missing_stdlib.h"
- #include "mountpoint-util.h"
- #include "parse-util.h"
- #include "path-util.h"
Quoted 1 line

diff --git

a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch

Quoted 2 lines
Quoted 2 lines

index a978558b42..54d714266e 100644
---

a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch

Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch

Quoted 2 lines

meta/recipes-core/systemd/systemd.inc line 1

Quoted 2 lines
meta/recipes-core/systemd/systemd.inc +0 -1
@@ -1,7 +1,7 @@
-From d3ed0da271738fd0fc3d3e4d82d6f5810334b05e Mon Sep 17 00:00:00

2001

Quoted 1 line

meta/recipes-core/systemd/systemd.inc line 1

Quoted 1 line
meta/recipes-core/systemd/systemd.inc +1 -0
+From 2069f0b0d5ab8f869aeba635a347e0b11d362b30 Mon Sep 17 00:00:00

2001

Quoted 7 lines

meta/recipes-core/systemd/systemd.inc line 7

Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +1 -1
 From: Khem Raj <[email protected]>
 Date: Thu, 26 Oct 2017 22:10:42 -0700
-Subject: [PATCH 06/26] Include netinet/if_ether.h
+Subject: [PATCH] Include netinet/if_ether.h
 
 Fixes
 

/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8:
error: redefinition of 'struct ethhdr'

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi <

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -0
@@ -31,6 +31,7 @@ Signed-off-by: Chen Qi <[email protected]>
 Signed-off-by: Scott Murray <[email protected]>
 [rebased for systemd 247]
 Signed-off-by: Luca Boccassi <[email protected]>
+
 ---
  src/libsystemd-network/sd-dhcp6-client.c  | 1 -
  src/libsystemd/sd-netlink/netlink-types.c | 1 +
@@ -56,7 +57,7 @@ Signed-off-by: Luca Boccassi <

[email protected]>

Quoted 3 lines

meta/recipes-core/systemd/systemd.inc Signed-off-by: Luca Boccassi < · line 59

Quoted 3 lines
meta/recipes-core/systemd/systemd.inc +0 -0
  21 files changed, 26 insertions(+), 8 deletions(-)
 
 diff --git a/src/libsystemd-network/sd-dhcp6-client.c

b/src/libsystemd-network/sd-dhcp6-client.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc index 66f87c4b95..de1264ae46 100644 · line 71

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index 66f87c4b95..de1264ae46 100644
+index 410bfda10e..e70ed8be92 100644
 --- a/src/libsystemd-network/sd-dhcp6-client.c
 +++ b/src/libsystemd-network/sd-dhcp6-client.c
 @@ -5,7 +5,6 @@
@@ -68,7 +69,7 @@ index 66f87c4b95..de1264ae46 100644
 
  #include "sd-dhcp6-client.h"
 diff --git a/src/libsystemd/sd-netlink/netlink-types.c

b/src/libsystemd/sd-netlink/netlink-types.c

Quoted 9 lines
Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index 6fb6c147d9..8eda02d202 100644
+index ed7b9a8cd1..112c0b09e4 100644
 --- a/src/libsystemd/sd-netlink/netlink-types.c
 +++ b/src/libsystemd/sd-netlink/netlink-types.c
 @@ -3,6 +3,7 @@
@@ -80,7 +81,7 @@ index 6fb6c147d9..8eda02d202 100644
  #include <linux/netlink.h>
  #include <linux/rtnetlink.h>
 diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc index bb67beb665..f5780f1aec 100644 · line 94

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index bb67beb665..f5780f1aec 100644
+index e7c4ed3c7c..3a1e4f9072 100644
 --- a/src/machine/machine-dbus.c
 +++ b/src/machine/machine-dbus.c
 @@ -3,6 +3,7 @@
@@ -92,7 +93,7 @@ index bb67beb665..f5780f1aec 100644
  /* When we include libgen.h because we need dirname() we immediately
   * undefine basename() since libgen.h defines it as a macro to the

POSIX

Quoted 10 lines

meta/recipes-core/systemd/systemd.inc index e27f36067b..8868f1da5d 100644 · line 106

Quoted 10 lines
meta/recipes-core/systemd/systemd.inc +1 -1
 diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
-index e27f36067b..8868f1da5d 100644
+index cf7ca88d6f..34ab468191 100644
 --- a/src/network/netdev/bond.c
 +++ b/src/network/netdev/bond.c
 @@ -1,5 +1,6 @@
@@ -103,7 +104,7 @@ index e27f36067b..8868f1da5d 100644
  #include "bond.h"
  #include "bond-util.h"
 diff --git a/src/network/netdev/bridge.c

b/src/network/netdev/bridge.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc index 1f59cd8b42..5fdbae7e99 100644 · line 117

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index 1f59cd8b42..5fdbae7e99 100644
+index 38432f1578..79ccfe578e 100644
 --- a/src/network/netdev/bridge.c
 +++ b/src/network/netdev/bridge.c
 @@ -1,5 +1,6 @@
@@ -114,7 +115,7 @@ index 1f59cd8b42..5fdbae7e99 100644
 
  #include "bridge.h"
 diff --git a/src/network/netdev/macsec.c

b/src/network/netdev/macsec.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc index 82e71c3920..fbae86e216 100644 · line 128

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index 82e71c3920..fbae86e216 100644
+index 77c5f8c4e7..04be1b4ab2 100644
 --- a/src/network/netdev/macsec.c
 +++ b/src/network/netdev/macsec.c
 @@ -1,5 +1,6 @@
@@ -125,19 +126,19 @@ index 82e71c3920..fbae86e216 100644
  #include <linux/if_ether.h>
  #include <linux/if_macsec.h>
 diff --git a/src/network/netdev/netdev-gperf.gperf

b/src/network/netdev/netdev-gperf.gperf

Quoted 7 lines
Quoted 7 lines
meta/recipes-core/systemd/systemd.inc +2 -2
-index 4e89761f2c..91251fa6ec 100644
+index 8abe044890..3c54c58928 100644
 --- a/src/network/netdev/netdev-gperf.gperf
 +++ b/src/network/netdev/netdev-gperf.gperf
-@@ -2,6 +2,7 @@
+@@ -3,6 +3,7 @@
  #if __GNUC__ >= 7
Quoted 8 lines

meta/recipes-core/systemd/systemd.inc index 82e71c3920..fbae86e216 100644 · line 140

Quoted 8 lines
meta/recipes-core/systemd/systemd.inc +1 -1
  _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
  #endif
 +#include <netinet/if_ether.h>
  #include <stddef.h>
  #include "bareudp.h"
- #include "bond.h"
+ #include "batadv.h"
 diff --git a/src/network/netdev/netdev.c

b/src/network/netdev/netdev.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc index 9f390b5781..62aeafb1e4 100644 · line 151

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index 9f390b5781..62aeafb1e4 100644
+index b31f0fa81a..c80e1ff537 100644
 --- a/src/network/netdev/netdev.c
 +++ b/src/network/netdev/netdev.c
 @@ -1,5 +1,6 @@
@@ -148,7 +149,7 @@ index 9f390b5781..62aeafb1e4 100644
  #include <netinet/in.h>
  #include <unistd.h>
 diff --git a/src/network/networkd-brvlan.c

b/src/network/networkd-brvlan.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc index e53c73c30c..9bf0771b84 100644 · line 163

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index e53c73c30c..9bf0771b84 100644
+index 2847b336c9..4d6af8c642 100644
 --- a/src/network/networkd-brvlan.c
 +++ b/src/network/networkd-brvlan.c
 @@ -4,6 +4,7 @@
@@ -160,7 +161,7 @@ index e53c73c30c..9bf0771b84 100644
  #include <stdbool.h>
 
 diff --git a/src/network/networkd-dhcp-common.c

b/src/network/networkd-dhcp-common.c

Quoted 9 lines
Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index 9f58121350..554d006cb8 100644
+index 00d055cf8d..65821c1d31 100644
 --- a/src/network/networkd-dhcp-common.c
 +++ b/src/network/networkd-dhcp-common.c
 @@ -1,7 +1,8 @@
@@ -171,9 +172,9 @@ index 9f58121350..554d006cb8 100644
 +#include <net/if_arp.h>
 +#include <net/if.h>
 
Quoted 12 lines

meta/recipes-core/systemd/systemd.inc index 9f58121350..554d006cb8 100644 · line 185

Quoted 12 lines
meta/recipes-core/systemd/systemd.inc +2 -2
+ #include "bus-error.h"
  #include "dhcp-internal.h"
- #include "dhcp6-internal.h"
-@@ -10,6 +11,7 @@
+@@ -11,6 +12,7 @@
  #include "networkd-dhcp-common.h"
  #include "networkd-link.h"
  #include "networkd-manager.h"
@@ -182,7 +183,7 @@ index 9f58121350..554d006cb8 100644
  #include "parse-util.h"
  #include "socket-util.h"
 diff --git a/src/network/networkd-dhcp-server.c

b/src/network/networkd-dhcp-server.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc index cf279c640d..bae541029b 100644 · line 200

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index cf279c640d..bae541029b 100644
+index 5cdf432c27..93cffb9863 100644
 --- a/src/network/networkd-dhcp-server.c
 +++ b/src/network/networkd-dhcp-server.c
 @@ -1,8 +1,8 @@
@@ -197,7 +198,7 @@ index cf279c640d..bae541029b 100644
  #include "sd-dhcp-server.h"
 
 diff --git a/src/network/networkd-dhcp4.c

b/src/network/networkd-dhcp4.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc index f3c1e5f609..e4ef6eca63 100644 · line 215

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index f3c1e5f609..e4ef6eca63 100644
+index 23dc3a45db..7ae6c2467a 100644
 --- a/src/network/networkd-dhcp4.c
 +++ b/src/network/networkd-dhcp4.c
 @@ -1,9 +1,9 @@
@@ -212,7 +213,7 @@ index f3c1e5f609..e4ef6eca63 100644
  #include "escape.h"
  #include "alloc-util.h"
 diff --git a/src/network/networkd-dhcp6.c

b/src/network/networkd-dhcp6.c

Quoted 9 lines

meta/recipes-core/systemd/systemd.inc index 5c077c1ec8..fa98042aa5 100644 · line 230

Quoted 9 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index 5c077c1ec8..fa98042aa5 100644
+index aa077d6219..4f6ce22059 100644
 --- a/src/network/networkd-dhcp6.c
 +++ b/src/network/networkd-dhcp6.c
 @@ -3,9 +3,9 @@
@@ -227,7 +228,7 @@ index 5c077c1ec8..fa98042aa5 100644
  #include "sd-dhcp6-client.h"
 
 diff --git a/src/network/networkd-link.c

b/src/network/networkd-link.c

Quoted 6 lines
Quoted 6 lines
meta/recipes-core/systemd/systemd.inc +1 -1
-index 3bfe636691..e0c68c8ad3 100644
+index 8219d95b0d..c92230453b 100644
 --- a/src/network/networkd-link.c
 +++ b/src/network/networkd-link.c
 @@ -1,8 +1,8 @@
@@ -241,7 +242,7 @@ index 3bfe636691..e0c6
#7 lore raw

Re: [OE-core] [PATCH 02/21] systemd: update 247.6 -> 248.3

Quoted 3 lines · Alexander Kanavin

Sorry, but that is not a good answer. If the next version upgrade is a pain because of those patches, I will actually make a patch that drops them.

I'm going to wade in on this at this point.

systemd is a tricky one. Khem has been doing a good job keeping it working on musl and that is important to some set of our users so I'm going to continue to enable him and others to do that.

I'm not sure the current patch approach cases a huge issue, worst case it gets broken and then fixed as just happened.

Cheers,

Richard

#8 lore raw

Re: [OE-core] [PATCH 02/21] systemd: update 247.6 -> 248.3

Quoted 5 lines · Richard Purdie
Quoted 3 lines · Alexander Kanavin

Sorry, but that is not a good answer. If the next version upgrade is a pain because of those patches, I will actually make a patch that drops them.

Quoted 9 lines

I'm going to wade in on this at this point.

systemd is a tricky one. Khem has been doing a good job keeping it working on musl and that is important to some set of our users so I'm going to continue to enable him and others to do that.

I'm not sure the current patch approach cases a huge issue, worst case it gets broken and then fixed as just happened.

That's ok, but then I would suggest that systemd version updates do not rebase the musl patches, and that is dealt with after the fact by those who need the feature.

Alex

#9 lore raw

PATCH 3/21 systemd-conf: do not version in lockstep with systemd

In reply to Alexander Kanavin

This is not needed as systemd-conf only packages
standalone config files.

---
 .../systemd/{systemd-conf_247.6.bb => systemd-conf_1.0.bb}      | 2 ++
 1 file changed, 2 insertions(+)
 rename meta/recipes-core/systemd/{systemd-conf_247.6.bb => systemd-conf_1.0.bb} (99%)
meta/recipes-core/systemd/systemd-conf_1.0.bb renamed from meta/recipes-core/systemd/systemd-conf_247.6.bb +2 -0
similarity index 99%
rename from meta/recipes-core/systemd/systemd-conf_247.6.bb
rename to meta/recipes-core/systemd/systemd-conf_1.0.bb
index ea35e83f4f..235923be85 100644
@@ -5,6 +5,8 @@ DefaultTimeoutStartSec setting."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
+PE = "1"
+
 PACKAGECONFIG ??= "dhcp-ethernet"
 PACKAGECONFIG[dhcp-ethernet] = ""
 
Signature · 1 line
2.31.1
#10 lore raw

PATCH 4/21 gnu-config: update to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
index d4ec4593fa..8d7d6ac3ee 100644
@@ -9,8 +9,8 @@ DEPENDS_class-native = "hostperl-runtime-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-SRCREV = "277b4ed1776f721145b2649d888f1deb445fecc5"
-PV = "20210424+git${SRCPV}"
+SRCREV = "92fac9b5ceb9f111a04d7f8f98831570e77886c6"
+PV = "20210522+git${SRCPV}"
 
 SRC_URI = "git://git.savannah.gnu.org/config.git \
            file://gnu-configize.in"
Signature · 1 line
2.31.1
#11 lore raw

PATCH 5/21 mmc-utils: update to latest revision

In reply to Alexander Kanavin

Drop patch as upstream has fixed the issue.

---
 ...tra-braces-when-initializing-subobje.patch | 32 -------------------
 meta/recipes-devtools/mmc/mmc-utils_git.bb    |  6 ++--
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-devtools/mmc/mmc-utils/0001-mmc_cmd.c-Use-extra-braces-when-initializing-subobje.patch
meta/recipes-devtools/mmc/mmc-utils/0001-mmc_cmd.c-Use-extra-braces-when-initializing-subobje.patch deleted +0 -32
deleted file mode 100644
index 12707357b2..0000000000
@@ -1,32 +0,0 @@
-From 04fbe6ddb5f1e02efbcae3cdf5beb16757a98948 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 10 May 2019 12:58:01 -0700
-Subject: [PATCH] mmc_cmd.c: Use extra braces when initializing subobjects
-
-clang warns with -Werror,-Wmissing-braces, as following error
-| mmc_cmds.c:1886:36: error: suggest braces around initialization of subobject [-Werror,-W
-missing-braces]
-|         struct rpmb_frame frame_status = {0};
-|                                           ^
-|                                           {}
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- mmc_cmds.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mmc_cmds.c b/mmc_cmds.c
-index 19a9da1..838e8c3 100644
---- a/mmc_cmds.c
-+++ b/mmc_cmds.c
-@@ -1883,7 +1883,7 @@ static int do_rpmb_op(int fd,
- 	u_int16_t rpmb_type;
- 	struct mmc_ioc_multi_cmd *mioc;
- 	struct mmc_ioc_cmd *ioc;
--	struct rpmb_frame frame_status = {0};
-+	struct rpmb_frame frame_status = {{0}};
- 
- 	if (!frame_in || !frame_out || !out_cnt)
- 		return -EINVAL;
meta/recipes-devtools/mmc/mmc-utils_git.bb +2 -4
index 8fe606915e..bdd0bf7f1b 100644
@@ -5,13 +5,11 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d"
 
 SRCBRANCH ?= "master"
-SRCREV = "73d6c59af8d1bcedf5de4aa1f5d5b7f765f545f5"
+SRCREV = "43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc"
 
 PV = "0.1+git${SRCPV}"
 
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \
-           file://0001-mmc_cmd.c-Use-extra-braces-when-initializing-subobje.patch \
-           "
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH}"
 UPSTREAM_CHECK_COMMITS = "1"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
#12 lore raw

PATCH 6/21 python3-smartypants: fix upstream version check

In reply to Alexander Kanavin

Upstream has never published the 2.0.1 tarball.

---
 meta/recipes-devtools/python/python3-smartypants_2.0.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/python/python3-smartypants_2.0.0.bb +1 -0
index 8acc971c35..ba3408247b 100644
@@ -10,3 +10,4 @@ SRC_URI[sha256sum] = "7812353a32022699a1aa8cd5626e01c94a946dcaeedaee2d0b382bae4c
 
 BBCLASSEXTEND = "native"
 
+UPSTREAM_CHECK_REGEX = "/${PYPI_PACKAGE}/(?P<pver>(?!2\.0\.1)(\d+[\.\-_]*)+)/"
Signature · 1 line
2.31.1
#13 lore raw

PATCH 7/21 at: upgrade 3.2.1 -> 3.2.2

In reply to Alexander Kanavin

Drop a script in /usr/share as purpose is unclear (nothing references it), and it pulls in bash without need.

---
 meta/recipes-extended/at/{at_3.2.1.bb => at_3.2.2.bb} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-extended/at/{at_3.2.1.bb => at_3.2.2.bb} (95%)
meta/recipes-extended/at/at_3.2.2.bb renamed from meta/recipes-extended/at/at_3.2.1.bb +2 -1
similarity index 95%
rename from meta/recipes-extended/at/at_3.2.1.bb
rename to meta/recipes-extended/at/at_3.2.2.bb
index ae15df8662..5c2018774c 100644
@@ -37,7 +37,7 @@ SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \
 PAM_SRC_URI = "file://pam.conf.patch \
                file://configure-add-enable-pam.patch"
 
-SRC_URI[sha256sum] = "aabe6e5cb6dd19fe9fb25c2747492f2db38762b95ea41b86f949609c39fb55c4"
+SRC_URI[sha256sum] = "2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088"
 
 EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
                  --with-daemon_username=root \
@@ -72,4 +72,5 @@ do_install () {
 	if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
 		install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd
 	fi
+        rm -f ${D}${datadir}/at/batch-job
 }
Signature · 1 line
2.31.1
#14 lore raw

PATCH 8/21 gnomebase: trim the SRC_URI directory from the back

In reply to Alexander Kanavin

Rather than take the first two components, drop the last one at the end. This makes it compatible with both old and new gnome version schemes.

---
 meta/classes/gnomebase.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes/gnomebase.bbclass +2 -1
index efcb6caae1..884b1a106f 100644
@@ -1,5 +1,6 @@
 def gnome_verdir(v):
-    return oe.utils.trim_version(v, 2)
+    return ".".join(v.split(".")[:-1])
+
 
 GNOME_COMPRESS_TYPE ?= "xz"
 SECTION ?= "x11/gnome"
Signature · 1 line
2.31.1
#15 lore raw

PATCH 9/21 gsettings-desktop-schemas: upgrade 3.38.0 -> 40.0

In reply to Alexander Kanavin
---
 ...ktop-schemas_3.38.0.bb => gsettings-desktop-schemas_40.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.38.0.bb => gsettings-desktop-schemas_40.0.bb} (85%)
meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_40.0.bb renamed from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb +1 -1
similarity index 85%
rename from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb
rename to meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_40.0.bb
index cf06af57d6..89751a8637 100644
@@ -13,4 +13,4 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings gobject-introspection gettext
 
-SRC_URI[archive.sha256sum] = "5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67"
+SRC_URI[archive.sha256sum] = "f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685"
Signature · 1 line
2.31.1
#16 lore raw

PATCH 10/21 igt-gpu-tools: upgrade 1.25 -> 1.26

In reply to Alexander Kanavin

Drop patches merged upstream.

---
 ...t_edid-Allocate-raw-8-bytes-for-VSDB.patch | 42 -------------------
 .../igt-gpu-tools/reproducibility.patch       | 38 -----------------
 .../igt-gpu-tools/igt-gpu-tools_git.bb        |  8 ++--
 3 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch
 delete mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/reproducibility.patch
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch deleted +0 -42
deleted file mode 100644
index 38bd4550a3..0000000000
@@ -1,42 +0,0 @@
-From 606349860d27492c328752dca5a3784c0e9a6d24 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 27 Feb 2021 11:05:45 -0800
-Subject: [PATCH i-g-t] lib/igt_edid: Allocate raw 8-bytes for VSDB
-
-hdmi_vsdb is an element of cea_vsdb which makes the size of cea_vsdb to
-be 8 ( 3bytes ieee_oui ) + ( 5bytes hdmi_vsdb struct), its true that we
-only use 7 bytes technically we can only allocate 7byte array but since
-we are writing to elements of hdmi_vsdb struct which is sitting at offet
-4-8 in cea_vsdb, compiler thinks we have an element which is out of
-array bounds since out allocated size is 7bytes
-
-This errors out
-../git/lib/igt_edid.c:365:13: error: array subscript 'struct hdmi_vsdb[0]' is partly outside array bounds of 'char[7]' [-Werror=array-bounds]
-  365 |         hdmi->src_phy_addr[0] = 0x10;
-      |             ^~
-
-allocating one extra byte matches with size of cea_vsdb and compiler is
-happy
-
-Upstream-Status: Submitted [https://lists.freedesktop.org/archives/igt-dev/2021-February/029446.html]
-Signed-off-by: Khem Raj <[email protected]>
----
- lib/igt_edid.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/igt_edid.c b/lib/igt_edid.c
-index 1c85486d..ce09cc47 100644
---- a/lib/igt_edid.c
-+++ b/lib/igt_edid.c
-@@ -351,7 +351,7 @@ void cea_sad_init_pcm(struct cea_sad *sad, int channels,
- const struct cea_vsdb *cea_vsdb_get_hdmi_default(size_t *size)
- {
- 	/* We'll generate a VSDB with 2 extension fields. */
--	static char raw[CEA_VSDB_HDMI_MIN_SIZE + 2] = {0};
-+	static char raw[CEA_VSDB_HDMI_MIN_SIZE + 3] = {0};
- 	struct cea_vsdb *vsdb;
- 	struct hdmi_vsdb *hdmi;
- 
--- 
-2.30.1
-
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/reproducibility.patch deleted +0 -38
deleted file mode 100644
index 39e36d8737..0000000000
@@ -1,38 +0,0 @@
-meson: Allow source location to be configurable
-
-Hardcoding a build source path into a binary when cross compiling isn't
-appropriate and breaks build reproducibility. Allow the srcdir to be
-specified by an optional configuration option to meson.
-
-Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
-Upstream-Status: Submitted [https://lists.freedesktop.org/archives/igt-dev/2021-February/029443.html]
-
-Index: git/lib/meson.build
-===================================================================
---- git.orig/lib/meson.build
-+++ git/lib/meson.build
-@@ -122,7 +122,11 @@ if chamelium.found()
- 	lib_sources += 'igt_chamelium_stream.c'
- endif
- 
--srcdir = join_paths(meson.source_root(), 'tests')
-+if get_option('srcdir') != ''
-+    srcdir = join_paths(get_option('srcdir'), 'tests')
-+else
-+    srcdir = join_paths(meson.source_root(), 'tests')
-+endif
- 
- lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
- 		      fallback : 'NO-GIT',
-Index: git/meson_options.txt
-===================================================================
---- git.orig/meson_options.txt
-+++ git/meson_options.txt
-@@ -50,3 +50,7 @@ option('use_rpath',
-        type : 'boolean',
-        value : false,
-        description : 'Set runpath on installed executables for libigt.so')
-+
-+option('srcdir',
-+       type : 'string',
-+       description : 'Path to source code to be compiled into binaries (optional)')
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +3 -5
index 1cc94cf993..5ab0498f7a 100644
@@ -9,12 +9,10 @@ LICENSE = "MIT"
 
 inherit meson
 
-SRCREV = "d16ad07e7f2a028e14d61f570931c87fa5ce404c"
-PV = "1.25+git${SRCPV}"
+SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2"
+PV = "1.26"
 
-SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https \
-           file://0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch \
-           file://reproducibility.patch"
+SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.31.1
#17 lore raw

PATCH 11/21 mesa: update 21.0.3 -> 21.1.1

In reply to Alexander Kanavin

License-Update: typo fix

---
 ...002-meson.build-make-TLS-ELF-optional.patch | 18 +++++++++---------
 .../{mesa-gl_21.0.3.bb => mesa-gl_21.1.1.bb}   |  0
 meta/recipes-graphics/mesa/mesa.inc            |  4 ++--
 .../mesa/{mesa_21.0.3.bb => mesa_21.1.1.bb}    |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_21.0.3.bb => mesa-gl_21.1.1.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_21.0.3.bb => mesa_21.1.1.bb} (99%)
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +9 -9
index df2346d336..eac6d4df89 100644
@@ -1,4 +1,4 @@
-From 624f430dd0a91344146a2b8d49a69f23560c2fa2 Mon Sep 17 00:00:00 2001
+From d434b9e5d29d614b57c09e164e1d084094bf2150 Mon Sep 17 00:00:00 2001
 From: Alistair Francis <[email protected]>
 Date: Thu, 14 Nov 2019 13:08:31 -0800
 Subject: [PATCH] meson.build: make TLS ELF optional
@@ -30,23 +30,23 @@ Signed-off-by: Alistair Francis <[email protected]>
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index efc6171..8450968 100644
+index 42f448e..02f6e33 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -448,7 +448,7 @@ endif
- 
- # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+@@ -449,7 +449,7 @@ endif
  use_elf_tls = false
--if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
-+if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
+ if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
+     (not with_platform_android or get_option('platform-sdk-version') >= 29) and
+-    (not with_platform_windows or not with_shared_glapi))
++    (not with_platform_windows or not with_shared_glapi) and get_option('elf-tls'))
    pre_args += '-DUSE_ELF_TLS'
    use_elf_tls = true
  endif
 diff --git a/meson_options.txt b/meson_options.txt
-index fc73f6e..d7482c0 100644
+index a7030ab..635ec20 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -420,6 +420,12 @@ option(
+@@ -421,6 +421,12 @@ option(
    value : true,
    description : 'Enable direct rendering in GLX and EGL for DRI',
  )
meta/recipes-graphics/mesa/mesa-gl_21.1.1.bb renamed from meta/recipes-graphics/mesa/mesa-gl_21.0.3.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_21.0.3.bb
rename to meta/recipes-graphics/mesa/mesa-gl_21.1.1.bb
meta/recipes-graphics/mesa/mesa.inc +2 -2
index 4cec1034e4..32cc997c9e 100644
@@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org"
 BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496"
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f"
 
 PE = "2"
 
@@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
            "
 
-SRC_URI[sha256sum] = "565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b"
+SRC_URI[sha256sum] = "eec25ea379054e8911bc5de816aeb50f581b5b708414725003d2f00386b38dd2"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
meta/recipes-graphics/mesa/mesa_21.1.1.bb renamed from meta/recipes-graphics/mesa/mesa_21.0.3.bb +1 -0
similarity index 99%
rename from meta/recipes-graphics/mesa/mesa_21.0.3.bb
rename to meta/recipes-graphics/mesa/mesa_21.1.1.bb
index 8c584d8e9f..1993d6cbd0 100644
@@ -2,3 +2,4 @@ require ${BPN}.inc
 
 DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915"
 DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915"
+
Signature · 1 line
2.31.1
#18 lore raw

PATCH 12/21 vulkan-samples: update to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -1
index e89f75baac..a177d9a391 100644
@@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "5646820bdd46365183adc2b326556c5bf7d8db76"
+SRCREV = "04278ed5f0f9847ae6897509eb56d7b21b4e8cde"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
#19 lore raw

PATCH 13/21 libgpg-error: update 1.41 -> 1.42

In reply to Alexander Kanavin
---
 ...not-hardcode-gnu-libc-when-generatin.patch |  27 ++++
 .../libgpg-error/libgpg-error/fix-cross.patch |  28 ++++
 .../libgpg-error/libgpg-error/pkgconfig.patch | 129 ++++++++++--------
 ...gpg-error_1.41.bb => libgpg-error_1.42.bb} |   4 +-
 4 files changed, 130 insertions(+), 58 deletions(-)
 create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch
 create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.41.bb => libgpg-error_1.42.bb} (87%)
meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch new file +27 -0
new file mode 100644
index 0000000000..0f6e309391
@@ -0,0 +1,27 @@
+From 7437acb228678ea5d8288b930b4f5b72c3d449ed Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+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: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ 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
meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch new file +28 -0
new file mode 100644
index 0000000000..ae424cdb9a
@@ -0,0 +1,28 @@
+From: David Michael <[email protected]>
+Date: Fri, 26 Mar 2021 07:06:50 +0000 (+0900)
+Subject: build: Fix generation of lock-obj-pub.native.h for cross build.
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=33593864cd54143db594c4237bba41e14179061c
+
+build: Fix generation of lock-obj-pub.native.h for cross build.
+
+* src/gen-lock-obj.sh: Capture echo output with quotes.
+
+Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
+Signed-off-by: David Michael <[email protected]>
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+
+diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
+index a710f0c..258eec6 100755
+--- a/src/gen-lock-obj.sh
++++ b/src/gen-lock-obj.sh
+@@ -38,7 +38,7 @@
+ #     AWK=gawk ./gen-lock-obj.sh
+ #
+ 
+-if test -n `echo -n`; then
++if test -n "`echo -n`"; then
+     ECHO_C='\c'
+     ECHO_N=''
+ else
meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +72 -57

171 lines not on this page · raw message

meta/recipes-support/libgpg-error/libgpg-error_1.42.bb renamed from meta/recipes-support/libgpg-error/libgpg-error_1.41.bb +3 -1
similarity index 87%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.41.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.42.bb
index a0119729d8..c972d9a953 100644
@@ -17,9 +17,11 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
            file://0001-Do-not-fail-when-testing-config-scripts.patch \
+           file://fix-cross.patch \
+           file://0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch \
            "
 
-SRC_URI[sha256sum] = "64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742"
+SRC_URI[sha256sum] = "fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
Signature · 1 line
2.31.1
#20 lore raw

PATCH 14/21 webkitgtk: update 2.32.0 -> 2.32.1

In reply to Alexander Kanavin

Drop 49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch (backport)
0001-Fix-build-with-musl.patch
(problem fixed upstream).

---
 ...1-Enable-THREADS_PREFER_PTHREAD_FLAG.patch |   6 +-
 .../webkitgtk/0001-Fix-build-with-musl.patch  |  91 ----------
 ...9c49c6de8af74e521f36cb43e6c1ec2e391c.patch | 155 ------------------
 .../webkitgtk/musl-lower-stack-usage.patch    |  17 +-
 ...ebkitgtk_2.32.0.bb => webkitgtk_2.32.1.bb} |   4 +-
 5 files changed, 8 insertions(+), 265 deletions(-)
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.32.0.bb => webkitgtk_2.32.1.bb} (97%)
meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +3 -3
index fd062e0f74..efe286ed6b 100644
@@ -1,4 +1,4 @@
-From 3ab2b8aa49c92a68610eef14be1fbf535109b0fb Mon Sep 17 00:00:00 2001
+From af90ae1f128626e8d57a8bcbc432596bfc2987af Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Mon, 3 Feb 2020 17:06:27 -0800
 Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
@@ -20,11 +20,11 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 2 insertions(+)
 
 diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 9eb44f1c..a24fdd0d 100644
+index af6c0fac..f393d741 100644
 --- a/Source/cmake/OptionsGTK.cmake
 +++ b/Source/cmake/OptionsGTK.cmake
 @@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN()
- SET_PROJECT_VERSION(2 32 0)
+ SET_PROJECT_VERSION(2 32 1)
  
  set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
 +set(THREADS_PREFER_PTHREAD_FLAG ON)
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch deleted +0 -91

91 lines not on this page · raw message

meta/recipes-sato/webkit/webkitgtk/49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch deleted +0 -155

155 lines not on this page · raw message

meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch +4 -13
index e4b5818358..f71f8452fd 100644
@@ -1,4 +1,4 @@
-From 5c82d20a00749e9106db78cdd23a09609dd3511c Mon Sep 17 00:00:00 2001
+From 04e4999c6fa2e9810634745a07f1e380f27b8e61 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 17 Mar 2021 13:24:57 -0700
 Subject: [PATCH] reduce thread stack and heap usage for javascriptcore on musl
@@ -20,12 +20,12 @@ Upstream-Status: Accepted
 Signed-off-by: Khem Raj <[email protected]>
 
 ---
- Source/JavaScriptCore/runtime/OptionsList.h | 20 ++++++++++++++++----
+ Source/JavaScriptCore/runtime/OptionsList.h | 18 +++++++++++++++---
  Source/WTF/wtf/Threading.h                  |  4 ++++
- 2 files changed, 20 insertions(+), 4 deletions(-)
+ 2 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h
-index bc1cedb9..a6209742 100644
+index bb6d2f1d..a6209742 100644
 --- a/Source/JavaScriptCore/runtime/OptionsList.h
 +++ b/Source/JavaScriptCore/runtime/OptionsList.h
 @@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
@@ -60,15 +60,6 @@ index bc1cedb9..a6209742 100644
      \
      v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \
      v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
-@@ -608,7 +620,7 @@ public:
-     bool init(const char*);
-     bool isInRange(unsigned);
-     const char* rangeString() const { return (m_state > InitError) ? m_rangeString : s_nullRangeStr; }
--    
-+
-     void dump(PrintStream& out) const;
- 
- private:
 diff --git a/Source/WTF/wtf/Threading.h b/Source/WTF/wtf/Threading.h
 index 9495d6c1..190b3811 100644
 --- a/Source/WTF/wtf/Threading.h
meta/recipes-sato/webkit/webkitgtk_2.32.1.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.32.0.bb +1 -3
similarity index 97%
rename from meta/recipes-sato/webkit/webkitgtk_2.32.0.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.32.1.bb
index 31a6c97a32..7abf96c252 100644
@@ -15,16 +15,14 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
            file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
            file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \
-           file://0001-Fix-build-with-musl.patch \
            file://include_xutil.patch \
            file://reduce-memory-overheads.patch \
            file://musl-lower-stack-usage.patch \
            file://0001-MiniBrowser-Fix-reproduciblity.patch \
-           file://49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch \
            file://0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch \
            "
 
-SRC_URI[sha256sum] = "9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0"
+SRC_URI[sha256sum] = "136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
Signature · 1 line
2.31.1
#21 lore raw

PATCH 15/21 glib-2.0: update 2.68.1 -> 2.68.2

In reply to Alexander Kanavin
---
 meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch  | 6 +++---
 .../glib-2.0/{glib-2.0_2.68.1.bb => glib-2.0_2.68.2.bb}     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.68.1.bb => glib-2.0_2.68.2.bb} (96%)
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +3 -3
index 7cf89c8718..7fbc07af58 100644
@@ -1,4 +1,4 @@
-From ff790dd7086e28896f8e7630135f756cc6f06c80 Mon Sep 17 00:00:00 2001
+From b7abbba886d3743616f8cc0e8b441c879128bbda Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -19,7 +19,7 @@ Signed-off-by: Jussi Kukkonen <[email protected]>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index ca1daf2..954a250 100644
+index a2909a8..1f4ab82 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -51,6 +51,8 @@
@@ -31,7 +31,7 @@ index ca1daf2..954a250 100644
  #endif
  #include <glib/gstdio.h>
  
-@@ -1212,7 +1214,15 @@ get_gio_module_dir (void)
+@@ -1213,7 +1215,15 @@ get_gio_module_dir (void)
                                       NULL);
        g_free (install_dir);
  #else
meta/recipes-core/glib-2.0/glib-2.0_2.68.2.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb +1 -1
similarity index 96%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.68.2.bb
index accc2cada2..0cf16884ef 100644
@@ -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] = "241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333"
+SRC_URI[sha256sum] = "ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb"
 
 # Find any meson cross files in FILESPATH that are relevant for the current
 # build (using siteinfo) and add them to EXTRA_OEMESON.
Signature · 1 line
2.31.1
#22 lore raw

PATCH 16/21 apt: upgrade 2.2.2 -> 2.2.3

In reply to Alexander Kanavin
---
 .../apt/0001-Do-not-init-tables-from-dpkg-configuration.patch   | 2 +-
 ...1-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch | 2 +-
 meta/recipes-devtools/apt/{apt_2.2.2.bb => apt_2.2.3.bb}        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/apt/{apt_2.2.2.bb => apt_2.2.3.bb} (97%)
meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch +1 -1
index e0e7e0cd58..a9a8eb6306 100644
@@ -1,4 +1,4 @@
-From 382f8381ef8baf754057e376a6d9bf840ca6d543 Mon Sep 17 00:00:00 2001
+From 5fb6355c7dd00c97fe90e805ace075b6e9b6952d Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 10 May 2019 16:47:38 +0200
 Subject: [PATCH] Do not init tables from dpkg configuration
meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +1 -1
index c14dc2a414..34d0c4b4cd 100644
@@ -1,4 +1,4 @@
-From a603b3281f3f60a87531c8cec4843f970170d409 Mon Sep 17 00:00:00 2001
+From 76f8386cac7f13688b386686e0b1fc4b1b574f53 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 21 May 2020 20:13:25 +0000
 Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our
meta/recipes-devtools/apt/apt_2.2.3.bb renamed from meta/recipes-devtools/apt/apt_2.2.2.bb +1 -1
similarity index 97%
rename from meta/recipes-devtools/apt/apt_2.2.2.bb
rename to meta/recipes-devtools/apt/apt_2.2.3.bb
index 192aec46bf..ff9270c4b3 100644
@@ -25,7 +25,7 @@ SRC_URI_append_class-nativesdk = " \
            file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \
            "
 
-SRC_URI[sha256sum] = "c5449a4c2126a12497a9949cd10209926005d329f6ce7942a3781fa2fcf50487"
+SRC_URI[sha256sum] = "2880474bc08c79f103cd30d24a9c30c78b480c65076e466d24df93b9fa05ab27"
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 # the package is taken from snapshots.debian.org; that source is static and goes stale
Signature · 1 line
2.31.1
#23 lore raw

PATCH 17/21 cmake: update 3.20.1 -> 3.20.2

In reply to Alexander Kanavin
---
 .../cmake/{cmake-native_3.20.1.bb => cmake-native_3.20.2.bb}  | 0
 meta/recipes-devtools/cmake/cmake.inc                         | 2 +-
 ...CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | 4 ++--
 .../cmake/{cmake_3.20.1.bb => cmake_3.20.2.bb}                | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.20.1.bb => cmake-native_3.20.2.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.20.1.bb => cmake_3.20.2.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.20.2.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.20.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.20.1.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.20.2.bb
meta/recipes-devtools/cmake/cmake.inc +1 -1
index 2e6059f980..be43760628 100644
@@ -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] = "3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0"
+SRC_URI[sha256sum] = "aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +2 -2
index 06e10bf861..9609f5f7c2 100644
@@ -1,4 +1,4 @@
-From ac9b8d316ff3e013bc9d3c063db99aa1f064ce6a Mon Sep 17 00:00:00 2001
+From e75f76b00cc9c1cfc231c5e731e975552f5dd13e Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <[email protected]>
 Date: Thu, 27 Apr 2017 11:35:05 -0400
 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
@@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador <[email protected]>
  1 file changed, 7 insertions(+)
 
 diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
-index bae270d..5bb6bc0 100644
+index bae270de..5bb6bc0d 100644
 --- a/Modules/CMakeDetermineSystem.cmake
 +++ b/Modules/CMakeDetermineSystem.cmake
 @@ -111,6 +111,13 @@ else()
meta/recipes-devtools/cmake/cmake_3.20.2.bb renamed from meta/recipes-devtools/cmake/cmake_3.20.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.20.1.bb
rename to meta/recipes-devtools/cmake/cmake_3.20.2.bb
Signature · 1 line
2.31.1
#24 lore raw

PATCH 18/21 libdnf: update 0.62.0 -> 0.63.0

In reply to Alexander Kanavin
---
 .../libdnf/{libdnf_0.62.0.bb => libdnf_0.63.0.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/libdnf/{libdnf_0.62.0.bb => libdnf_0.63.0.bb} (94%)
meta/recipes-devtools/libdnf/libdnf_0.63.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.62.0.bb +2 -2
similarity index 94%
rename from meta/recipes-devtools/libdnf/libdnf_0.62.0.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.63.0.bb
index e2c2c41c6a..79e8865456 100644
@@ -14,8 +14,8 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
            file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \
            "
 
-SRCREV = "9a0e17562b19586b3ffa70fa93eb961b558794c7"
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
+SRCREV = "669a5c691acba91693d238d6262ac99a440aa9b3"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.31.1
#25 lore raw

Re: [OE-core] [PATCH 18/21] libdnf: update 0.62.0 -> 0.63.0

Hi Alexander,

This upgrade introduces a regression of building nativesdk-libdnf. `bitbake nativesdk-libdnf' and we can see do_package failure.

Regards,
Chen Qi

Quoted 28 lines · Alexander Kanavin
---
  .../libdnf/{libdnf_0.62.0.bb => libdnf_0.63.0.bb}             | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

rename meta/recipes-devtools/libdnf/{libdnf_0.62.0.bb => libdnf_0.63.0.bb} (94%)

meta/recipes-devtools/libdnf/libdnf_0.63.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.62.0.bb +2 -2
similarity index 94%
rename from meta/recipes-devtools/libdnf/libdnf_0.62.0.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.63.0.bb
index e2c2c41c6a..79e8865456 100644
@@ -14,8 +14,8 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
             file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \
             "
 
-SRCREV = "9a0e17562b19586b3ffa70fa93eb961b558794c7"
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
+SRCREV = "669a5c691acba91693d238d6262ac99a440aa9b3"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
 
  S = "${WORKDIR}/git"
 
#26 lore raw

PATCH 19/21 harfbuzz: update 2.8.0 -> 2.8.1

In reply to Alexander Kanavin

fontconfig option has been removed upstream as fontconfig hasn't been used for anything.

---
 .../harfbuzz/{harfbuzz_2.8.0.bb => harfbuzz_2.8.1.bb}        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_2.8.0.bb => harfbuzz_2.8.1.bb} (89%)
meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb renamed from meta/recipes-graphics/harfbuzz/harfbuzz_2.8.0.bb +2 -3
similarity index 89%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_2.8.0.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb
index 6e3fed7357..2353633071 100644
@@ -12,7 +12,7 @@ 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] = "a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42"
+SRC_URI[sha256sum] = "4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300"
 
 inherit meson pkgconfig lib_package gtk-doc gobject-introspection
 
@@ -21,9 +21,8 @@ GIR_MESON_DISABLE_FLAG = 'disabled'
 GTKDOC_MESON_ENABLE_FLAG = 'enabled'
 GTKDOC_MESON_DISABLE_FLAG = 'disabled'
 
-PACKAGECONFIG ??= "cairo fontconfig freetype glib icu"
+PACKAGECONFIG ??= "cairo freetype glib icu"
 PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
-PACKAGECONFIG[fontconfig] = "-Dfontconfig=enabled,-Dfontconfig=disabled,fontconfig"
 PACKAGECONFIG[freetype] = "-Dfreetype=enabled,-Dfreetype=disabled,freetype"
 PACKAGECONFIG[glib] = "-Dglib=enabled,-Dglib=disabled,glib-2.0"
 PACKAGECONFIG[graphite] = "-Dgraphite=enabled,-Dgraphite=disabled,graphite2"
Signature · 1 line
2.31.1
#27 lore raw

PATCH 20/21 curl: update 7.76.0 -> 7.76.1

In reply to Alexander Kanavin
---
 meta/recipes-support/curl/{curl_7.76.0.bb => curl_7.76.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/curl/{curl_7.76.0.bb => curl_7.76.1.bb} (97%)
meta/recipes-support/curl/curl_7.76.1.bb renamed from meta/recipes-support/curl/curl_7.76.0.bb +1 -1
similarity index 97%
rename from meta/recipes-support/curl/curl_7.76.0.bb
rename to meta/recipes-support/curl/curl_7.76.1.bb
index db6318148f..4e2c277010 100644
@@ -13,7 +13,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://0001-replace-krb5-config-with-pkg-config.patch \
 "
 
-SRC_URI[sha256sum] = "e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a"
+SRC_URI[sha256sum] = "7a8e184d7d31312c4ebf6a8cb59cd757e61b2b2833a9ed4f9bf708066e7695e9"
 
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"
Signature · 1 line
2.31.1
#28 lore raw

PATCH 21/21 systemtap: update 4.4 -> 4.5

In reply to Alexander Kanavin

Drop 0001-transport-protect-include-and-callsite-with-same-con.patch as upstream made the same change:
https://sourceware.org/git/?p=systemtap.git;a=commitdiff;h=0d80048e02ecf6876c9f9ebeea387af9fb2a8051

---
 ...t-include-and-callsite-with-same-con.patch | 44 -------------------
 .../systemtap/systemtap_git.inc               |  5 +--
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch
meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch deleted +0 -44
deleted file mode 100644
index efc79f6c0f..0000000000
@@ -1,44 +0,0 @@
-From cbf27cd54071f788231e69d96dbaad563f1010d4 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <[email protected]>
-Date: Fri, 18 Dec 2020 13:15:08 -0500
-Subject: [PATCH] transport: protect include and callsite with same conditional
-
-transport.c has the following code block:
-
-  if (!debugfs_p && security_locked_down (LOCKDOWN_DEBUGFS))
-
-Which is protected by the conditional STAPCONF_LOCKDOWN_DEBUGFS.
-
-linux/security.h provides the definition of LOCKDOWN_DEBUGFS, and
-must be included or we have a compilation issue.
-
-The include of security.h is protected by #ifdef CONFIG_SECURITY_LOCKDOWN_LSM,
-which means that in some configurations we can get out of sync with
-the include and the callsite.
-
-If we protect the include and the callsite with the same #ifdef, we can
-be sure that they will be consistent.
-
-Upstream-status: Inappropriate (kernel-devsrc specific)
-
-Signed-off-by: Bruce Ashfield <[email protected]>
----
- runtime/transport/transport.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c
-index bb4a98bd3..88e20ea28 100644
---- a/runtime/transport/transport.c
-+++ b/runtime/transport/transport.c
-@@ -21,7 +21,7 @@
- #include <linux/namei.h>
- #include <linux/delay.h>
- #include <linux/mutex.h>
--#ifdef CONFIG_SECURITY_LOCKDOWN_LSM
-+#ifdef STAPCONF_LOCKDOWN_DEBUGFS
- #include <linux/security.h>
- #endif
- #include "../uidgid_compatibility.h"
--- 
-2.19.1
-
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -3
index 016b423847..23ecc61987 100644
@@ -1,13 +1,12 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV = "988f439af39a359b4387963ca4633649866d8275"
-PV = "4.4"
+SRCREV = "0eba8a46bc99c66e5dd274a9a4d661fe08ac4b8a"
+PV = "4.5"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git \
            file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
            file://0001-Install-python-modules-to-correct-library-dir.patch \
            file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
-           file://0001-transport-protect-include-and-callsite-with-same-con.patch \
            "
 
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux'
Signature · 1 line
2.31.1