From b91a9eb904062b4cb5294ffb35f49dd53a3bc7c5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 13 Jul 2022 18:48:24 +0200 Subject: [PATCH] Rebase patches --- ...Move-homectl-and-userdbctl-to-bindir.patch | 6 +- ...ngrade-a-couple-of-warnings-to-debug.patch | 4 +- ...l.d-binfmt.d-modules-load.d-back-to-.patch | 8 +- ...-RLIMIT_CORE-to-unlimited-by-default.patch | 4 +- .../Use-Debian-specific-config-files.patch | 2 +- ...daemon-for-inter-fsckd-communication.patch | 4 +- ...libsystemd-shared-into-rootpkglibdir.patch | 250 +++++++++--------- debian/patches/series | 2 - .../sha256-fix-compilation-on-efi-ia32.patch | 39 --- ...d-microhttp-util-silence-gcc-warning.patch | 33 --- ...hellcheck-clean-kernel-install-again.patch | 2 +- 11 files changed, 140 insertions(+), 214 deletions(-) delete mode 100644 debian/patches/sha256-fix-compilation-on-efi-ia32.patch delete mode 100644 debian/patches/shared-microhttp-util-silence-gcc-warning.patch diff --git a/debian/patches/Move-homectl-and-userdbctl-to-bindir.patch b/debian/patches/Move-homectl-and-userdbctl-to-bindir.patch index a4192279b..7e74c9f54 100644 --- a/debian/patches/Move-homectl-and-userdbctl-to-bindir.patch +++ b/debian/patches/Move-homectl-and-userdbctl-to-bindir.patch @@ -10,10 +10,10 @@ Those binaries aren't needed during early boot. 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build -index 36cbfa4..3abf9df 100644 +index 9c170ac..d7c7d58 100644 --- a/meson.build +++ b/meson.build -@@ -2564,8 +2564,7 @@ if conf.get('ENABLE_USERDB') == 1 +@@ -2566,8 +2566,7 @@ if conf.get('ENABLE_USERDB') == 1 link_with : [libshared], dependencies : [threads], install_rpath : rootlibexecdir, @@ -23,7 +23,7 @@ index 36cbfa4..3abf9df 100644 endif if conf.get('ENABLE_HOMED') == 1 -@@ -2608,8 +2607,7 @@ if conf.get('ENABLE_HOMED') == 1 +@@ -2610,8 +2609,7 @@ if conf.get('ENABLE_HOMED') == 1 libp11kit, libdl], install_rpath : rootlibexecdir, diff --git a/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch b/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch index 0c8f9f46e..3870c0f13 100644 --- a/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch +++ b/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch @@ -16,7 +16,7 @@ Closes: #981407 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 3ff6eae..09ba381 100644 +index 11991ec..76893db 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -522,6 +522,7 @@ static int patch_var_run( @@ -51,7 +51,7 @@ index 14ae873..aa9e94b 100644 "Please update package to include a native systemd unit file, in order to make it more safe and robust.", fpath); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 94973c2..0d27daa 100644 +index d5db030..919d6d9 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -2760,6 +2760,7 @@ static int specifier_expansion_from_arg(const Specifier *specifier_table, Item * diff --git a/debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch b/debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch index 3cb53bc31..9a3962960 100644 --- a/debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch +++ b/debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch @@ -14,12 +14,12 @@ Closes: #971282 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index fc0f8c3..65996bb 100644 +index 693433b..8368a3f 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in -@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} - tmpfiles_dir=${prefix}/lib/tmpfiles.d - tmpfilesdir=${tmpfiles_dir} +@@ -67,16 +67,16 @@ tmpfilesdir=${tmpfiles_dir} + + user_tmpfiles_dir=${prefix}/share/user-tmpfiles.d -sysusers_dir=${rootprefix}/lib/sysusers.d +sysusers_dir=${prefix}/lib/sysusers.d diff --git a/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch b/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch index 37f3a0a3e..a299f9619 100644 --- a/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch +++ b/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch @@ -19,7 +19,7 @@ Bug-Debian: https://bugs.debian.org/815020 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/core/main.c b/src/core/main.c -index 409b84a..7989bbe 100644 +index 0cf2df6..85283d8 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1619,24 +1619,6 @@ static void cmdline_take_random_seed(void) { @@ -47,7 +47,7 @@ index 409b84a..7989bbe 100644 static void initialize_core_pattern(bool skip_setup) { int r; -@@ -2765,8 +2747,6 @@ int main(int argc, char *argv[]) { +@@ -2763,8 +2745,6 @@ int main(int argc, char *argv[]) { kernel_timestamp = DUAL_TIMESTAMP_NULL; } diff --git a/debian/patches/debian/Use-Debian-specific-config-files.patch b/debian/patches/debian/Use-Debian-specific-config-files.patch index 3b25027ab..52a7c79b1 100644 --- a/debian/patches/debian/Use-Debian-specific-config-files.patch +++ b/debian/patches/debian/Use-Debian-specific-config-files.patch @@ -16,7 +16,7 @@ Read/write /etc/timezone if /etc/localtime does not exist. 4 files changed, 164 insertions(+), 113 deletions(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index c309369..6e3fbd1 100644 +index 0ad8de4..f0f0ef4 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -1477,19 +1477,43 @@ int get_timezone(char **ret) { diff --git a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch index 3d1fc4617..532f5c21a 100644 --- a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch +++ b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch @@ -239,10 +239,10 @@ index 0000000..b7ad58d + + diff --git a/meson.build b/meson.build -index 51928b2..03208c0 100644 +index f63651e..5ca03e2 100644 --- a/meson.build +++ b/meson.build -@@ -3206,6 +3206,15 @@ executable( +@@ -3208,6 +3208,15 @@ executable( install : true, install_dir : rootlibexecdir) diff --git a/debian/patches/meson-install-libsystemd-shared-into-rootpkglibdir.patch b/debian/patches/meson-install-libsystemd-shared-into-rootpkglibdir.patch index 47d6b44a7..30caf528c 100644 --- a/debian/patches/meson-install-libsystemd-shared-into-rootpkglibdir.patch +++ b/debian/patches/meson-install-libsystemd-shared-into-rootpkglibdir.patch @@ -27,7 +27,7 @@ See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990547 5 files changed, 132 insertions(+), 128 deletions(-) diff --git a/meson.build b/meson.build -index 3abf9df..51928b2 100644 +index d7c7d58..f63651e 100644 --- a/meson.build +++ b/meson.build @@ -146,6 +146,7 @@ rootlibdir = get_option('rootlibdir') @@ -38,7 +38,7 @@ index 3abf9df..51928b2 100644 install_sysconfdir = get_option('install-sysconfdir') != 'false' install_sysconfdir_samples = get_option('install-sysconfdir') == 'true' -@@ -1981,7 +1982,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 +@@ -1983,7 +1984,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 tpm2, versiondep], link_depends : cryptsetup_token_sym, @@ -47,7 +47,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : libcryptsetup_plugins_dir) endif -@@ -1999,7 +2000,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 +@@ -2001,7 +2002,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 libfido2, versiondep], link_depends : cryptsetup_token_sym, @@ -56,7 +56,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : libcryptsetup_plugins_dir) endif -@@ -2017,7 +2018,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 +@@ -2019,7 +2020,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1 libp11kit, versiondep], link_depends : cryptsetup_token_sym, @@ -65,7 +65,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : libcryptsetup_plugins_dir) endif -@@ -2152,7 +2153,7 @@ exe = executable( +@@ -2154,7 +2155,7 @@ exe = executable( libshared], dependencies : [versiondep, libseccomp], @@ -74,7 +74,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) dbus_programs += exe -@@ -2170,7 +2171,7 @@ public_programs += executable( +@@ -2172,7 +2173,7 @@ public_programs += executable( libshared], dependencies : [versiondep, libseccomp], @@ -83,7 +83,7 @@ index 3abf9df..51928b2 100644 install : conf.get('ENABLE_ANALYZE')) executable( -@@ -2184,7 +2185,7 @@ executable( +@@ -2186,7 +2187,7 @@ executable( liblz4, libselinux, libzstd], @@ -92,7 +92,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2195,7 +2196,7 @@ public_programs += executable( +@@ -2197,7 +2198,7 @@ public_programs += executable( link_with : [libjournal_core, libshared], dependencies : [threads], @@ -101,7 +101,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += executable( -@@ -2209,7 +2210,7 @@ public_programs += executable( +@@ -2211,7 +2212,7 @@ public_programs += executable( liblz4, libzstd, libdl], @@ -110,7 +110,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -2218,7 +2219,7 @@ executable( +@@ -2220,7 +2221,7 @@ executable( 'src/getty-generator/getty-generator.c', include_directories : includes, link_with : [libshared], @@ -119,7 +119,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2227,7 +2228,7 @@ executable( +@@ -2229,7 +2230,7 @@ executable( 'src/debug-generator/debug-generator.c', include_directories : includes, link_with : [libshared], @@ -128,7 +128,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2236,7 +2237,7 @@ executable( +@@ -2238,7 +2239,7 @@ executable( 'src/run-generator/run-generator.c', include_directories : includes, link_with : [libshared], @@ -137,7 +137,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2245,7 +2246,7 @@ exe = executable( +@@ -2247,7 +2248,7 @@ exe = executable( 'src/fstab-generator/fstab-generator.c', include_directories : includes, link_with : [libshared], @@ -146,7 +146,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2263,7 +2264,7 @@ if conf.get('ENABLE_ENVIRONMENT_D') == 1 +@@ -2265,7 +2266,7 @@ if conf.get('ENABLE_ENVIRONMENT_D') == 1 'src/environment-d-generator/environment-d-generator.c', include_directories : includes, link_with : [libshared], @@ -155,7 +155,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : userenvgeneratordir) -@@ -2278,7 +2279,7 @@ if conf.get('ENABLE_HIBERNATE') == 1 +@@ -2280,7 +2281,7 @@ if conf.get('ENABLE_HIBERNATE') == 1 'src/hibernate-resume/hibernate-resume-generator.c', include_directories : includes, link_with : [libshared], @@ -164,7 +164,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2287,7 +2288,7 @@ if conf.get('ENABLE_HIBERNATE') == 1 +@@ -2289,7 +2290,7 @@ if conf.get('ENABLE_HIBERNATE') == 1 'src/hibernate-resume/hibernate-resume.c', include_directories : includes, link_with : [libshared], @@ -173,7 +173,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -2299,7 +2300,7 @@ if conf.get('HAVE_BLKID') == 1 +@@ -2301,7 +2302,7 @@ if conf.get('HAVE_BLKID') == 1 include_directories : includes, link_with : [libshared], dependencies : libblkid, @@ -182,7 +182,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2308,7 +2309,7 @@ if conf.get('HAVE_BLKID') == 1 +@@ -2310,7 +2311,7 @@ if conf.get('HAVE_BLKID') == 1 'src/dissect/dissect.c', include_directories : includes, link_with : [libshared], @@ -191,7 +191,7 @@ index 3abf9df..51928b2 100644 install : true) endif -@@ -2321,7 +2322,7 @@ if conf.get('ENABLE_RESOLVE') == 1 +@@ -2323,7 +2324,7 @@ if conf.get('ENABLE_RESOLVE') == 1 libbasic_gcrypt, libsystemd_resolve_core], dependencies : systemd_resolved_dependencies, @@ -200,7 +200,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2336,7 +2337,7 @@ if conf.get('ENABLE_RESOLVE') == 1 +@@ -2338,7 +2339,7 @@ if conf.get('ENABLE_RESOLVE') == 1 lib_openssl_or_gcrypt, libm, libidn], @@ -209,7 +209,7 @@ index 3abf9df..51928b2 100644 install : true) meson.add_install_script(meson_make_symlink, -@@ -2357,7 +2358,7 @@ if conf.get('ENABLE_LOGIND') == 1 +@@ -2359,7 +2360,7 @@ if conf.get('ENABLE_LOGIND') == 1 libshared], dependencies : [threads, libacl], @@ -218,7 +218,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2370,7 +2371,7 @@ if conf.get('ENABLE_LOGIND') == 1 +@@ -2372,7 +2373,7 @@ if conf.get('ENABLE_LOGIND') == 1 liblz4, libxz, libzstd], @@ -227,7 +227,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -2379,7 +2380,7 @@ if conf.get('ENABLE_LOGIND') == 1 +@@ -2381,7 +2382,7 @@ if conf.get('ENABLE_LOGIND') == 1 'src/login/inhibit.c', include_directories : includes, link_with : [libshared], @@ -236,7 +236,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -2416,7 +2417,7 @@ if conf.get('ENABLE_LOGIND') == 1 +@@ -2418,7 +2419,7 @@ if conf.get('ENABLE_LOGIND') == 1 user_runtime_dir_sources, include_directories : includes, link_with : [libshared], @@ -245,7 +245,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -2427,7 +2428,7 @@ if conf.get('HAVE_PAM') == 1 +@@ -2429,7 +2430,7 @@ if conf.get('HAVE_PAM') == 1 'src/user-sessions/user-sessions.c', include_directories : includes, link_with : [libshared], @@ -254,7 +254,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -2445,7 +2446,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1 +@@ -2447,7 +2448,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1 include_directories : includes, link_with : [boot_link_with], dependencies : [libblkid], @@ -263,7 +263,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += executable( -@@ -2454,7 +2455,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1 +@@ -2456,7 +2457,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1 include_directories : includes, link_with : [boot_link_with], dependencies : [libblkid], @@ -272,7 +272,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2463,7 +2464,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1 +@@ -2465,7 +2466,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1 'src/boot/bless-boot-generator.c', include_directories : includes, link_with : [boot_link_with], @@ -281,7 +281,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) endif -@@ -2474,7 +2475,7 @@ executable( +@@ -2476,7 +2477,7 @@ executable( include_directories : includes, link_with : [libshared], dependencies : [libblkid], @@ -290,7 +290,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2484,7 +2485,7 @@ public_programs += executable( +@@ -2486,7 +2487,7 @@ public_programs += executable( include_directories : includes, link_with : [libshared], dependencies : [threads], @@ -299,7 +299,7 @@ index 3abf9df..51928b2 100644 install : true) systemctl = executable( -@@ -2498,7 +2499,7 @@ systemctl = executable( +@@ -2500,7 +2501,7 @@ systemctl = executable( libxz, liblz4, libzstd], @@ -308,7 +308,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) public_programs += systemctl -@@ -2510,7 +2511,7 @@ if conf.get('ENABLE_PORTABLED') == 1 +@@ -2512,7 +2513,7 @@ if conf.get('ENABLE_PORTABLED') == 1 include_directories : includes, link_with : [libshared], dependencies : [threads, libselinux], @@ -317,7 +317,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2520,7 +2521,7 @@ if conf.get('ENABLE_PORTABLED') == 1 +@@ -2522,7 +2523,7 @@ if conf.get('ENABLE_PORTABLED') == 1 include_directories : includes, link_with : [libshared], dependencies : [threads], @@ -326,7 +326,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) endif -@@ -2531,7 +2532,7 @@ if conf.get('ENABLE_SYSEXT') == 1 +@@ -2533,7 +2534,7 @@ if conf.get('ENABLE_SYSEXT') == 1 systemd_sysext_sources, include_directories : includes, link_with : [libshared], @@ -335,7 +335,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) endif -@@ -2543,7 +2544,7 @@ if conf.get('ENABLE_USERDB') == 1 +@@ -2545,7 +2546,7 @@ if conf.get('ENABLE_USERDB') == 1 include_directories : includes, link_with : [libshared], dependencies : [threads], @@ -344,7 +344,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2553,7 +2554,7 @@ if conf.get('ENABLE_USERDB') == 1 +@@ -2555,7 +2556,7 @@ if conf.get('ENABLE_USERDB') == 1 include_directories : includes, link_with : [libshared], dependencies : [threads], @@ -353,7 +353,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2563,7 +2564,7 @@ if conf.get('ENABLE_USERDB') == 1 +@@ -2565,7 +2566,7 @@ if conf.get('ENABLE_USERDB') == 1 include_directories : includes, link_with : [libshared], dependencies : [threads], @@ -362,7 +362,7 @@ index 3abf9df..51928b2 100644 install : true) endif -@@ -2579,7 +2580,7 @@ if conf.get('ENABLE_HOMED') == 1 +@@ -2581,7 +2582,7 @@ if conf.get('ENABLE_HOMED') == 1 libopenssl, libfdisk, libp11kit], @@ -371,7 +371,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2592,7 +2593,7 @@ if conf.get('ENABLE_HOMED') == 1 +@@ -2594,7 +2595,7 @@ if conf.get('ENABLE_HOMED') == 1 libcrypt, libopenssl, libm], @@ -380,7 +380,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2606,7 +2607,7 @@ if conf.get('ENABLE_HOMED') == 1 +@@ -2608,7 +2609,7 @@ if conf.get('ENABLE_HOMED') == 1 libopenssl, libp11kit, libdl], @@ -389,7 +389,7 @@ index 3abf9df..51928b2 100644 install : true) if conf.get('HAVE_PAM') == 1 -@@ -2648,7 +2649,7 @@ if conf.get('ENABLE_BACKLIGHT') == 1 +@@ -2650,7 +2651,7 @@ if conf.get('ENABLE_BACKLIGHT') == 1 'src/backlight/backlight.c', include_directories : includes, link_with : [libshared], @@ -398,7 +398,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -2659,7 +2660,7 @@ if conf.get('ENABLE_RFKILL') == 1 +@@ -2661,7 +2662,7 @@ if conf.get('ENABLE_RFKILL') == 1 'src/rfkill/rfkill.c', include_directories : includes, link_with : [libshared], @@ -407,7 +407,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -2669,7 +2670,7 @@ executable( +@@ -2671,7 +2672,7 @@ executable( 'src/system-update-generator/system-update-generator.c', include_directories : includes, link_with : [libshared], @@ -416,7 +416,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2681,7 +2682,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 +@@ -2683,7 +2684,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 link_with : [libshared], dependencies : [libcryptsetup, libp11kit], @@ -425,7 +425,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2690,7 +2691,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 +@@ -2692,7 +2693,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 'src/cryptsetup/cryptsetup-generator.c', include_directories : includes, link_with : [libshared], @@ -434,7 +434,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2700,7 +2701,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 +@@ -2702,7 +2703,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 include_directories : includes, link_with : [libshared], dependencies : [libcryptsetup], @@ -443,7 +443,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2709,7 +2710,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 +@@ -2711,7 +2712,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 'src/veritysetup/veritysetup-generator.c', include_directories : includes, link_with : [libshared], @@ -452,7 +452,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2722,7 +2723,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 +@@ -2724,7 +2725,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 libdl, libopenssl, libp11kit], @@ -461,7 +461,7 @@ index 3abf9df..51928b2 100644 install : true) executable( -@@ -2731,7 +2732,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 +@@ -2733,7 +2734,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 include_directories : includes, link_with : [libshared], dependencies : [libcryptsetup], @@ -470,7 +470,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2740,7 +2741,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 +@@ -2742,7 +2743,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1 ['src/integritysetup/integritysetup-generator.c', 'src/integritysetup/integrity-util.c'], include_directories : includes, link_with : [libshared], @@ -479,7 +479,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) endif -@@ -2751,7 +2752,7 @@ if conf.get('HAVE_SYSV_COMPAT') == 1 +@@ -2753,7 +2754,7 @@ if conf.get('HAVE_SYSV_COMPAT') == 1 'src/sysv-generator/sysv-generator.c', include_directories : includes, link_with : [libshared], @@ -488,7 +488,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) -@@ -2767,7 +2768,7 @@ if conf.get('HAVE_SYSV_COMPAT') == 1 +@@ -2769,7 +2770,7 @@ if conf.get('HAVE_SYSV_COMPAT') == 1 'src/rc-local-generator/rc-local-generator.c', include_directories : includes, link_with : [libshared], @@ -497,7 +497,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : systemgeneratordir) endif -@@ -2778,7 +2779,7 @@ if conf.get('ENABLE_XDG_AUTOSTART') == 1 +@@ -2780,7 +2781,7 @@ if conf.get('ENABLE_XDG_AUTOSTART') == 1 systemd_xdg_autostart_generator_sources, include_directories : includes, link_with : [libshared], @@ -506,7 +506,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : usergeneratordir) -@@ -2787,7 +2788,7 @@ if conf.get('ENABLE_XDG_AUTOSTART') == 1 +@@ -2789,7 +2790,7 @@ if conf.get('ENABLE_XDG_AUTOSTART') == 1 'src/xdg-autostart-generator/xdg-autostart-condition.c', include_directories : includes, link_with : [libshared], @@ -515,7 +515,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -2798,7 +2799,7 @@ if conf.get('ENABLE_HOSTNAMED') == 1 +@@ -2800,7 +2801,7 @@ if conf.get('ENABLE_HOSTNAMED') == 1 'src/hostname/hostnamed.c', include_directories : includes, link_with : [libshared], @@ -524,7 +524,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2807,7 +2808,7 @@ if conf.get('ENABLE_HOSTNAMED') == 1 +@@ -2809,7 +2810,7 @@ if conf.get('ENABLE_HOSTNAMED') == 1 'src/hostname/hostnamectl.c', include_directories : includes, link_with : [libshared], @@ -533,7 +533,7 @@ index 3abf9df..51928b2 100644 install : true) endif -@@ -2826,7 +2827,7 @@ if conf.get('ENABLE_LOCALED') == 1 +@@ -2828,7 +2829,7 @@ if conf.get('ENABLE_LOCALED') == 1 include_directories : includes, link_with : [libshared], dependencies : deps, @@ -542,7 +542,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2835,7 +2836,7 @@ if conf.get('ENABLE_LOCALED') == 1 +@@ -2837,7 +2838,7 @@ if conf.get('ENABLE_LOCALED') == 1 localectl_sources, include_directories : includes, link_with : [libshared], @@ -551,7 +551,7 @@ index 3abf9df..51928b2 100644 install : true) endif -@@ -2845,7 +2846,7 @@ if conf.get('ENABLE_TIMEDATED') == 1 +@@ -2847,7 +2848,7 @@ if conf.get('ENABLE_TIMEDATED') == 1 'src/timedate/timedated.c', include_directories : includes, link_with : [libshared], @@ -560,7 +560,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -2855,7 +2856,7 @@ if conf.get('ENABLE_TIMEDATECTL') == 1 +@@ -2857,7 +2858,7 @@ if conf.get('ENABLE_TIMEDATECTL') == 1 'timedatectl', 'src/timedate/timedatectl.c', include_directories : includes, @@ -569,7 +569,7 @@ index 3abf9df..51928b2 100644 link_with : [libshared], dependencies : [libm], install : true) -@@ -2869,7 +2870,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1 +@@ -2871,7 +2872,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1 link_with : [libtimesyncd_core], dependencies : [threads, libm], @@ -578,7 +578,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2878,7 +2879,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1 +@@ -2880,7 +2881,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1 'src/timesync/wait-sync.c', include_directories : includes, link_with : [libtimesyncd_core], @@ -587,7 +587,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -2890,7 +2891,7 @@ if conf.get('ENABLE_MACHINED') == 1 +@@ -2892,7 +2893,7 @@ if conf.get('ENABLE_MACHINED') == 1 include_directories : includes, link_with : [libmachine_core, libshared], @@ -596,7 +596,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2903,7 +2904,7 @@ if conf.get('ENABLE_MACHINED') == 1 +@@ -2905,7 +2906,7 @@ if conf.get('ENABLE_MACHINED') == 1 libxz, liblz4, libzstd], @@ -605,7 +605,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) endif -@@ -2915,7 +2916,7 @@ if conf.get('ENABLE_IMPORTD') == 1 +@@ -2917,7 +2918,7 @@ if conf.get('ENABLE_IMPORTD') == 1 include_directories : includes, link_with : [libshared], dependencies : [threads], @@ -614,7 +614,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2931,7 +2932,7 @@ if conf.get('ENABLE_IMPORTD') == 1 +@@ -2933,7 +2934,7 @@ if conf.get('ENABLE_IMPORTD') == 1 libz, libbzip2, libxz], @@ -623,7 +623,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2945,7 +2946,7 @@ if conf.get('ENABLE_IMPORTD') == 1 +@@ -2947,7 +2948,7 @@ if conf.get('ENABLE_IMPORTD') == 1 libz, libbzip2, libxz], @@ -632,7 +632,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2955,7 +2956,7 @@ if conf.get('ENABLE_IMPORTD') == 1 +@@ -2957,7 +2958,7 @@ if conf.get('ENABLE_IMPORTD') == 1 include_directories : includes, link_with : [libshared, lib_import_common], @@ -641,7 +641,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2969,7 +2970,7 @@ if conf.get('ENABLE_IMPORTD') == 1 +@@ -2971,7 +2972,7 @@ if conf.get('ENABLE_IMPORTD') == 1 libz, libbzip2, libxz], @@ -650,7 +650,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -2989,7 +2990,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 +@@ -2991,7 +2992,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 libxz, liblz4, libzstd], @@ -659,7 +659,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -3007,7 +3008,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 +@@ -3009,7 +3010,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 libxz, liblz4, libzstd], @@ -668,7 +668,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3022,7 +3023,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 +@@ -3024,7 +3025,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 libxz, liblz4, libzstd], @@ -677,7 +677,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -3039,7 +3040,7 @@ if conf.get('ENABLE_COREDUMP') == 1 +@@ -3041,7 +3042,7 @@ if conf.get('ENABLE_COREDUMP') == 1 libxz, liblz4, libzstd], @@ -686,7 +686,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3053,7 +3054,7 @@ if conf.get('ENABLE_COREDUMP') == 1 +@@ -3055,7 +3056,7 @@ if conf.get('ENABLE_COREDUMP') == 1 libxz, liblz4, libzstd], @@ -695,7 +695,7 @@ index 3abf9df..51928b2 100644 install : true) endif -@@ -3068,7 +3069,7 @@ if conf.get('ENABLE_PSTORE') == 1 +@@ -3070,7 +3071,7 @@ if conf.get('ENABLE_PSTORE') == 1 libxz, liblz4, libzstd], @@ -704,7 +704,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -3079,7 +3080,7 @@ if conf.get('ENABLE_OOMD') == 1 +@@ -3081,7 +3082,7 @@ if conf.get('ENABLE_OOMD') == 1 include_directories : includes, link_with : [libshared], dependencies : [], @@ -713,7 +713,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3089,7 +3090,7 @@ if conf.get('ENABLE_OOMD') == 1 +@@ -3091,7 +3092,7 @@ if conf.get('ENABLE_OOMD') == 1 include_directories : includes, link_with : [libshared], dependencies : [], @@ -722,7 +722,7 @@ index 3abf9df..51928b2 100644 install : true) endif -@@ -3099,7 +3100,7 @@ if conf.get('ENABLE_BINFMT') == 1 +@@ -3101,7 +3102,7 @@ if conf.get('ENABLE_BINFMT') == 1 'src/binfmt/binfmt.c', include_directories : includes, link_with : [libshared], @@ -731,7 +731,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3121,7 +3122,7 @@ if conf.get('ENABLE_SYSUPDATE') == 1 +@@ -3123,7 +3124,7 @@ if conf.get('ENABLE_SYSUPDATE') == 1 libblkid, libfdisk, libopenssl], @@ -740,7 +740,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) public_programs += exe -@@ -3133,7 +3134,7 @@ if conf.get('ENABLE_VCONSOLE') == 1 +@@ -3135,7 +3136,7 @@ if conf.get('ENABLE_VCONSOLE') == 1 'src/vconsole/vconsole-setup.c', include_directories : includes, link_with : [libshared], @@ -749,7 +749,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -3144,7 +3145,7 @@ if conf.get('ENABLE_RANDOMSEED') == 1 +@@ -3146,7 +3147,7 @@ if conf.get('ENABLE_RANDOMSEED') == 1 'src/random-seed/random-seed.c', include_directories : includes, link_with : [libshared], @@ -758,7 +758,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -3156,7 +3157,7 @@ if conf.get('ENABLE_FIRSTBOOT') == 1 +@@ -3158,7 +3159,7 @@ if conf.get('ENABLE_FIRSTBOOT') == 1 include_directories : includes, link_with : [libshared], dependencies : [libcrypt], @@ -767,7 +767,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) endif -@@ -3166,7 +3167,7 @@ executable( +@@ -3168,7 +3169,7 @@ executable( 'src/remount-fs/remount-fs.c', include_directories : includes, link_with : [libshared], @@ -776,7 +776,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3175,7 +3176,7 @@ executable( +@@ -3177,7 +3178,7 @@ executable( 'src/machine-id-setup/machine-id-setup-main.c', include_directories : includes, link_with : [libshared], @@ -785,7 +785,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -3184,7 +3185,7 @@ executable( +@@ -3186,7 +3187,7 @@ executable( 'src/fsck/fsck.c', include_directories : includes, link_with : [libshared], @@ -794,7 +794,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3192,7 +3193,7 @@ executable('systemd-growfs', +@@ -3194,7 +3195,7 @@ executable('systemd-growfs', 'src/partition/growfs.c', include_directories : includes, link_with : [libshared], @@ -803,7 +803,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3201,7 +3202,7 @@ executable( +@@ -3203,7 +3204,7 @@ executable( 'src/partition/makefs.c', include_directories : includes, link_with : [libshared], @@ -812,7 +812,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3210,7 +3211,7 @@ executable( +@@ -3212,7 +3213,7 @@ executable( 'src/sleep/sleep.c', include_directories : includes, link_with : [libshared], @@ -821,7 +821,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3224,7 +3225,7 @@ public_programs += executable( +@@ -3226,7 +3227,7 @@ public_programs += executable( 'src/sysctl/sysctl.c', include_directories : includes, link_with : [libshared], @@ -830,7 +830,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3233,7 +3234,7 @@ executable( +@@ -3235,7 +3236,7 @@ executable( 'src/ac-power/ac-power.c', include_directories : includes, link_with : [libshared], @@ -839,7 +839,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3242,7 +3243,7 @@ public_programs += executable( +@@ -3244,7 +3245,7 @@ public_programs += executable( 'src/detect-virt/detect-virt.c', include_directories : includes, link_with : [libshared], @@ -848,7 +848,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += executable( -@@ -3250,7 +3251,7 @@ public_programs += executable( +@@ -3252,7 +3253,7 @@ public_programs += executable( 'src/delta/delta.c', include_directories : includes, link_with : [libshared], @@ -857,7 +857,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += executable( -@@ -3258,7 +3259,7 @@ public_programs += executable( +@@ -3260,7 +3261,7 @@ public_programs += executable( 'src/escape/escape.c', include_directories : includes, link_with : [libshared], @@ -866,7 +866,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -3267,7 +3268,7 @@ public_programs += executable( +@@ -3269,7 +3270,7 @@ public_programs += executable( 'src/notify/notify.c', include_directories : includes, link_with : [libshared], @@ -875,7 +875,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -3278,7 +3279,7 @@ public_programs += executable( +@@ -3280,7 +3281,7 @@ public_programs += executable( link_with : [libshared], dependencies : [threads, libopenssl], @@ -884,7 +884,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -3287,7 +3288,7 @@ executable( +@@ -3289,7 +3290,7 @@ executable( 'src/volatile-root/volatile-root.c', include_directories : includes, link_with : [libshared], @@ -893,7 +893,7 @@ index 3abf9df..51928b2 100644 install : conf.get('ENABLE_INITRD') == 1, install_dir : rootlibexecdir) -@@ -3296,7 +3297,7 @@ executable( +@@ -3298,7 +3299,7 @@ executable( 'src/cgroups-agent/cgroups-agent.c', include_directories : includes, link_with : [libshared], @@ -902,7 +902,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3305,7 +3306,7 @@ systemd_id128 = executable( +@@ -3307,7 +3308,7 @@ systemd_id128 = executable( 'src/id128/id128.c', include_directories : includes, link_with : [libshared], @@ -911,7 +911,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += systemd_id128 -@@ -3322,7 +3323,7 @@ public_programs += executable( +@@ -3324,7 +3325,7 @@ public_programs += executable( 'src/path/path.c', include_directories : includes, link_with : [libshared], @@ -920,7 +920,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += executable( -@@ -3330,7 +3331,7 @@ public_programs += executable( +@@ -3332,7 +3333,7 @@ public_programs += executable( 'src/ask-password/ask-password.c', include_directories : includes, link_with : [libshared], @@ -929,7 +929,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -3339,7 +3340,7 @@ executable( +@@ -3341,7 +3342,7 @@ executable( 'src/reply-password/reply-password.c', include_directories : includes, link_with : [libshared], @@ -938,7 +938,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3348,7 +3349,7 @@ public_programs += executable( +@@ -3350,7 +3351,7 @@ public_programs += executable( 'src/tty-ask-password-agent/tty-ask-password-agent.c', include_directories : includes, link_with : [libshared], @@ -947,7 +947,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) -@@ -3357,7 +3358,7 @@ public_programs += executable( +@@ -3359,7 +3360,7 @@ public_programs += executable( 'src/cgls/cgls.c', include_directories : includes, link_with : [libshared], @@ -956,7 +956,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += executable( -@@ -3365,7 +3366,7 @@ public_programs += executable( +@@ -3367,7 +3368,7 @@ public_programs += executable( 'src/cgtop/cgtop.c', include_directories : includes, link_with : [libshared], @@ -965,7 +965,7 @@ index 3abf9df..51928b2 100644 install : true) executable( -@@ -3373,7 +3374,7 @@ executable( +@@ -3375,7 +3376,7 @@ executable( 'src/initctl/initctl.c', include_directories : includes, link_with : [libshared], @@ -974,7 +974,7 @@ index 3abf9df..51928b2 100644 install : (conf.get('HAVE_SYSV_COMPAT') == 1), install_dir : rootlibexecdir) -@@ -3383,7 +3384,7 @@ public_programs += executable( +@@ -3385,7 +3386,7 @@ public_programs += executable( include_directories : includes, link_with : [libshared], dependencies: [libmount], @@ -983,7 +983,7 @@ index 3abf9df..51928b2 100644 install : true) meson.add_install_script(meson_make_symlink, -@@ -3394,7 +3395,7 @@ public_programs += executable( +@@ -3396,7 +3397,7 @@ public_programs += executable( 'src/run/run.c', include_directories : includes, link_with : [libshared], @@ -992,7 +992,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += executable( -@@ -3403,7 +3404,7 @@ public_programs += executable( +@@ -3405,7 +3406,7 @@ public_programs += executable( include_directories : includes, link_with : [libshared], dependencies : [versiondep], @@ -1001,7 +1001,7 @@ index 3abf9df..51928b2 100644 install : true) public_programs += executable( -@@ -3412,7 +3413,7 @@ public_programs += executable( +@@ -3414,7 +3415,7 @@ public_programs += executable( include_directories : includes, link_with : [libshared], dependencies : [versiondep], @@ -1010,7 +1010,7 @@ index 3abf9df..51928b2 100644 install : true) if enable_sysusers -@@ -3421,7 +3422,7 @@ if enable_sysusers +@@ -3423,7 +3424,7 @@ if enable_sysusers 'src/sysusers/sysusers.c', include_directories : includes, link_with : [libshared], @@ -1019,7 +1019,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) public_programs += exe -@@ -3463,7 +3464,7 @@ if conf.get('ENABLE_TMPFILES') == 1 +@@ -3465,7 +3466,7 @@ if conf.get('ENABLE_TMPFILES') == 1 include_directories : includes, link_with : [libshared], dependencies : [libacl], @@ -1028,7 +1028,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) public_programs += exe -@@ -3525,7 +3526,7 @@ if conf.get('ENABLE_QUOTACHECK') == 1 +@@ -3527,7 +3528,7 @@ if conf.get('ENABLE_QUOTACHECK') == 1 'src/quotacheck/quotacheck.c', include_directories : includes, link_with : [libshared], @@ -1037,7 +1037,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) endif -@@ -3536,7 +3537,7 @@ public_programs += executable( +@@ -3538,7 +3539,7 @@ public_programs += executable( include_directories : includes, link_with : [libshared], dependencies : [threads], @@ -1046,7 +1046,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3565,7 +3566,7 @@ if conf.get('ENABLE_REPART') == 1 +@@ -3567,7 +3568,7 @@ if conf.get('ENABLE_REPART') == 1 dependencies : [threads, libblkid, libfdisk], @@ -1055,7 +1055,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) public_programs += exe -@@ -3583,7 +3584,7 @@ executable( +@@ -3585,7 +3586,7 @@ executable( include_directories : includes, link_with : [libshared], dependencies : [libmount], @@ -1064,7 +1064,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3592,7 +3593,7 @@ executable( +@@ -3594,7 +3595,7 @@ executable( 'src/update-done/update-done.c', include_directories : includes, link_with : [libshared], @@ -1073,7 +1073,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3602,7 +3603,7 @@ executable( +@@ -3604,7 +3605,7 @@ executable( include_directories : includes, link_with : [libshared], dependencies : [libaudit], @@ -1082,7 +1082,7 @@ index 3abf9df..51928b2 100644 install : (conf.get('ENABLE_UTMP') == 1), install_dir : rootlibexecdir) -@@ -3613,7 +3614,7 @@ if conf.get('HAVE_KMOD') == 1 +@@ -3615,7 +3616,7 @@ if conf.get('HAVE_KMOD') == 1 include_directories : includes, link_with : [libshared], dependencies : [libkmod], @@ -1091,7 +1091,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3633,7 +3634,7 @@ public_programs += executable( +@@ -3635,7 +3636,7 @@ public_programs += executable( libshared], dependencies : [libblkid, libseccomp], @@ -1100,7 +1100,7 @@ index 3abf9df..51928b2 100644 install : true) if conf.get('ENABLE_NETWORKD') == 1 -@@ -3645,7 +3646,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -3647,7 +3648,7 @@ if conf.get('ENABLE_NETWORKD') == 1 libsystemd_network, networkd_link_with], dependencies : [threads], @@ -1109,7 +1109,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3654,7 +3655,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -3656,7 +3657,7 @@ if conf.get('ENABLE_NETWORKD') == 1 systemd_networkd_wait_online_sources, include_directories : includes, link_with : [networkd_link_with], @@ -1118,7 +1118,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3664,7 +3665,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -3666,7 +3667,7 @@ if conf.get('ENABLE_NETWORKD') == 1 include_directories : libsystemd_network_includes, link_with : [libsystemd_network, networkd_link_with], @@ -1127,7 +1127,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootbindir) endif -@@ -3674,7 +3675,7 @@ exe = executable( +@@ -3676,7 +3677,7 @@ exe = executable( network_generator_sources, include_directories : includes, link_with : [networkd_link_with], @@ -1136,7 +1136,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3691,7 +3692,7 @@ executable( +@@ -3693,7 +3694,7 @@ executable( 'src/sulogin-shell/sulogin-shell.c', include_directories : includes, link_with : [libshared], @@ -1145,7 +1145,7 @@ index 3abf9df..51928b2 100644 install : true, install_dir : rootlibexecdir) -@@ -3754,7 +3755,7 @@ foreach tuple : tests +@@ -3756,7 +3757,7 @@ foreach tuple : tests dependencies], c_args : defs, build_by_default : want_tests != 'false', diff --git a/debian/patches/series b/debian/patches/series index 038d4d6e1..877418ebd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,7 @@ Do-not-require-a-valid-version-when-parsing-sd-boot-loade.patch -sha256-fix-compilation-on-efi-ia32.patch Move-homectl-and-userdbctl-to-bindir.patch meson-install-libsystemd-shared-into-rootpkglibdir.patch shellcheck-clean-kernel-install-again.patch -shared-microhttp-util-silence-gcc-warning.patch debian/Use-Debian-specific-config-files.patch debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch debian/Make-run-lock-tmpfs-an-API-fs.patch diff --git a/debian/patches/sha256-fix-compilation-on-efi-ia32.patch b/debian/patches/sha256-fix-compilation-on-efi-ia32.patch deleted file mode 100644 index 9d0494a2d..000000000 --- a/debian/patches/sha256-fix-compilation-on-efi-ia32.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= -Date: Fri, 3 Jun 2022 09:32:02 +0200 -Subject: sha256: fix compilation on efi-ia32 -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -/usr/bin/gcc -c ../src/fundamental/sha256.c -o src/boot/efi/sha256.c.o -Wno-format-signedness -Wno-missing-field-initializers -Wno-unused-parameter -Wdate-time -Wendif-labels -Werror=format=2 -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -Werror=int-conversion -Werror=overflow -Werror=override-init -Werror=return-type -Werror=shift-count-overflow -Werror=shift-overflow=2 -Werror=undef -Wfloat-equal -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wmissing-noreturn -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-aliasing=2 -Wstrict-prototypes -Wsuggest-attribute=noreturn -Wunused-function -Wwrite-strings -Wno-unused-result -fno-stack-protector -fno-strict-aliasing -fpic -fwide-exec-charset=UCS2 -Wall -Wextra -Wsign-compare -nostdlib -std=gnu99 -ffreestanding -fshort-wchar -fvisibility=hidden -isystem /usr/include/efi -isystem /usr/include/efi/ia32 -I /builddir/build/BUILD/systemd-stable-250.7/src/fundamental -DSD_BOOT -DGNU_EFI_USE_MS_ABI -include src/boot/efi/efi_config.h -include version.h -mno-sse -mno-mmx -flto -O2 -flto=auto -../src/fundamental/sha256.c: In function ‘sha256_finish_ctx’: -../src/fundamental/sha256.c:61:25: error: ‘false’ undeclared (first use in this function) - 61 | # define UNALIGNED_P(p) false - | ^~~~~ -../src/fundamental/sha256.c:136:21: note: in expansion of macro ‘UNALIGNED_P’ - 136 | if (UNALIGNED_P(resbuf)) - | ^~~~~~~~~~~ -../src/fundamental/sha256.c:32:1: note: ‘false’ is defined in header ‘’; did you forget to ‘#include ’? - 31 | #include "sha256.h" - +++ |+#include - 32 | -... - -(cherry picked from commit 38c87ca2ab96d085158485ecfc46c7cb6af0f166) ---- - src/fundamental/sha256.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fundamental/sha256.c b/src/fundamental/sha256.c -index cd16aec..58b1a80 100644 ---- a/src/fundamental/sha256.c -+++ b/src/fundamental/sha256.c -@@ -58,7 +58,7 @@ - # define UNALIGNED_P(p) (((size_t) p) % sizeof(uint32_t) != 0) - # endif - #else --# define UNALIGNED_P(p) false -+# define UNALIGNED_P(p) sd_false - #endif - - /* This array contains the bytes used to pad the buffer to the next diff --git a/debian/patches/shared-microhttp-util-silence-gcc-warning.patch b/debian/patches/shared-microhttp-util-silence-gcc-warning.patch deleted file mode 100644 index 35c7b9d90..000000000 --- a/debian/patches/shared-microhttp-util-silence-gcc-warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= -Date: Sun, 5 Jun 2022 10:24:15 +0200 -Subject: shared/microhttp-util: silence gcc warning -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -../src/journal-remote/microhttpd-util.c: In function ‘check_permissions’: -../src/journal-remote/microhttpd-util.c:301:5: error: function might be candidate for attribute ‘noreturn’ [-Werror=suggest-attribute=noreturn] - 301 | int check_permissions(struct MHD_Connection *connection, int *code, char **hostname) { - | ^~~~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors - -Fixes #23630. - -(cherry picked from commit b547241728487c0dca22780241b04964f2eb37af) ---- - src/journal-remote/microhttpd-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c -index 48e4b14..271e304 100644 ---- a/src/journal-remote/microhttpd-util.c -+++ b/src/journal-remote/microhttpd-util.c -@@ -298,7 +298,7 @@ int check_permissions(struct MHD_Connection *connection, int *code, char **hostn - } - - #else --int check_permissions(struct MHD_Connection *connection, int *code, char **hostname) { -+_noreturn_ int check_permissions(struct MHD_Connection *connection, int *code, char **hostname) { - assert_not_reached(); - } - diff --git a/debian/patches/shellcheck-clean-kernel-install-again.patch b/debian/patches/shellcheck-clean-kernel-install-again.patch index c37266d83..ff3d49801 100644 --- a/debian/patches/shellcheck-clean-kernel-install-again.patch +++ b/debian/patches/shellcheck-clean-kernel-install-again.patch @@ -8,7 +8,7 @@ Subject: shellcheck-clean kernel-install again 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in -index a41a56a..3da233e 100755 +index cf1b81b..c6965ee 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -115,6 +115,7 @@ fi -- 2.39.5