Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: adapt patches for v255.4 

While at it, add the "Upstream-Status" tag to the patches to avoid QA errors

https://onedigi.atlassian.net/browse/DEL-9011

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2024-05-16 13:04:47 +02:00
parent 7125fbd222
commit 463aa7965c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta-digi-dey/recipes-core/systemd/systemd/0001-sysv-generator-reduce-message-level-for-packages-tha.patch
View File

@ -3,25 +3,23 @@ Date: Mon, 31 May 2021 14:40:24 +0200
Subject: [PATCH] sysv-generator: reduce message level for packages that still Subject: [PATCH] sysv-generator: reduce message level for packages that still
ship only a SysV init script ship only a SysV init script
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com> Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
--- ---
src/sysv-generator/sysv-generator.c | 2 +- src/sysv-generator/sysv-generator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index a2c72d1009..aafa6c9f2b 100644 index 4485e2e368..d0e8ed84bc 100644
--- a/src/sysv-generator/sysv-generator.c --- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c
@@ -786,11 +786,11 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { @@ -762,7 +762,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
fpath = path_join(*path, de->d_name);
if (!fpath) if (!fpath)
return log_oom(); return log_oom();
- log_warning("SysV service '%s' lacks a native systemd unit file. " - log_struct(LOG_WARNING,
+ log_debug("SysV service '%s' lacks a native systemd unit file. " + log_struct(LOG_DEBUG,
"Automatically generating a unit file for compatibility. " LOG_MESSAGE("SysV service '%s' lacks a native systemd unit file. "
"Please update package to include a native systemd unit file, in order to make it more safe and robust.", fpath); "%s Automatically generating a unit file for compatibility. Please update package to include a native systemd unit file, in order to make it safe, robust and future-proof. "
"%s This compatibility logic is deprecated, expect removal soon. %s",
service = new(SysvStub, 1);
if (!service)

6
meta-digi-dey/recipes-core/systemd/systemd/0002-sd-resolve-forcefully-cancel-worker-threads-during-r.patch
View File

@ -7,16 +7,18 @@ For services that use sd-resolve, such as timesyncd, this prevents the system
from stalling whenever the service stops while a worker thread is busy calling from stalling whenever the service stops while a worker thread is busy calling
getaddrinfo(). getaddrinfo().
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com> Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
--- ---
src/libsystemd/sd-resolve/sd-resolve.c | 4 +++- src/libsystemd/sd-resolve/sd-resolve.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index a189f14..571604c 100644 index 2000f86e69..027f6940b9 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c --- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -577,8 +577,10 @@ static void resolve_free(sd_resolve *resolve) { @@ -593,8 +593,10 @@ static sd_resolve *resolve_free(sd_resolve *resolve) {
/* Now terminate them and wait until they are gone. /* Now terminate them and wait until they are gone.
If we get an error than most likely the thread already exited. */ If we get an error than most likely the thread already exited. */