b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

systemd: reflow patches, remove whitespace error in Fix-hwdb-paths.patch

Browse source
This commit is contained in:
Florian Klink 2023-04-13 22:35:34 +02:00
parent 5557fcff78
commit dcf20a0c23
10 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
View file

@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
1 file changed, 2 insertions(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 36d336dfc8..d62c5173ca 100644
index a697ea5cb9..65d9e7e398 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5634,6 +5634,7 @@ static int run(int argc, char *argv[]) {
@@ -5635,6 +5635,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
@ -21,7 +21,7 @@ index 36d336dfc8..d62c5173ca 100644
_cleanup_free_ char *p = NULL;
if (arg_pivot_root_new)
@@ -5648,6 +5649,7 @@ static int run(int argc, char *argv[]) {
@@ -5649,6 +5650,7 @@ static int run(int argc, char *argv[]) {
"Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory);
goto finish;
}

2
pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
View file

@ -13,7 +13,7 @@ in containers.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
index 7b394794b0..50d092042c 100644
index 380a4e30d7..817acb87b8 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1437,7 +1437,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {

9
pkgs/os-specific/linux/systemd/0007-Fix-hwdb-paths.patch
View file

@ -5,14 +5,14 @@ Subject: [PATCH] Fix hwdb paths
Patch by vcunat.
---
src/libsystemd/sd-hwdb/hwdb-internal.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
src/libsystemd/sd-hwdb/hwdb-internal.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
index 5302679a62..c681f3a984 100644
index 5302679a62..39e59a527f 100644
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
@@ -83,8 +83,5 @@ struct trie_value_entry2_f {
@@ -83,8 +83,4 @@ struct trie_value_entry2_f {
} _packed_;
#define hwdb_bin_paths \
@ -22,4 +22,3 @@ index 5302679a62..c681f3a984 100644
- _CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \
- UDEVLIBEXECDIR "/hwdb.bin\0"
+ "/etc/udev/hwdb.bin\0"
+

12
pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
View file

@ -35,10 +35,10 @@ index e486474c44..5f373d0723 100644
<literal>Etc/UTC</literal>. The resulting link should lead to the
corresponding binary
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index b700f364ef..116b1cec63 100644
index 0bea149324..4b16115d43 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1282,7 +1282,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
@@ -1283,7 +1283,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
assert(ret);
@ -47,7 +47,7 @@ index b700f364ef..116b1cec63 100644
if (!f)
return -errno;
@@ -1321,7 +1321,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
@@ -1322,7 +1322,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
_cleanup_strv_free_ char **zones = NULL;
int r;
@ -56,7 +56,7 @@ index b700f364ef..116b1cec63 100644
if (!f)
return -errno;
@@ -1433,7 +1433,7 @@ int verify_timezone(const char *name, int log_level) {
@@ -1434,7 +1434,7 @@ int verify_timezone(const char *name, int log_level) {
if (p - name >= PATH_MAX)
return -ENAMETOOLONG;
@ -65,7 +65,7 @@ index b700f364ef..116b1cec63 100644
fd = open(t, O_RDONLY|O_CLOEXEC);
if (fd < 0)
@@ -1491,7 +1491,7 @@ int get_timezone(char **ret) {
@@ -1492,7 +1492,7 @@ int get_timezone(char **ret) {
if (r < 0)
return r; /* returns EINVAL if not a symlink */
@ -88,7 +88,7 @@ index 9e79f84691..1a1c75718c 100644
(void) mkdir_parents(etc_localtime, 0755);
r = symlink_atomic(e, etc_localtime);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index d62c5173ca..84beac064b 100644
index 65d9e7e398..dd44d529ca 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1915,8 +1915,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid

4
pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
View file

@ -8,10 +8,10 @@ Subject: [PATCH] build: don't create statedir and don't touch prefixdir
1 file changed, 3 deletions(-)
diff --git a/meson.build b/meson.build
index bfc86857d6..84e3e4c1db 100644
index b1f5477836..1a39484855 100644
--- a/meson.build
+++ b/meson.build
@@ -4277,9 +4277,6 @@ install_data('LICENSE.GPL2',
@@ -4278,9 +4278,6 @@ install_data('LICENSE.GPL2',
install_subdir('LICENSES',
install_dir : docdir)

2
pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch
View file

@ -12,7 +12,7 @@ files that I might have missed.
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/basic/constants.h b/src/basic/constants.h
index 5d68cc6332..a2ccc315e1 100644
index 5d68cc6332..33c06c1f65 100644
--- a/src/basic/constants.h
+++ b/src/basic/constants.h
@@ -73,13 +73,15 @@

4
pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
View file

@ -9,10 +9,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+)
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 9c51a3367f..75d6b76a87 100644
index 288fa4ae84..07deb19d7c 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -184,6 +184,7 @@ static int execute(
@@ -186,6 +186,7 @@ static int execute(
};
static const char* const dirs[] = {
SYSTEM_SLEEP_PATH,

2
pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch
View file

@ -16,7 +16,7 @@ executables that are being called from managers.
1 file changed, 8 insertions(+)
diff --git a/src/core/manager.c b/src/core/manager.c
index 50d092042c..898f9ed2f1 100644
index 817acb87b8..3f31359f8a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3714,9 +3714,17 @@ static int build_generator_environment(Manager *m, char ***ret) {

4
pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch
View file

@ -17,10 +17,10 @@ See also: https://github.com/systemd/systemd/issues/24191
1 file changed, 4 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
index 898f9ed2f1..5040d5b105 100644
index 3f31359f8a..0c4ec0b4fb 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4543,10 +4543,6 @@ char* manager_taint_string(const Manager *m) {
@@ -4556,10 +4556,6 @@ char* manager_taint_string(const Manager *m) {
if (m->taint_usr)
stage[n++] = "split-usr";

2
pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch
View file

@ -27,7 +27,7 @@ filename_is_valid with path_is_valid.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 259f280e0f..142e70a740 100644
index 4345b95106..424a334df1 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -176,7 +176,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {