diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2021-06-03 17:43:07 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-06 23:16:50 +0100 |
commit | 97a8f1c4b51de8fd0ea0ac05a8aa86e30dfc04a1 (patch) | |
tree | 580a10184cfa59aa77f7e9a656669fd63080b750 | |
parent | 551ce77b43caf384e6b3c1330f1c6c6ad28b1f41 (diff) | |
download | poky-97a8f1c4b51de8fd0ea0ac05a8aa86e30dfc04a1.tar.gz |
systemd: Add more ugly casts to fix build with musl
(From OE-Core rev: 47df56f374921647eb99572a425f51eeade81bea)
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch index af1a6bb053..940db4c5c6 100644 --- a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch | |||
@@ -47,9 +47,18 @@ index b7e18768e3..3195ab205d 100644 | |||
47 | #if SIZEOF_DEV_T == 8 | 47 | #if SIZEOF_DEV_T == 8 |
48 | # define DEV_FMT "%" PRIu64 | 48 | # define DEV_FMT "%" PRIu64 |
49 | diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c | 49 | diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c |
50 | index 23d108d5df..94373c9422 100644 | 50 | index 23d108d5df..b037734ee3 100644 |
51 | --- a/src/basic/rlimit-util.c | 51 | --- a/src/basic/rlimit-util.c |
52 | +++ b/src/basic/rlimit-util.c | 52 | +++ b/src/basic/rlimit-util.c |
53 | @@ -43,7 +43,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { | ||
54 | fixed.rlim_max == highest.rlim_max) | ||
55 | return 0; | ||
56 | |||
57 | - log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", rlim->rlim_max, rlimit_to_string(resource), fixed.rlim_max); | ||
58 | + log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", (uintmax_t)rlim->rlim_max, rlimit_to_string(resource), (uintmax_t)fixed.rlim_max); | ||
59 | |||
60 | if (setrlimit(resource, &fixed) < 0) | ||
61 | return -errno; | ||
53 | @@ -308,13 +308,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { | 62 | @@ -308,13 +308,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { |
54 | if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) | 63 | if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) |
55 | s = strdup("infinity"); | 64 | s = strdup("infinity"); |