diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2020-02-06 16:48:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-08 13:20:02 +0000 |
commit | 306820bad60c62a8096df8d1e4c7cc8e00dc38b7 (patch) | |
tree | 78fe9e9d90e19ca52f2cc462e1368e90484d4b4d /meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | |
parent | cc7164836097a4100dce65e93b24a3a8874f65b3 (diff) | |
download | poky-306820bad60c62a8096df8d1e4c7cc8e00dc38b7.tar.gz |
systemd: upgrade 243.4 -> 244.1
Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a
variant on which was introduced in 2c1047310970 ("Upgrade to systemd
211+") in 2014. The oldest supported build machine is now CentOS 7 which
has --relative support in ln, so there no longer appears to be any need
for this change.
Rebase/refresh musl patches:
- replace missing.h with specific missing_... header
- fix additional WRITE_STRING_FILE_DISABLE_BUFFER
- fix more places that need netinet/if_ether.h
(From OE-Core rev: 44a4ac2294da0f53cbbfabc7ece836fe97f4d3f7)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch index 34f7f5fb74..580c49fecf 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From f8a239b182158ca0a537ba053cb0e6bad9c3a2fb Mon Sep 17 00:00:00 2001 | 1 | From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:56:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:56:21 +0800 |
4 | Subject: [PATCH 07/24] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not | 4 | Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined |
5 | defined | ||
6 | 5 | ||
7 | If the standard library doesn't provide brace | 6 | If the standard library doesn't provide brace |
8 | expansion users just won't get it. | 7 | expansion users just won't get it. |
@@ -17,6 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 16 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
18 | [rebased for systemd 243] | 17 | [rebased for systemd 243] |
19 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 18 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
19 | |||
20 | --- | 20 | --- |
21 | src/basic/glob-util.c | 12 ++++++++++++ | 21 | src/basic/glob-util.c | 12 ++++++++++++ |
22 | src/test/test-glob-util.c | 16 ++++++++++++++++ | 22 | src/test/test-glob-util.c | 16 ++++++++++++++++ |
@@ -24,10 +24,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
24 | 3 files changed, 38 insertions(+) | 24 | 3 files changed, 38 insertions(+) |
25 | 25 | ||
26 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c | 26 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c |
27 | index b335af8d97..2cdfc11f16 100644 | 27 | index e3aa6c2e152b..38070b79c83a 100644 |
28 | --- a/src/basic/glob-util.c | 28 | --- a/src/basic/glob-util.c |
29 | +++ b/src/basic/glob-util.c | 29 | +++ b/src/basic/glob-util.c |
30 | @@ -14,6 +14,12 @@ | 30 | @@ -12,6 +12,12 @@ |
31 | #include "path-util.h" | 31 | #include "path-util.h" |
32 | #include "strv.h" | 32 | #include "strv.h" |
33 | 33 | ||
@@ -40,7 +40,7 @@ index b335af8d97..2cdfc11f16 100644 | |||
40 | static void closedir_wrapper(void* v) { | 40 | static void closedir_wrapper(void* v) { |
41 | (void) closedir(v); | 41 | (void) closedir(v); |
42 | } | 42 | } |
43 | @@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) { | 43 | @@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { |
44 | int safe_glob(const char *path, int flags, glob_t *pglob) { | 44 | int safe_glob(const char *path, int flags, glob_t *pglob) { |
45 | int k; | 45 | int k; |
46 | 46 | ||
@@ -48,7 +48,7 @@ index b335af8d97..2cdfc11f16 100644 | |||
48 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ | 48 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ |
49 | assert(!(flags & GLOB_ALTDIRFUNC)); | 49 | assert(!(flags & GLOB_ALTDIRFUNC)); |
50 | 50 | ||
51 | @@ -34,9 +41,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { | 51 | @@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { |
52 | pglob->gl_lstat = lstat; | 52 | pglob->gl_lstat = lstat; |
53 | if (!pglob->gl_stat) | 53 | if (!pglob->gl_stat) |
54 | pglob->gl_stat = stat; | 54 | pglob->gl_stat = stat; |
@@ -64,10 +64,10 @@ index b335af8d97..2cdfc11f16 100644 | |||
64 | return -ENOENT; | 64 | return -ENOENT; |
65 | if (k == GLOB_NOSPACE) | 65 | if (k == GLOB_NOSPACE) |
66 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c | 66 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c |
67 | index b4f41445fe..f0d474ed14 100644 | 67 | index 667d15335fbf..76a84443aacf 100644 |
68 | --- a/src/test/test-glob-util.c | 68 | --- a/src/test/test-glob-util.c |
69 | +++ b/src/test/test-glob-util.c | 69 | +++ b/src/test/test-glob-util.c |
70 | @@ -13,6 +13,12 @@ | 70 | @@ -12,6 +12,12 @@ |
71 | #include "rm-rf.h" | 71 | #include "rm-rf.h" |
72 | #include "tmpfile-util.h" | 72 | #include "tmpfile-util.h" |
73 | 73 | ||
@@ -80,7 +80,7 @@ index b4f41445fe..f0d474ed14 100644 | |||
80 | static void test_glob_exists(void) { | 80 | static void test_glob_exists(void) { |
81 | char name[] = "/tmp/test-glob_exists.XXXXXX"; | 81 | char name[] = "/tmp/test-glob_exists.XXXXXX"; |
82 | int fd = -1; | 82 | int fd = -1; |
83 | @@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { | 83 | @@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { |
84 | const char *fn; | 84 | const char *fn; |
85 | 85 | ||
86 | _cleanup_globfree_ glob_t g = { | 86 | _cleanup_globfree_ glob_t g = { |
@@ -94,7 +94,7 @@ index b4f41445fe..f0d474ed14 100644 | |||
94 | }; | 94 | }; |
95 | 95 | ||
96 | int r; | 96 | int r; |
97 | @@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { | 97 | @@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { |
98 | assert_se(mkdtemp(template)); | 98 | assert_se(mkdtemp(template)); |
99 | 99 | ||
100 | fn = strjoina(template, "/*"); | 100 | fn = strjoina(template, "/*"); |
@@ -115,10 +115,10 @@ index b4f41445fe..f0d474ed14 100644 | |||
115 | 115 | ||
116 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); | 116 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); |
117 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c | 117 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c |
118 | index 3c30612af1..14bc428085 100644 | 118 | index 193ed0bc781b..2f94fd2efd8f 100644 |
119 | --- a/src/tmpfiles/tmpfiles.c | 119 | --- a/src/tmpfiles/tmpfiles.c |
120 | +++ b/src/tmpfiles/tmpfiles.c | 120 | +++ b/src/tmpfiles/tmpfiles.c |
121 | @@ -63,6 +63,12 @@ | 121 | @@ -58,6 +58,12 @@ |
122 | #include "umask-util.h" | 122 | #include "umask-util.h" |
123 | #include "user-util.h" | 123 | #include "user-util.h" |
124 | 124 | ||
@@ -131,7 +131,7 @@ index 3c30612af1..14bc428085 100644 | |||
131 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates | 131 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates |
132 | * them in the file system. This is intended to be used to create | 132 | * them in the file system. This is intended to be used to create |
133 | * properly owned directories beneath /tmp, /var/tmp, /run, which are | 133 | * properly owned directories beneath /tmp, /var/tmp, /run, which are |
134 | @@ -1853,7 +1859,9 @@ finish: | 134 | @@ -1850,7 +1856,9 @@ finish: |
135 | 135 | ||
136 | static int glob_item(Item *i, action_t action) { | 136 | static int glob_item(Item *i, action_t action) { |
137 | _cleanup_globfree_ glob_t g = { | 137 | _cleanup_globfree_ glob_t g = { |
@@ -141,7 +141,7 @@ index 3c30612af1..14bc428085 100644 | |||
141 | }; | 141 | }; |
142 | int r = 0, k; | 142 | int r = 0, k; |
143 | char **fn; | 143 | char **fn; |
144 | @@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) { | 144 | @@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) { |
145 | 145 | ||
146 | static int glob_item_recursively(Item *i, fdaction_t action) { | 146 | static int glob_item_recursively(Item *i, fdaction_t action) { |
147 | _cleanup_globfree_ glob_t g = { | 147 | _cleanup_globfree_ glob_t g = { |