diff options
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r-- | meta-oe/recipes-core/emlog/emlog_git.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb (renamed from meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb | 9 | ||||
-rw-r--r-- | meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch | 119 | ||||
-rw-r--r-- | meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch | 11 | ||||
-rw-r--r-- | meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb (renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.4.bb) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/usleep/files/usleep.c | 4 | ||||
-rw-r--r-- | meta-oe/recipes-core/usleep/usleep_1.2.bb | 7 |
9 files changed, 52 insertions, 106 deletions
diff --git a/meta-oe/recipes-core/emlog/emlog_git.bb b/meta-oe/recipes-core/emlog/emlog_git.bb index 6331f618f..3f3b5bc92 100644 --- a/meta-oe/recipes-core/emlog/emlog_git.bb +++ b/meta-oe/recipes-core/emlog/emlog_git.bb | |||
@@ -18,7 +18,7 @@ do_compile() { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | do_install() { | 20 | do_install() { |
21 | install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/${BPN} | 21 | install -Dm 0755 ${UNPACKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/${BPN} |
22 | install -Dm 0755 ${S}/nbcat ${D}${bindir}/nbcat | 22 | install -Dm 0755 ${S}/nbcat ${D}${bindir}/nbcat |
23 | install -Dm 0755 ${S}/mkemlog ${D}${bindir}/mkemlog | 23 | install -Dm 0755 ${S}/mkemlog ${D}${bindir}/mkemlog |
24 | } | 24 | } |
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb index f40a8144d..a45d31edc 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb | |||
@@ -12,7 +12,7 @@ inherit gnomebase | |||
12 | 12 | ||
13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
14 | 14 | ||
15 | SRC_URI[archive.sha256sum] = "5d2e872564996f02a06d8bbac3677e7c394af8b00dd1526aebd47af842a3ef50" | 15 | SRC_URI[archive.sha256sum] = "539b0a29e15a96676c4f0594541250566c5ca44da5d4d87a3732fa2d07909e4a" |
16 | 16 | ||
17 | S = "${WORKDIR}/${GNOMEBN}-${PV}" | 17 | S = "${WORKDIR}/${GNOMEBN}-${PV}" |
18 | 18 | ||
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index c5f8dce97..19242ba54 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
@@ -511,7 +511,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ | |||
511 | libsdl2-net \ | 511 | libsdl2-net \ |
512 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \ | 512 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \ |
513 | libsdl \ | 513 | libsdl \ |
514 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "lv-drivers lvgl lv-lib-png", "", d)} \ | 514 | lvgl \ |
515 | ttf-arphic-uming \ | 515 | ttf-arphic-uming \ |
516 | ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \ | 516 | ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \ |
517 | ttf-abyssinica \ | 517 | ttf-abyssinica \ |
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb index 247cc4266..86a2331bd 100644 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Proxy libintl" | |||
2 | HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" | 2 | HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" |
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | LICENSE = "LGPL-2.0-only" | 4 | LICENSE = "LGPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://src/proxy-libintl/COPYING.LIB.txt;md5=bc400bc21422f9a92e76ec2c5167ca2e" | 5 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/src/proxy-libintl/COPYING.LIB.txt;md5=bc400bc21422f9a92e76ec2c5167ca2e" |
6 | 6 | ||
7 | PROVIDES = "virtual/libintl" | 7 | PROVIDES = "virtual/libintl" |
8 | 8 | ||
@@ -12,7 +12,6 @@ SRC_URI = " \ | |||
12 | SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" | 12 | SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" |
13 | SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" | 13 | SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" |
14 | 14 | ||
15 | S = "${WORKDIR}" | ||
16 | PACKAGES = "${PN} ${PN}-dev" | 15 | PACKAGES = "${PN} ${PN}-dev" |
17 | FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" | 16 | FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" |
18 | INSANE_SKIP:${PN}-dev = "staticdev" | 17 | INSANE_SKIP:${PN}-dev = "staticdev" |
@@ -21,13 +20,13 @@ CFLAGS:append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][d.getVar(' | |||
21 | TARGET_CC_ARCH += "${LDFLAGS}" | 20 | TARGET_CC_ARCH += "${LDFLAGS}" |
22 | 21 | ||
23 | do_compile() { | 22 | do_compile() { |
24 | cd ${WORKDIR}/src/proxy-libintl | 23 | cd ${UNPACKDIR}/src/proxy-libintl |
25 | oe_runmake ../../lib/libintl.a | 24 | oe_runmake ../../lib/libintl.a |
26 | } | 25 | } |
27 | 26 | ||
28 | do_install() { | 27 | do_install() { |
29 | install -d ${D}/${includedir} | 28 | install -d ${D}/${includedir} |
30 | install -d ${D}/${libdir} | 29 | install -d ${D}/${libdir} |
31 | install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir} | 30 | install -m 0644 ${UNPACKDIR}/include/libintl.h ${D}/${includedir} |
32 | install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir} | 31 | install -m 0644 ${UNPACKDIR}/lib/libintl.a ${D}/${libdir} |
33 | } | 32 | } |
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch index 66be79077..c23d9b755 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch | |||
@@ -46,11 +46,9 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
46 | src/vconsole/vconsole-setup.c | 2 +- | 46 | src/vconsole/vconsole-setup.c | 2 +- |
47 | 22 files changed, 50 insertions(+), 51 deletions(-) | 47 | 22 files changed, 50 insertions(+), 51 deletions(-) |
48 | 48 | ||
49 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | ||
50 | index d2be79622f..e65fecb68d 100644 | ||
51 | --- a/src/basic/cgroup-util.c | 49 | --- a/src/basic/cgroup-util.c |
52 | +++ b/src/basic/cgroup-util.c | 50 | +++ b/src/basic/cgroup-util.c |
53 | @@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *path) { | 51 | @@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *p |
54 | if (r < 0) | 52 | if (r < 0) |
55 | return r; | 53 | return r; |
56 | 54 | ||
@@ -59,7 +57,7 @@ index d2be79622f..e65fecb68d 100644 | |||
59 | if (r < 0) | 57 | if (r < 0) |
60 | return r; | 58 | return r; |
61 | 59 | ||
62 | @@ -843,7 +843,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { | 60 | @@ -843,7 +843,7 @@ int cg_install_release_agent(const char |
63 | 61 | ||
64 | sc = strstrip(contents); | 62 | sc = strstrip(contents); |
65 | if (isempty(sc)) { | 63 | if (isempty(sc)) { |
@@ -68,7 +66,7 @@ index d2be79622f..e65fecb68d 100644 | |||
68 | if (r < 0) | 66 | if (r < 0) |
69 | return r; | 67 | return r; |
70 | } else if (!path_equal(sc, agent)) | 68 | } else if (!path_equal(sc, agent)) |
71 | @@ -861,7 +861,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { | 69 | @@ -861,7 +861,7 @@ int cg_install_release_agent(const char |
72 | 70 | ||
73 | sc = strstrip(contents); | 71 | sc = strstrip(contents); |
74 | if (streq(sc, "0")) { | 72 | if (streq(sc, "0")) { |
@@ -77,7 +75,7 @@ index d2be79622f..e65fecb68d 100644 | |||
77 | if (r < 0) | 75 | if (r < 0) |
78 | return r; | 76 | return r; |
79 | 77 | ||
80 | @@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const char *controller) { | 78 | @@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const cha |
81 | if (r < 0) | 79 | if (r < 0) |
82 | return r; | 80 | return r; |
83 | 81 | ||
@@ -86,7 +84,7 @@ index d2be79622f..e65fecb68d 100644 | |||
86 | if (r < 0) | 84 | if (r < 0) |
87 | return r; | 85 | return r; |
88 | 86 | ||
89 | @@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const char *controller) { | 87 | @@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const cha |
90 | if (r < 0) | 88 | if (r < 0) |
91 | return r; | 89 | return r; |
92 | 90 | ||
@@ -95,7 +93,7 @@ index d2be79622f..e65fecb68d 100644 | |||
95 | if (r < 0) | 93 | if (r < 0) |
96 | return r; | 94 | return r; |
97 | 95 | ||
98 | @@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri | 96 | @@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *control |
99 | if (r < 0) | 97 | if (r < 0) |
100 | return r; | 98 | return r; |
101 | 99 | ||
@@ -104,11 +102,9 @@ index d2be79622f..e65fecb68d 100644 | |||
104 | } | 102 | } |
105 | 103 | ||
106 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { | 104 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { |
107 | diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c | ||
108 | index 2101f617ad..63817bae17 100644 | ||
109 | --- a/src/basic/namespace-util.c | 105 | --- a/src/basic/namespace-util.c |
110 | +++ b/src/basic/namespace-util.c | 106 | +++ b/src/basic/namespace-util.c |
111 | @@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) { | 107 | @@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, |
112 | freeze(); | 108 | freeze(); |
113 | 109 | ||
114 | xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); | 110 | xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); |
@@ -123,11 +119,9 @@ index 2101f617ad..63817bae17 100644 | |||
123 | if (r < 0) | 119 | if (r < 0) |
124 | return log_error_errno(r, "Failed to write GID map: %m"); | 120 | return log_error_errno(r, "Failed to write GID map: %m"); |
125 | 121 | ||
126 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | ||
127 | index 6cb0ddf575..247cf9e1d1 100644 | ||
128 | --- a/src/basic/procfs-util.c | 122 | --- a/src/basic/procfs-util.c |
129 | +++ b/src/basic/procfs-util.c | 123 | +++ b/src/basic/procfs-util.c |
130 | @@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) { | 124 | @@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi |
131 | * decrease it, as threads-max is the much more relevant sysctl. */ | 125 | * decrease it, as threads-max is the much more relevant sysctl. */ |
132 | if (limit > pid_max-1) { | 126 | if (limit > pid_max-1) { |
133 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ | 127 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ |
@@ -143,11 +137,9 @@ index 6cb0ddf575..247cf9e1d1 100644 | |||
143 | if (r < 0) { | 137 | if (r < 0) { |
144 | uint64_t threads_max; | 138 | uint64_t threads_max; |
145 | 139 | ||
146 | diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c | ||
147 | index b66a6622ae..8d1c93008a 100644 | ||
148 | --- a/src/basic/sysctl-util.c | 140 | --- a/src/basic/sysctl-util.c |
149 | +++ b/src/basic/sysctl-util.c | 141 | +++ b/src/basic/sysctl-util.c |
150 | @@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) { | 142 | @@ -58,7 +58,7 @@ int sysctl_write(const char *property, c |
151 | 143 | ||
152 | log_debug("Setting '%s' to '%s'", p, value); | 144 | log_debug("Setting '%s' to '%s'", p, value); |
153 | 145 | ||
@@ -156,8 +148,6 @@ index b66a6622ae..8d1c93008a 100644 | |||
156 | } | 148 | } |
157 | 149 | ||
158 | int sysctl_writef(const char *property, const char *format, ...) { | 150 | int sysctl_writef(const char *property, const char *format, ...) { |
159 | diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c | ||
160 | index d21f3f79ff..258607cc7e 100644 | ||
161 | --- a/src/binfmt/binfmt.c | 151 | --- a/src/binfmt/binfmt.c |
162 | +++ b/src/binfmt/binfmt.c | 152 | +++ b/src/binfmt/binfmt.c |
163 | @@ -30,7 +30,7 @@ static bool arg_unregister = false; | 153 | @@ -30,7 +30,7 @@ static bool arg_unregister = false; |
@@ -169,7 +159,7 @@ index d21f3f79ff..258607cc7e 100644 | |||
169 | } | 159 | } |
170 | 160 | ||
171 | static int apply_rule(const char *filename, unsigned line, const char *rule) { | 161 | static int apply_rule(const char *filename, unsigned line, const char *rule) { |
172 | @@ -58,7 +58,7 @@ static int apply_rule(const char *filename, unsigned line, const char *rule) { | 162 | @@ -58,7 +58,7 @@ static int apply_rule(const char *filena |
173 | if (r >= 0) | 163 | if (r >= 0) |
174 | log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); | 164 | log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); |
175 | 165 | ||
@@ -187,11 +177,9 @@ index d21f3f79ff..258607cc7e 100644 | |||
187 | if (r < 0) | 177 | if (r < 0) |
188 | log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); | 178 | log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); |
189 | else | 179 | else |
190 | diff --git a/src/core/cgroup.c b/src/core/cgroup.c | ||
191 | index 61ac4df1a6..ea18970196 100644 | ||
192 | --- a/src/core/cgroup.c | 180 | --- a/src/core/cgroup.c |
193 | +++ b/src/core/cgroup.c | 181 | +++ b/src/core/cgroup.c |
194 | @@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { | 182 | @@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, |
195 | u->freezer_state = FREEZER_THAWING; | 183 | u->freezer_state = FREEZER_THAWING; |
196 | } | 184 | } |
197 | 185 | ||
@@ -200,11 +188,9 @@ index 61ac4df1a6..ea18970196 100644 | |||
200 | if (r < 0) | 188 | if (r < 0) |
201 | return r; | 189 | return r; |
202 | 190 | ||
203 | diff --git a/src/core/main.c b/src/core/main.c | ||
204 | index 3f71cc0947..0e5aec3e9e 100644 | ||
205 | --- a/src/core/main.c | 191 | --- a/src/core/main.c |
206 | +++ b/src/core/main.c | 192 | +++ b/src/core/main.c |
207 | @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { | 193 | @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool |
208 | if (getpid_cached() != 1) | 194 | if (getpid_cached() != 1) |
209 | return; | 195 | return; |
210 | 196 | ||
@@ -213,11 +199,9 @@ index 3f71cc0947..0e5aec3e9e 100644 | |||
213 | if (r < 0) | 199 | if (r < 0) |
214 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", | 200 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", |
215 | arg_early_core_pattern); | 201 | arg_early_core_pattern); |
216 | diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c | ||
217 | index 7ea902b6f9..1aef2988d0 100644 | ||
218 | --- a/src/core/smack-setup.c | 202 | --- a/src/core/smack-setup.c |
219 | +++ b/src/core/smack-setup.c | 203 | +++ b/src/core/smack-setup.c |
220 | @@ -321,17 +321,17 @@ int mac_smack_setup(bool *loaded_policy) { | 204 | @@ -321,17 +321,17 @@ int mac_smack_setup(bool *loaded_policy) |
221 | } | 205 | } |
222 | 206 | ||
223 | #if HAVE_SMACK_RUN_LABEL | 207 | #if HAVE_SMACK_RUN_LABEL |
@@ -239,8 +223,6 @@ index 7ea902b6f9..1aef2988d0 100644 | |||
239 | if (r < 0) | 223 | if (r < 0) |
240 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); | 224 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); |
241 | #endif | 225 | #endif |
242 | diff --git a/src/home/homework.c b/src/home/homework.c | ||
243 | index 066483e342..5f92dd7064 100644 | ||
244 | --- a/src/home/homework.c | 226 | --- a/src/home/homework.c |
245 | +++ b/src/home/homework.c | 227 | +++ b/src/home/homework.c |
246 | @@ -278,7 +278,7 @@ static void drop_caches_now(void) { | 228 | @@ -278,7 +278,7 @@ static void drop_caches_now(void) { |
@@ -252,11 +234,9 @@ index 066483e342..5f92dd7064 100644 | |||
252 | if (r < 0) | 234 | if (r < 0) |
253 | log_warning_errno(r, "Failed to drop caches, ignoring: %m"); | 235 | log_warning_errno(r, "Failed to drop caches, ignoring: %m"); |
254 | else | 236 | else |
255 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c | ||
256 | index 2fbc619a34..09d9591e37 100644 | ||
257 | --- a/src/libsystemd/sd-device/sd-device.c | 237 | --- a/src/libsystemd/sd-device/sd-device.c |
258 | +++ b/src/libsystemd/sd-device/sd-device.c | 238 | +++ b/src/libsystemd/sd-device/sd-device.c |
259 | @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, | 239 | @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value |
260 | if (!value) | 240 | if (!value) |
261 | return -ENOMEM; | 241 | return -ENOMEM; |
262 | 242 | ||
@@ -265,11 +245,9 @@ index 2fbc619a34..09d9591e37 100644 | |||
265 | if (r < 0) { | 245 | if (r < 0) { |
266 | /* On failure, clear cache entry, as we do not know how it fails. */ | 246 | /* On failure, clear cache entry, as we do not know how it fails. */ |
267 | device_remove_cached_sysattr_value(device, sysattr); | 247 | device_remove_cached_sysattr_value(device, sysattr); |
268 | diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c | ||
269 | index a5002437c6..b12e6cd9c9 100644 | ||
270 | --- a/src/nspawn/nspawn-cgroup.c | 248 | --- a/src/nspawn/nspawn-cgroup.c |
271 | +++ b/src/nspawn/nspawn-cgroup.c | 249 | +++ b/src/nspawn/nspawn-cgroup.c |
272 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { | 250 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified |
273 | fn = strjoina(tree, cgroup, "/cgroup.procs"); | 251 | fn = strjoina(tree, cgroup, "/cgroup.procs"); |
274 | 252 | ||
275 | sprintf(pid_string, PID_FMT, pid); | 253 | sprintf(pid_string, PID_FMT, pid); |
@@ -278,11 +256,9 @@ index a5002437c6..b12e6cd9c9 100644 | |||
278 | if (r < 0) { | 256 | if (r < 0) { |
279 | log_error_errno(r, "Failed to move process: %m"); | 257 | log_error_errno(r, "Failed to move process: %m"); |
280 | goto finish; | 258 | goto finish; |
281 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | ||
282 | index 6ab604d3dc..bbec6b686c 100644 | ||
283 | --- a/src/nspawn/nspawn.c | 259 | --- a/src/nspawn/nspawn.c |
284 | +++ b/src/nspawn/nspawn.c | 260 | +++ b/src/nspawn/nspawn.c |
285 | @@ -2688,7 +2688,7 @@ static int reset_audit_loginuid(void) { | 261 | @@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) { |
286 | if (streq(p, "4294967295")) | 262 | if (streq(p, "4294967295")) |
287 | return 0; | 263 | return 0; |
288 | 264 | ||
@@ -291,7 +267,7 @@ index 6ab604d3dc..bbec6b686c 100644 | |||
291 | if (r < 0) { | 267 | if (r < 0) { |
292 | log_error_errno(r, | 268 | log_error_errno(r, |
293 | "Failed to reset audit login UID. This probably means that your kernel is too\n" | 269 | "Failed to reset audit login UID. This probably means that your kernel is too\n" |
294 | @@ -4141,7 +4141,7 @@ static int setup_uid_map( | 270 | @@ -4143,7 +4143,7 @@ static int setup_uid_map( |
295 | return log_oom(); | 271 | return log_oom(); |
296 | 272 | ||
297 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); | 273 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
@@ -300,7 +276,7 @@ index 6ab604d3dc..bbec6b686c 100644 | |||
300 | if (r < 0) | 276 | if (r < 0) |
301 | return log_error_errno(r, "Failed to write UID map: %m"); | 277 | return log_error_errno(r, "Failed to write UID map: %m"); |
302 | 278 | ||
303 | @@ -4151,7 +4151,7 @@ static int setup_uid_map( | 279 | @@ -4153,7 +4153,7 @@ static int setup_uid_map( |
304 | return log_oom(); | 280 | return log_oom(); |
305 | 281 | ||
306 | xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); | 282 | xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); |
@@ -309,8 +285,6 @@ index 6ab604d3dc..bbec6b686c 100644 | |||
309 | if (r < 0) | 285 | if (r < 0) |
310 | return log_error_errno(r, "Failed to write GID map: %m"); | 286 | return log_error_errno(r, "Failed to write GID map: %m"); |
311 | 287 | ||
312 | diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c | ||
313 | index a26175474b..1413a9c72c 100644 | ||
314 | --- a/src/shared/binfmt-util.c | 288 | --- a/src/shared/binfmt-util.c |
315 | +++ b/src/shared/binfmt-util.c | 289 | +++ b/src/shared/binfmt-util.c |
316 | @@ -46,7 +46,7 @@ int disable_binfmt(void) { | 290 | @@ -46,7 +46,7 @@ int disable_binfmt(void) { |
@@ -322,11 +296,9 @@ index a26175474b..1413a9c72c 100644 | |||
322 | if (r < 0) | 296 | if (r < 0) |
323 | return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); | 297 | return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); |
324 | 298 | ||
325 | diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c | ||
326 | index 934a16eaf3..c921ced861 100644 | ||
327 | --- a/src/shared/cgroup-setup.c | 299 | --- a/src/shared/cgroup-setup.c |
328 | +++ b/src/shared/cgroup-setup.c | 300 | +++ b/src/shared/cgroup-setup.c |
329 | @@ -351,7 +351,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { | 301 | @@ -351,7 +351,7 @@ int cg_attach(const char *controller, co |
330 | 302 | ||
331 | xsprintf(c, PID_FMT "\n", pid); | 303 | xsprintf(c, PID_FMT "\n", pid); |
332 | 304 | ||
@@ -344,11 +316,9 @@ index 934a16eaf3..c921ced861 100644 | |||
344 | if (r < 0) { | 316 | if (r < 0) { |
345 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", | 317 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
346 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); | 318 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
347 | diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c | ||
348 | index 805503f366..01a7ccb291 100644 | ||
349 | --- a/src/shared/coredump-util.c | 319 | --- a/src/shared/coredump-util.c |
350 | +++ b/src/shared/coredump-util.c | 320 | +++ b/src/shared/coredump-util.c |
351 | @@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value) { | 321 | @@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value) |
352 | xsprintf(t, "0x%"PRIx64, value); | 322 | xsprintf(t, "0x%"PRIx64, value); |
353 | 323 | ||
354 | return write_string_file("/proc/self/coredump_filter", t, | 324 | return write_string_file("/proc/self/coredump_filter", t, |
@@ -366,11 +336,9 @@ index 805503f366..01a7ccb291 100644 | |||
366 | if (r < 0) | 336 | if (r < 0) |
367 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); | 337 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); |
368 | } | 338 | } |
369 | diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c | ||
370 | index 3eb13d48f6..d09b901be1 100644 | ||
371 | --- a/src/shared/hibernate-util.c | 339 | --- a/src/shared/hibernate-util.c |
372 | +++ b/src/shared/hibernate-util.c | 340 | +++ b/src/shared/hibernate-util.c |
373 | @@ -481,7 +481,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { | 341 | @@ -501,7 +501,7 @@ int write_resume_config(dev_t devno, uin |
374 | 342 | ||
375 | /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so | 343 | /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so |
376 | * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ | 344 | * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ |
@@ -379,7 +347,7 @@ index 3eb13d48f6..d09b901be1 100644 | |||
379 | if (r == -ENOENT) { | 347 | if (r == -ENOENT) { |
380 | if (offset != 0) | 348 | if (offset != 0) |
381 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), | 349 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), |
382 | @@ -497,7 +497,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { | 350 | @@ -517,7 +517,7 @@ int write_resume_config(dev_t devno, uin |
383 | log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", | 351 | log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", |
384 | offset_str, device); | 352 | offset_str, device); |
385 | 353 | ||
@@ -388,11 +356,9 @@ index 3eb13d48f6..d09b901be1 100644 | |||
388 | if (r < 0) | 356 | if (r < 0) |
389 | return log_error_errno(r, | 357 | return log_error_errno(r, |
390 | "Failed to write device '%s' (%s) to /sys/power/resume: %m", | 358 | "Failed to write device '%s' (%s) to /sys/power/resume: %m", |
391 | diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c | ||
392 | index 1f88e724d0..feb18b320a 100644 | ||
393 | --- a/src/shared/smack-util.c | 359 | --- a/src/shared/smack-util.c |
394 | +++ b/src/shared/smack-util.c | 360 | +++ b/src/shared/smack-util.c |
395 | @@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { | 361 | @@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const |
396 | return 0; | 362 | return 0; |
397 | 363 | ||
398 | p = procfs_file_alloca(pid, "attr/current"); | 364 | p = procfs_file_alloca(pid, "attr/current"); |
@@ -401,24 +367,20 @@ index 1f88e724d0..feb18b320a 100644 | |||
401 | if (r < 0) | 367 | if (r < 0) |
402 | return r; | 368 | return r; |
403 | 369 | ||
404 | diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c | ||
405 | index 4c1a968718..6faf6806a5 100644 | ||
406 | --- a/src/shared/watchdog.c | 370 | --- a/src/shared/watchdog.c |
407 | +++ b/src/shared/watchdog.c | 371 | +++ b/src/shared/watchdog.c |
408 | @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { | 372 | @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const |
409 | 373 | ||
410 | r = write_string_file(sys_fn, | 374 | r = write_string_file(sys_fn, |
411 | governor, | 375 | governor, |
412 | - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 376 | - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
413 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 377 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
414 | if (r < 0) | 378 | if (r < 0) |
415 | return log_error_errno(r, "Failed to set pretimeout_governor to '%s': %m", governor); | 379 | return log_error_errno(r, "Failed to set watchdog pretimeout_governor to '%s': %m", governor); |
416 | 380 | ||
417 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c | ||
418 | index 21af3e9e52..6d4b84b5d5 100644 | ||
419 | --- a/src/sleep/sleep.c | 381 | --- a/src/sleep/sleep.c |
420 | +++ b/src/sleep/sleep.c | 382 | +++ b/src/sleep/sleep.c |
421 | @@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { | 383 | @@ -137,7 +137,7 @@ static int write_state(int fd, char * co |
422 | if (k < 0) | 384 | if (k < 0) |
423 | return RET_GATHER(r, k); | 385 | return RET_GATHER(r, k); |
424 | 386 | ||
@@ -427,7 +389,7 @@ index 21af3e9e52..6d4b84b5d5 100644 | |||
427 | if (k >= 0) { | 389 | if (k >= 0) { |
428 | log_debug("Using sleep state '%s'.", *state); | 390 | log_debug("Using sleep state '%s'.", *state); |
429 | return 0; | 391 | return 0; |
430 | @@ -155,7 +155,7 @@ static int write_mode(char * const *modes) { | 392 | @@ -155,7 +155,7 @@ static int write_mode(char * const *mode |
431 | STRV_FOREACH(mode, modes) { | 393 | STRV_FOREACH(mode, modes) { |
432 | int k; | 394 | int k; |
433 | 395 | ||
@@ -436,11 +398,9 @@ index 21af3e9e52..6d4b84b5d5 100644 | |||
436 | if (k >= 0) { | 398 | if (k >= 0) { |
437 | log_debug("Using sleep disk mode '%s'.", *mode); | 399 | log_debug("Using sleep disk mode '%s'.", *mode); |
438 | return 0; | 400 | return 0; |
439 | diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c | ||
440 | index ae63baaf79..82eeca479a 100644 | ||
441 | --- a/src/storagetm/storagetm.c | 401 | --- a/src/storagetm/storagetm.c |
442 | +++ b/src/storagetm/storagetm.c | 402 | +++ b/src/storagetm/storagetm.c |
443 | @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { | 403 | @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSub |
444 | if (!enable_fn) | 404 | if (!enable_fn) |
445 | return log_oom(); | 405 | return log_oom(); |
446 | 406 | ||
@@ -449,7 +409,7 @@ index ae63baaf79..82eeca479a 100644 | |||
449 | if (r < 0) | 409 | if (r < 0) |
450 | log_warning_errno(r, "Failed to disable namespace '%s' of NVME subsystem '%s', ignoring: %m", e->d_name, s->name); | 410 | log_warning_errno(r, "Failed to disable namespace '%s' of NVME subsystem '%s', ignoring: %m", e->d_name, s->name); |
451 | 411 | ||
452 | @@ -254,7 +254,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | 412 | @@ -254,7 +254,7 @@ static int nvme_subsystem_write_metadata |
453 | _cleanup_free_ char *truncated = strndup(w, 40); /* kernel refuses more than 40 chars (as per nvme spec) */ | 413 | _cleanup_free_ char *truncated = strndup(w, 40); /* kernel refuses more than 40 chars (as per nvme spec) */ |
454 | 414 | ||
455 | /* The default string stored in 'attr_model' is "Linux" btw. */ | 415 | /* The default string stored in 'attr_model' is "Linux" btw. */ |
@@ -458,7 +418,7 @@ index ae63baaf79..82eeca479a 100644 | |||
458 | if (r < 0) | 418 | if (r < 0) |
459 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", w); | 419 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", w); |
460 | } | 420 | } |
461 | @@ -268,7 +268,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | 421 | @@ -268,7 +268,7 @@ static int nvme_subsystem_write_metadata |
462 | return log_oom(); | 422 | return log_oom(); |
463 | 423 | ||
464 | /* The default string stored in 'attr_firmware' is `uname -r` btw, but truncated to 8 chars. */ | 424 | /* The default string stored in 'attr_firmware' is `uname -r` btw, but truncated to 8 chars. */ |
@@ -467,7 +427,7 @@ index ae63baaf79..82eeca479a 100644 | |||
467 | if (r < 0) | 427 | if (r < 0) |
468 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", truncated); | 428 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", truncated); |
469 | } | 429 | } |
470 | @@ -295,7 +295,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | 430 | @@ -295,7 +295,7 @@ static int nvme_subsystem_write_metadata |
471 | if (!truncated) | 431 | if (!truncated) |
472 | return log_oom(); | 432 | return log_oom(); |
473 | 433 | ||
@@ -476,7 +436,7 @@ index ae63baaf79..82eeca479a 100644 | |||
476 | if (r < 0) | 436 | if (r < 0) |
477 | log_warning_errno(r, "Failed to set serial of subsystem to '%s', ignoring: %m", truncated); | 437 | log_warning_errno(r, "Failed to set serial of subsystem to '%s', ignoring: %m", truncated); |
478 | } | 438 | } |
479 | @@ -345,7 +345,7 @@ static int nvme_namespace_write_metadata(int namespace_fd, sd_device *device, co | 439 | @@ -345,7 +345,7 @@ static int nvme_namespace_write_metadata |
480 | id = id128_digest(j, l); | 440 | id = id128_digest(j, l); |
481 | } | 441 | } |
482 | 442 | ||
@@ -485,7 +445,7 @@ index ae63baaf79..82eeca479a 100644 | |||
485 | if (r < 0) | 445 | if (r < 0) |
486 | log_warning_errno(r, "Failed to set uuid of namespace to '%s', ignoring: %m", SD_ID128_TO_UUID_STRING(id)); | 446 | log_warning_errno(r, "Failed to set uuid of namespace to '%s', ignoring: %m", SD_ID128_TO_UUID_STRING(id)); |
487 | 447 | ||
488 | @@ -408,7 +408,7 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi | 448 | @@ -408,7 +408,7 @@ static int nvme_subsystem_add(const char |
489 | if (subsystem_fd < 0) | 449 | if (subsystem_fd < 0) |
490 | return log_error_errno(subsystem_fd, "Failed to create NVME subsystem '%s': %m", j); | 450 | return log_error_errno(subsystem_fd, "Failed to create NVME subsystem '%s': %m", j); |
491 | 451 | ||
@@ -494,7 +454,7 @@ index ae63baaf79..82eeca479a 100644 | |||
494 | if (r < 0) | 454 | if (r < 0) |
495 | return log_error_errno(r, "Failed to set 'attr_allow_any_host' flag: %m"); | 455 | return log_error_errno(r, "Failed to set 'attr_allow_any_host' flag: %m"); |
496 | 456 | ||
497 | @@ -423,11 +423,11 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi | 457 | @@ -423,11 +423,11 @@ static int nvme_subsystem_add(const char |
498 | 458 | ||
499 | /* We use /proc/$PID/fd/$FD rather than /proc/self/fd/$FD, because this string is visible to others | 459 | /* We use /proc/$PID/fd/$FD rather than /proc/self/fd/$FD, because this string is visible to others |
500 | * via configfs, and by including the PID it's clear to who the stuff belongs. */ | 460 | * via configfs, and by including the PID it's clear to who the stuff belongs. */ |
@@ -532,11 +492,9 @@ index ae63baaf79..82eeca479a 100644 | |||
532 | if (r < 0) | 492 | if (r < 0) |
533 | return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); | 493 | return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); |
534 | 494 | ||
535 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | ||
536 | index febe345b4c..a90b610ba1 100644 | ||
537 | --- a/src/udev/udev-rules.c | 495 | --- a/src/udev/udev-rules.c |
538 | +++ b/src/udev/udev-rules.c | 496 | +++ b/src/udev/udev-rules.c |
539 | @@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event( | 497 | @@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_even |
540 | log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value); | 498 | log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value); |
541 | r = write_string_file(buf, value, | 499 | r = write_string_file(buf, value, |
542 | WRITE_STRING_FILE_VERIFY_ON_FAILURE | | 500 | WRITE_STRING_FILE_VERIFY_ON_FAILURE | |
@@ -544,11 +502,9 @@ index febe345b4c..a90b610ba1 100644 | |||
544 | WRITE_STRING_FILE_AVOID_NEWLINE | | 502 | WRITE_STRING_FILE_AVOID_NEWLINE | |
545 | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 503 | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
546 | if (r < 0) | 504 | if (r < 0) |
547 | diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c | ||
548 | index 4d82c65f0a..3a3d861b83 100644 | ||
549 | --- a/src/vconsole/vconsole-setup.c | 505 | --- a/src/vconsole/vconsole-setup.c |
550 | +++ b/src/vconsole/vconsole-setup.c | 506 | +++ b/src/vconsole/vconsole-setup.c |
551 | @@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { | 507 | @@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *na |
552 | static int toggle_utf8_sysfs(bool utf8) { | 508 | static int toggle_utf8_sysfs(bool utf8) { |
553 | int r; | 509 | int r; |
554 | 510 | ||
@@ -557,6 +513,3 @@ index 4d82c65f0a..3a3d861b83 100644 | |||
557 | if (r < 0) | 513 | if (r < 0) |
558 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); | 514 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); |
559 | 515 | ||
560 | -- | ||
561 | 2.34.1 | ||
562 | |||
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch index 24f3bf74a..56755ac55 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fd52f1764647e03a35e8f0ed0ef952049073ccbd Mon Sep 17 00:00:00 2001 | 1 | From 97d3ed7834bd86615ba4acdbef984c677b7e7791 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: Tue, 2 Jan 2024 11:03:27 +0800 | 3 | Date: Tue, 2 Jan 2024 11:03:27 +0800 |
4 | Subject: [PATCH 22/22] avoid missing LOCK_EX declaration | 4 | Subject: [PATCH] avoid missing LOCK_EX declaration |
5 | 5 | ||
6 | This only happens on MUSL. Include sys/file.h to avoid compilation | 6 | This only happens on MUSL. Include sys/file.h to avoid compilation |
7 | error about missing LOCK_EX declaration. | 7 | error about missing LOCK_EX declaration. |
@@ -14,8 +14,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
14 | src/shared/dev-setup.h | 1 + | 14 | src/shared/dev-setup.h | 1 + |
15 | 2 files changed, 2 insertions(+) | 15 | 2 files changed, 2 insertions(+) |
16 | 16 | ||
17 | diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c | ||
18 | index 70d963e269..7084811439 100644 | ||
19 | --- a/src/core/exec-invoke.c | 17 | --- a/src/core/exec-invoke.c |
20 | +++ b/src/core/exec-invoke.c | 18 | +++ b/src/core/exec-invoke.c |
21 | @@ -4,6 +4,7 @@ | 19 | @@ -4,6 +4,7 @@ |
@@ -26,8 +24,6 @@ index 70d963e269..7084811439 100644 | |||
26 | 24 | ||
27 | #if HAVE_PAM | 25 | #if HAVE_PAM |
28 | #include <security/pam_appl.h> | 26 | #include <security/pam_appl.h> |
29 | diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h | ||
30 | index 5339bc4e5e..0697495f23 100644 | ||
31 | --- a/src/shared/dev-setup.h | 27 | --- a/src/shared/dev-setup.h |
32 | +++ b/src/shared/dev-setup.h | 28 | +++ b/src/shared/dev-setup.h |
33 | @@ -2,6 +2,7 @@ | 29 | @@ -2,6 +2,7 @@ |
@@ -38,6 +34,3 @@ index 5339bc4e5e..0697495f23 100644 | |||
38 | 34 | ||
39 | int lock_dev_console(void); | 35 | int lock_dev_console(void); |
40 | 36 | ||
41 | -- | ||
42 | 2.34.1 | ||
43 | |||
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.4.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb index 3b44e0237..ceb422325 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.4.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb | |||
@@ -10,7 +10,7 @@ inherit meson pkgconfig | |||
10 | 10 | ||
11 | DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native" | 11 | DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native" |
12 | 12 | ||
13 | SRCREV = "387a14a7b67b8b76adaed4175e14bb7e39b2f738" | 13 | SRCREV = "5810c25792d4268282dd3892af1a253b690423c9" |
14 | SRCBRANCH = "v255-stable" | 14 | SRCBRANCH = "v255-stable" |
15 | SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ | 15 | SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ |
16 | file://static-libsystemd-pkgconfig.patch \ | 16 | file://static-libsystemd-pkgconfig.patch \ |
diff --git a/meta-oe/recipes-core/usleep/files/usleep.c b/meta-oe/recipes-core/usleep/files/usleep.c index a5e7d9d71..dfa52ec19 100644 --- a/meta-oe/recipes-core/usleep/files/usleep.c +++ b/meta-oe/recipes-core/usleep/files/usleep.c | |||
@@ -34,7 +34,7 @@ int main(int argc, char **argv) { | |||
34 | int showVersion = 0; | 34 | int showVersion = 0; |
35 | int showOot = 0; | 35 | int showOot = 0; |
36 | int rc; | 36 | int rc; |
37 | char * countStr = NULL; | 37 | const char * countStr = NULL; |
38 | struct poptOption options[] = { | 38 | struct poptOption options[] = { |
39 | { "version", 'v', POPT_ARG_NONE, &showVersion, 0, | 39 | { "version", 'v', POPT_ARG_NONE, &showVersion, 0, |
40 | "Display the version of this program, and exit" }, | 40 | "Display the version of this program, and exit" }, |
@@ -44,7 +44,7 @@ int main(int argc, char **argv) { | |||
44 | { 0, 0, 0, 0, 0 } | 44 | { 0, 0, 0, 0, 0 } |
45 | }; | 45 | }; |
46 | 46 | ||
47 | optCon = poptGetContext("usleep", argc, argv, options,0); | 47 | optCon = poptGetContext("usleep", argc, (const char **)argv, options,0); |
48 | /*poptReadDefaultConfig(optCon, 1);*/ | 48 | /*poptReadDefaultConfig(optCon, 1);*/ |
49 | poptSetOtherOptionHelp(optCon, "[microseconds]"); | 49 | poptSetOtherOptionHelp(optCon, "[microseconds]"); |
50 | 50 | ||
diff --git a/meta-oe/recipes-core/usleep/usleep_1.2.bb b/meta-oe/recipes-core/usleep/usleep_1.2.bb index a529032aa..882ac2c2f 100644 --- a/meta-oe/recipes-core/usleep/usleep_1.2.bb +++ b/meta-oe/recipes-core/usleep/usleep_1.2.bb | |||
@@ -3,7 +3,8 @@ SECTION = "base" | |||
3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
5 | 5 | ||
6 | S = "${WORKDIR}" | 6 | S = "${WORKDIR}/sources" |
7 | UNPACKDIR = "${S}" | ||
7 | DEPENDS = "popt" | 8 | DEPENDS = "popt" |
8 | 9 | ||
9 | SRC_URI = "file://usleep.c \ | 10 | SRC_URI = "file://usleep.c \ |
@@ -19,8 +20,8 @@ do_install() { | |||
19 | install -d ${D}${base_bindir} | 20 | install -d ${D}${base_bindir} |
20 | install -d ${D}${mandir}/man1 | 21 | install -d ${D}${mandir}/man1 |
21 | 22 | ||
22 | install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} | 23 | install -m 0755 ${UNPACKDIR}/usleep ${D}${base_bindir} |
23 | install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 | 24 | install -m 0644 ${UNPACKDIR}/usleep.1 ${D}${mandir}/man1 |
24 | } | 25 | } |
25 | 26 | ||
26 | inherit update-alternatives | 27 | inherit update-alternatives |