From 1b440da1e731619baa872971db3de8d43c7da27e54d7d0a27a89da978f3d97f1 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 14 Nov 2022 11:30:28 +0000 Subject: [PATCH 1/4] - Upgrade to v252.1 (commit 64dc546913525e33e734500055a62ed0e963c227) See https://github.com/openSUSE/systemd/blob/SUSE/v252/NEWS for details. * Rebased 0001-conf-parser-introduce-early-drop-ins.patch 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch * The new tools systemd-measure and systemd-pcrphase have been added to the experimental sub-package for now. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1323 --- ...conf-parser-introduce-early-drop-ins.patch | 58 ++++++++++--------- ...-Pass-tty-to-use-by-agetty-via-stdin.patch | 30 +++++----- files.devel | 6 ++ files.experimental | 13 +++++ files.systemd | 12 +++- systemd-v251.8+suse.38.g9cdd785850.tar.xz | 3 - systemd-v252.1+suse.21.g64dc546913.tar.xz | 3 + systemd.changes | 13 +++++ systemd.spec | 16 ++--- 9 files changed, 101 insertions(+), 53 deletions(-) delete mode 100644 systemd-v251.8+suse.38.g9cdd785850.tar.xz create mode 100644 systemd-v252.1+suse.21.g64dc546913.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index a63fa0f3..0d06f860 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,7 +1,7 @@ -From a1c88ab7f5e5ad127833168bbb38340d1b582a88 Mon Sep 17 00:00:00 2001 +From 288be40eb94ddc1d549a98556baea71d20df224f Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 -Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins +Subject: [PATCH 1/8] conf-parser: introduce 'early' drop-ins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -61,15 +61,15 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 54 +++++++++++- - src/test/test-conf-parser.c | 163 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 213 insertions(+), 4 deletions(-) + src/shared/conf-parser.c | 55 ++++++++++-- + src/test/test-conf-parser.c | 164 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 214 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 6bd3ab38db..1722b90ca0 100644 +index 5cb41a39da..86dc1c95f6 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -478,6 +478,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, +@@ -478,6 +478,7 @@ int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, const s static int config_parse_many_files( const char* const* conf_files, @@ -149,30 +149,35 @@ index 6bd3ab38db..1722b90ca0 100644 ret_stats_by_path); } -@@ -590,6 +630,7 @@ int config_parse_many( - void *userdata, - Hashmap **ret_stats_by_path) { +@@ -591,6 +631,7 @@ int config_parse_many( + Hashmap **ret_stats_by_path, + char ***ret_dropin_files) { + _cleanup_strv_free_ char **early_files = NULL, **late_files = NULL; _cleanup_strv_free_ char **files = NULL; int r; -@@ -602,7 +643,12 @@ int config_parse_many( +@@ -603,12 +644,16 @@ int config_parse_many( if (r < 0) return r; -- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); +- r = config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); + r = config_parse_split_conf_files(files, &early_files, &late_files); -+ if (r < 0) -+ return r; -+ -+ return config_parse_many_files(conf_files, early_files, late_files, -+ sections, lookup, table, flags, userdata, ret_stats_by_path); - } + if (r < 0) + return r; - static int config_get_stats_by_path_one( ++ r = config_parse_many_files(conf_files, early_files, late_files, ++ sections, lookup, table, flags, userdata, ret_stats_by_path); ++ ++ + if (ret_dropin_files) +- *ret_dropin_files = TAKE_PTR(files); ++ *ret_dropin_files = TAKE_PTR(late_files); + + return 0; + } diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index e61932ab16..5a5c0d73ff 100644 +index 8c27dcac3f..745e4a127a 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -185,7 +190,7 @@ index e61932ab16..5a5c0d73ff 100644 #include "string-util.h" #include "strv.h" #include "tests.h" -@@ -391,4 +394,164 @@ TEST(config_parse) { +@@ -391,4 +394,165 @@ TEST(config_parse) { test_config_parse_one(i, config_file[i]); } @@ -219,10 +224,10 @@ index e61932ab16..5a5c0d73ff 100644 + *path); + + if (ret_conf_dirs) { -+ char *d; ++ _cleanup_free_ char *d = NULL; + -+ assert_se((d = dirname_malloc(abspath))); -+ assert_se(strv_push(ret_conf_dirs, d) == 0); ++ assert_se(path_extract_directory(abspath, &d) >= 0); ++ assert_se(strv_consume(ret_conf_dirs, TAKE_PTR(d)) == 0); + } + } + @@ -277,8 +282,9 @@ index e61932ab16..5a5c0d73ff 100644 + "Section\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, -+ NULL, -+ NULL); ++ NULL, /* userdata= */ ++ NULL, /* ret_stats_by_path= */ ++ NULL); /* ret_dropin_files= */ + } + + assert_se(r == 0); diff --git a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch index 107b6553..9100a4e9 100644 --- a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch +++ b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch @@ -1,7 +1,7 @@ -From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001 +From 9e41b33e4e0d0fcc1dba654b485d6f5238e71ea8 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 17 Mar 2022 11:35:33 +0100 -Subject: [PATCH 1/1] Revert "getty: Pass tty to use by agetty via stdin" +Subject: [PATCH 8/8] Revert "getty: Pass tty to use by agetty via stdin" This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. --- @@ -12,13 +12,13 @@ This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/units/console-getty.service.in b/units/console-getty.service.in -index 73871d6f50..bb67541dce 100644 +index 606b7dbe16..54fd7c292d 100644 --- a/units/console-getty.service.in +++ b/units/console-getty.service.in -@@ -23,12 +23,10 @@ ConditionPathExists=/dev/console - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. +@@ -22,12 +22,10 @@ ConditionPathExists=/dev/console + [Service] + # The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p), + # followed by '--' for safety, and then the entered username. -ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM +ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM Type=idle @@ -30,15 +30,15 @@ index 73871d6f50..bb67541dce 100644 TTYReset=yes TTYVHangup=yes diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in -index a6e3f94e2a..ed1eb7bde1 100644 +index 8d7e20d5ec..5dc75f769e 100644 --- a/units/container-getty@.service.in +++ b/units/container-getty@.service.in -@@ -28,13 +28,11 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM +@@ -27,13 +27,11 @@ Before=rescue.service + [Service] + # The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p), + # followed by '--' for safety, and then the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear pts/%I $TERM Type=idle Restart=always RestartSec=0 @@ -86,5 +86,5 @@ index 2433124c55..bb7af3105d 100644 TTYReset=yes TTYVHangup=yes -- -2.34.1 +2.35.3 diff --git a/files.devel b/files.devel index fde7b6f7..2bd1c670 100644 --- a/files.devel +++ b/files.devel @@ -76,6 +76,7 @@ %{_mandir}/man3/SD_EVENT_PRIORITY_IMPORTANT.3.gz %{_mandir}/man3/SD_EVENT_PRIORITY_NORMAL.3.gz %{_mandir}/man3/SD_EVENT_RUNNING.3.gz +%{_mandir}/man3/SD_EVENT_SIGNAL_PROCMASK.3.gz %{_mandir}/man3/SD_HWDB_FOREACH_PROPERTY.3.gz %{_mandir}/man3/SD_ID128_ALLF.3.gz %{_mandir}/man3/SD_ID128_CONST_STR.3.gz @@ -215,6 +216,7 @@ %{_mandir}/man3/sd_bus_error_set_errnof.3.gz %{_mandir}/man3/sd_bus_error_set_errnofv.3.gz %{_mandir}/man3/sd_bus_error_setf.3.gz +%{_mandir}/man3/sd_bus_error_setfv.3.gz %{_mandir}/man3/sd_bus_flush.3.gz %{_mandir}/man3/sd_bus_flush_close_unref.3.gz %{_mandir}/man3/sd_bus_flush_close_unrefp.3.gz @@ -316,6 +318,7 @@ %{_mandir}/man3/sd_bus_message_read_array.3.gz %{_mandir}/man3/sd_bus_message_read_basic.3.gz %{_mandir}/man3/sd_bus_message_read_strv.3.gz +%{_mandir}/man3/sd_bus_message_read_strv_extend.3.gz %{_mandir}/man3/sd_bus_message_readv.3.gz %{_mandir}/man3/sd_bus_message_ref.3.gz %{_mandir}/man3/sd_bus_message_rewind.3.gz @@ -472,6 +475,7 @@ %{_mandir}/man3/sd_event_prepare.3.gz %{_mandir}/man3/sd_event_ref.3.gz %{_mandir}/man3/sd_event_run.3.gz +%{_mandir}/man3/sd_event_set_signal_exit.3.gz %{_mandir}/man3/sd_event_set_watchdog.3.gz %{_mandir}/man3/sd_event_signal_handler_t.3.gz %{_mandir}/man3/sd_event_source.3.gz @@ -534,6 +538,7 @@ %{_mandir}/man3/sd_hwdb_enumerate.3.gz %{_mandir}/man3/sd_hwdb_get.3.gz %{_mandir}/man3/sd_hwdb_new.3.gz +%{_mandir}/man3/sd_hwdb_new_from_path.3.gz %{_mandir}/man3/sd_hwdb_ref.3.gz %{_mandir}/man3/sd_hwdb_seek.3.gz %{_mandir}/man3/sd_hwdb_unref.3.gz @@ -550,6 +555,7 @@ %{_mandir}/man3/sd_id128_is_allf.3.gz %{_mandir}/man3/sd_id128_is_null.3.gz %{_mandir}/man3/sd_id128_randomize.3.gz +%{_mandir}/man3/sd_id128_string_equal.3.gz %{_mandir}/man3/sd_id128_t.3.gz %{_mandir}/man3/sd_id128_to_string.3.gz %{_mandir}/man3/sd_id128_to_uuid_string.3.gz diff --git a/files.experimental b/files.experimental index ea0da120..d740e5db 100644 --- a/files.experimental +++ b/files.experimental @@ -22,6 +22,7 @@ %{_datadir}/zsh/site-functions/_oomctl %{_mandir}/man1/homectl.1.gz %{_mandir}/man1/oomctl.1.gz +%{_mandir}/man1/systemd-measure.1.gz %{_mandir}/man1/userdbctl.1.gz %{_mandir}/man5/homed.conf.5.gz %{_mandir}/man5/homed.conf.d.5.gz @@ -36,6 +37,10 @@ %{_mandir}/man8/systemd-homed.service.8.gz %{_mandir}/man8/systemd-oomd.8.gz %{_mandir}/man8/systemd-oomd.service.8.gz +%{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz +%{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz +%{_mandir}/man8/systemd-pcrphase.8.gz +%{_mandir}/man8/systemd-pcrphase.service.8.gz %{_mandir}/man8/systemd-repart.8.gz %{_mandir}/man8/systemd-repart.service.8.gz %{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz @@ -50,15 +55,23 @@ %{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service %{_systemd_util_dir}/systemd-homed %{_systemd_util_dir}/systemd-homework +%{_systemd_util_dir}/systemd-measure %{_systemd_util_dir}/systemd-oomd +%{_systemd_util_dir}/systemd-pcrphase %{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userwork %{_sysusersdir}/systemd-oom.conf +%{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service +%{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service +%{_unitdir}/sysinit.target.wants/systemd-pcrphase.service %{_unitdir}/systemd-homed-activate.service %{_unitdir}/systemd-homed.service %{_unitdir}/systemd-oomd.service %{_unitdir}/systemd-oomd.socket +%{_unitdir}/systemd-pcrphase-initrd.service +%{_unitdir}/systemd-pcrphase-sysinit.service +%{_unitdir}/systemd-pcrphase.service %{_unitdir}/systemd-repart.service %{_unitdir}/systemd-sysupdate-reboot.service %{_unitdir}/systemd-sysupdate-reboot.timer diff --git a/files.systemd b/files.systemd index d9360a4e..d22e13a6 100644 --- a/files.systemd +++ b/files.systemd @@ -27,6 +27,7 @@ %endif %dir %{_environmentdir} %dir %{_journalcatalogdir} +%dir %{_libdir}/systemd %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog %dir %{_modprobedir} @@ -62,6 +63,7 @@ %dir %{_unitdir}/halt.target.wants %dir %{_unitdir}/initrd-root-device.target.wants %dir %{_unitdir}/initrd-root-fs.target.wants +%dir %{_unitdir}/initrd.target.wants %dir %{_unitdir}/kexec.target.wants %dir %{_unitdir}/local-fs.target.wants %dir %{_unitdir}/multi-user.target.wants @@ -136,6 +138,7 @@ %{_datadir}/bash-completion/completions/systemd-cat %{_datadir}/bash-completion/completions/systemd-cgls %{_datadir}/bash-completion/completions/systemd-cgtop +%{_datadir}/bash-completion/completions/systemd-cryptenroll %{_datadir}/bash-completion/completions/systemd-delta %{_datadir}/bash-completion/completions/systemd-detect-virt %{_datadir}/bash-completion/completions/systemd-id128 @@ -223,6 +226,10 @@ %if %{without bootstrap} %{_libdir}/libnss_myhostname.so.2 %{_libdir}/libnss_systemd.so.2 +%endif +%{_libdir}/systemd/libsystemd-core-252.so +%{_libdir}/systemd/libsystemd-shared-252.so +%if %{without bootstrap} %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz %{_mandir}/man1/init.1.gz @@ -327,6 +334,7 @@ %{_mandir}/man7/systemd.offline-updates.7.gz %{_mandir}/man7/systemd.special.7.gz %{_mandir}/man7/systemd.syntax.7.gz +%{_mandir}/man7/systemd.system-credentials.7.gz %{_mandir}/man7/systemd.time.7.gz %{_mandir}/man8/30-systemd-environment-d-generator.8.gz %{_mandir}/man8/halt.8.gz @@ -427,8 +435,6 @@ %{_sysconfdir}/xdg/systemd/user %{_sysctldir}/99-sysctl.conf %{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator -%{_systemd_util_dir}/libsystemd-core-251.so -%{_systemd_util_dir}/libsystemd-shared-251.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh @@ -453,6 +459,7 @@ %{_systemd_util_dir}/systemd-socket-proxyd %{_systemd_util_dir}/systemd-sulogin-shell %{_systemd_util_dir}/systemd-sysctl +%{_systemd_util_dir}/systemd-sysroot-fstab-check %{_systemd_util_dir}/systemd-time-wait-sync %{_systemd_util_dir}/systemd-timedated %{_systemd_util_dir}/systemd-timesyncd @@ -494,6 +501,7 @@ %{_sysusersdir}/systemd-journal.conf %{_sysusersdir}/systemd-timesync.conf %{_tmpfilesdir}/journal-nocow.conf +%{_tmpfilesdir}/provision.conf %{_tmpfilesdir}/suse.conf %{_tmpfilesdir}/systemd-nologin.conf %{_tmpfilesdir}/systemd-tmp.conf diff --git a/systemd-v251.8+suse.38.g9cdd785850.tar.xz b/systemd-v251.8+suse.38.g9cdd785850.tar.xz deleted file mode 100644 index c6e92a6a..00000000 --- a/systemd-v251.8+suse.38.g9cdd785850.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e21e408a70aef50bbba4a5e39b1c728a7ef48105d226f516b51d36a18cc24d0f -size 7844584 diff --git a/systemd-v252.1+suse.21.g64dc546913.tar.xz b/systemd-v252.1+suse.21.g64dc546913.tar.xz new file mode 100644 index 00000000..53405b75 --- /dev/null +++ b/systemd-v252.1+suse.21.g64dc546913.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61e92987f1ac3c83d3b3be029497159b683c84869e259d904d0422c4691432e9 +size 8034368 diff --git a/systemd.changes b/systemd.changes index 73e866a8..044a9b1a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Nov 14 11:15:06 UTC 2022 - Franck Bui + +- Upgrade to v252.1 (commit 64dc546913525e33e734500055a62ed0e963c227) + + See https://github.com/openSUSE/systemd/blob/SUSE/v252/NEWS for details. + + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch + 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch + + * The new tools systemd-measure and systemd-pcrphase have been added to the + experimental sub-package for now. + ------------------------------------------------------------------- Tue Nov 8 16:33:26 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 4c912853..b2f821df 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.38.g9cdd785850 +%define archive_version +suse.21.g64dc546913 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -72,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 251.8 +Version: 252.1 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -523,6 +523,7 @@ Requires: binutils Requires: busybox-static Requires: cryptsetup Requires: dosfstools +Requires: jq Requires: libcap-progs Requires: libfido2 Requires: libtss2-esys0 @@ -570,10 +571,10 @@ Run the following python script to run all unit tests at once: $ %{_testsuitedir}/run-unit-tests.py To run the full extended testsuite do the following: -$ NO_BUILD=1 %{_testsuitedir}/test/run-integration-tests.sh +$ NO_BUILD=1 TEST_NESTED_VM=1 %{_testsuitedir}/test/run-integration-tests.sh Or to run one specific integration test: -$ NO_BUILD=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run +$ NO_BUILD=1 TEST_NESTED_VM=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run For more details on the available options to run the extended testsuite, please refer to %{_testsuitedir}/test/README.testsuite. @@ -610,7 +611,8 @@ change without the usual backwards-compatibility promises. Components that turn out to be stable and considered as fully supported will be merged into the main package or moved into a dedicated package. -Currently this package contains: homed, repart, userdbd, oomd. +Currently this package contains: homed, repart, userdbd, oomd, measure and +pcrphase. In case you want to create a user with systemd-homed quickly, here are the steps you can follow: @@ -1296,13 +1298,13 @@ fi %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 -%{_libdir}/libsystemd.so.0.34.0 +%{_libdir}/libsystemd.so.0.35.0 %files -n libudev%{?mini}1 %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 -%{_libdir}/libudev.so.1.7.4 +%{_libdir}/libudev.so.1.7.5 %if %{with coredump} %files coredump From ade4d21a72070c5429654b8e0d954ba6d2e88427cf16459360f5425a8d6ca109 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 14 Nov 2022 13:33:04 +0000 Subject: [PATCH 2/4] fix build of mini flavor OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1324 --- files.experimental | 1 + files.systemd | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/files.experimental b/files.experimental index d740e5db..a1653531 100644 --- a/files.experimental +++ b/files.experimental @@ -3,6 +3,7 @@ # %config(noreplace) %{_sysconfdir}/systemd/homed.conf %config(noreplace) %{_sysconfdir}/systemd/oomd.conf +%dir %{_unitdir}/initrd.target.wants %{_bindir}/homectl %{_bindir}/oomctl %{_bindir}/systemd-repart diff --git a/files.systemd b/files.systemd index d22e13a6..e4b0d920 100644 --- a/files.systemd +++ b/files.systemd @@ -63,7 +63,6 @@ %dir %{_unitdir}/halt.target.wants %dir %{_unitdir}/initrd-root-device.target.wants %dir %{_unitdir}/initrd-root-fs.target.wants -%dir %{_unitdir}/initrd.target.wants %dir %{_unitdir}/kexec.target.wants %dir %{_unitdir}/local-fs.target.wants %dir %{_unitdir}/multi-user.target.wants From 518d9b73f4afdb3f086385872616aa955bc43c9700817e50a16c857393396235 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 15 Nov 2022 08:31:18 +0000 Subject: [PATCH 3/4] Add temporarly 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch until this patch is mainstreamed. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1325 --- ...st-kernel-install-only-when-Dkernel-.patch | 29 +++++++++++++++++++ systemd.changes | 4 +++ systemd.spec | 14 ++++----- 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch diff --git a/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch b/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch new file mode 100644 index 00000000..3217bafa --- /dev/null +++ b/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch @@ -0,0 +1,29 @@ +From c34a72017fe66998f7bd40b5e90d27accd69376c Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Tue, 15 Nov 2022 09:04:42 +0100 +Subject: [PATCH 6000/6000] meson: install test-kernel-install only when + -Dkernel-install=true + +This patch fixes the following build failure: + + meson.build:3853:8: ERROR: Unknown variable "test_kernel_install_sh". +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 00daeac1b6..0fd0129820 100644 +--- a/meson.build ++++ b/meson.build +@@ -3968,7 +3968,7 @@ exe = custom_target( + install_dir : bindir) + public_programs += exe + +-if want_tests != 'false' ++if want_tests != 'false' and want_kernel_install + test('test-kernel-install', + test_kernel_install_sh, + args : [exe.full_path(), loaderentry_install]) +-- +2.35.3 + diff --git a/systemd.changes b/systemd.changes index 044a9b1a..29d0fb98 100644 --- a/systemd.changes +++ b/systemd.changes @@ -11,6 +11,10 @@ Mon Nov 14 11:15:06 UTC 2022 - Franck Bui * The new tools systemd-measure and systemd-pcrphase have been added to the experimental sub-package for now. + * Add temporarly + 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch until this + patch is mainstreamed. + ------------------------------------------------------------------- Tue Nov 8 16:33:26 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index b2f821df..e44bd068 100644 --- a/systemd.spec +++ b/systemd.spec @@ -106,7 +106,7 @@ BuildRequires: gperf BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: meson >= 0.43 +BuildRequires: meson >= 0.53.2 BuildRequires: pam-devel BuildRequires: python3-jinja2 # regenerate_initrd_post macro is expanded during build, hence this BR. Also @@ -211,12 +211,12 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # Temporary workaround until bsc#1197178 is addressed. Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch -# Patches listed below are put in quarantine. Normally all changes -# must go to upstream first and then are cherry-picked in the SUSE git -# repository. But in very few cases, some stuff might be broken in -# upstream and need an urgent fix. Even in this case, the patches are -# temporary and should be removed as soon as a fix is merged by -# upstream. +# Patches listed below are put in quarantine. Normally all changes must go to +# upstream first and then are cherry-picked in the SUSE git repository. But for +# very few cases, some stuff might be broken in upstream and need to be fixed +# quickly. But even in these cases, the patches are temporary and should be +# removed as soon as a fix is merged by upstream. +Patch6000: 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch %description Systemd is a system and service manager, compatible with SysV and LSB From 01bb6005e26d09781d59985e3d7ad07bf690f4db4c9e3bab38a74fe897991d6a Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 15 Nov 2022 09:34:37 +0000 Subject: [PATCH 4/4] fix build on s390x where sd_boot=false OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1326 --- files.experimental | 14 ++++++++++++++ systemd.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/files.experimental b/files.experimental index a1653531..6bc23ede 100644 --- a/files.experimental +++ b/files.experimental @@ -3,7 +3,9 @@ # %config(noreplace) %{_sysconfdir}/systemd/homed.conf %config(noreplace) %{_sysconfdir}/systemd/oomd.conf +%if %{with sd_boot} %dir %{_unitdir}/initrd.target.wants +%endif %{_bindir}/homectl %{_bindir}/oomctl %{_bindir}/systemd-repart @@ -23,7 +25,9 @@ %{_datadir}/zsh/site-functions/_oomctl %{_mandir}/man1/homectl.1.gz %{_mandir}/man1/oomctl.1.gz +%if %{with sd_boot} %{_mandir}/man1/systemd-measure.1.gz +%endif %{_mandir}/man1/userdbctl.1.gz %{_mandir}/man5/homed.conf.5.gz %{_mandir}/man5/homed.conf.d.5.gz @@ -38,10 +42,12 @@ %{_mandir}/man8/systemd-homed.service.8.gz %{_mandir}/man8/systemd-oomd.8.gz %{_mandir}/man8/systemd-oomd.service.8.gz +%if %{with sd_boot} %{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz %{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz %{_mandir}/man8/systemd-pcrphase.8.gz %{_mandir}/man8/systemd-pcrphase.service.8.gz +%endif %{_mandir}/man8/systemd-repart.8.gz %{_mandir}/man8/systemd-repart.service.8.gz %{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz @@ -56,23 +62,31 @@ %{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service %{_systemd_util_dir}/systemd-homed %{_systemd_util_dir}/systemd-homework +%if %{with sd_boot} %{_systemd_util_dir}/systemd-measure +%endif %{_systemd_util_dir}/systemd-oomd +%if %{with sd_boot} %{_systemd_util_dir}/systemd-pcrphase +%endif %{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userwork %{_sysusersdir}/systemd-oom.conf +%if %{with sd_boot} %{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase.service +%endif %{_unitdir}/systemd-homed-activate.service %{_unitdir}/systemd-homed.service %{_unitdir}/systemd-oomd.service %{_unitdir}/systemd-oomd.socket +%if %{with sd_boot} %{_unitdir}/systemd-pcrphase-initrd.service %{_unitdir}/systemd-pcrphase-sysinit.service %{_unitdir}/systemd-pcrphase.service +%endif %{_unitdir}/systemd-repart.service %{_unitdir}/systemd-sysupdate-reboot.service %{_unitdir}/systemd-sysupdate-reboot.timer diff --git a/systemd.spec b/systemd.spec index e44bd068..3c033c27 100644 --- a/systemd.spec +++ b/systemd.spec @@ -59,7 +59,7 @@ %bcond_without portabled %bcond_without resolved %ifarch %{ix86} x86_64 aarch64 -%bcond_without sd_boot +%bcond_with sd_boot %else %bcond_with sd_boot %endif