diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:04:45 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:12 +0100 |
| commit | e07ba76fc78b44f338e574644a8ae3b6cddc9f08 (patch) | |
| tree | a28f141dc7c897c074604980575c78f7474e74fe /meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch | |
| parent | e3c2bc571e173e230cd3942888bdcf6423f14a2e (diff) | |
| download | openembedded-core-contrib-e07ba76fc78b44f338e574644a8ae3b6cddc9f08.tar.gz | |
systemd: upgrade 250.4 -> 250.5
Drop 0029-network-enable-KeepConfiguration-when-running-on-net.patch as
patch merged upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch | 10 |
1 files changed, 9 insertions, 1 deletions
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 index f3edc7d82b..18fcc6e48c 100644 --- 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 @@ -1,4 +1,4 @@ -From 3b42a888685aee1776a12cff84a5fe0063378483 Mon Sep 17 00:00:00 2001 +From a4f51ef07375466f79cb148ff1178ed11f808f0a Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 13:55:12 +0800 Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t @@ -21,6 +21,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 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 +index f6233090a9..aeaf6ad5ec 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,12 @@ @@ -36,6 +38,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +#define __COMPAR_FN_T +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 cb448df109..fd738a65ab 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ @@ -46,6 +50,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index d054668b8e..d3bf55acbe 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -10,6 +10,7 @@ @@ -56,6 +62,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> #if HAVE_KMOD #include "module-util.h" +diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c +index 8fc87b131a..36a6efdbd8 100644 --- a/src/libsystemd/sd-journal/catalog.c +++ b/src/libsystemd/sd-journal/catalog.c @@ -28,6 +28,7 @@ |