From 688f3b3091ce2e81c9683d741561df810d4e493965bad19752f01e7c6aecd166 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 31 Jan 2023 15:08:28 +0000 Subject: [PATCH] Accepting request 1062012 from Base:System - Import commit d87834a33444b7163e741e1089e82b44af663808 (merge of v252.5) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/5a506d73bde7ba9261985f8e9ce084044a519432...d87834a33444b7163e741e1089e82b44af663808 - Move the bash completion support for systemd-cryptenroll in udev. - systemd-testsuite: move the integration tests in a dedicated sub directory. - machines.target belongs to systemd-container, do its init/cleanup steps from the scriptlets of this sub-package. OBS-URL: https://build.opensuse.org/request/show/1062012 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=378 --- files.systemd | 1 - files.udev | 1 + systemd-v252.4+suse.44.g5a506d73bd.tar.xz | 3 -- systemd-v252.5+suse.46.gd87834a334.tar.xz | 3 ++ systemd.changes | 24 ++++++++++ systemd.spec | 54 ++++++++++++++--------- 6 files changed, 60 insertions(+), 26 deletions(-) delete mode 100644 systemd-v252.4+suse.44.g5a506d73bd.tar.xz create mode 100644 systemd-v252.5+suse.46.gd87834a334.tar.xz diff --git a/files.systemd b/files.systemd index 36178f84..1bc8da22 100644 --- a/files.systemd +++ b/files.systemd @@ -137,7 +137,6 @@ %{_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 diff --git a/files.udev b/files.udev index daf66aa9..94571214 100644 --- a/files.udev +++ b/files.udev @@ -28,6 +28,7 @@ %{_bindir}/systemd-hwdb %{_bindir}/udevadm %if %{without bootstrap} +%{_datadir}/bash-completion/completions/systemd-cryptenroll %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc diff --git a/systemd-v252.4+suse.44.g5a506d73bd.tar.xz b/systemd-v252.4+suse.44.g5a506d73bd.tar.xz deleted file mode 100644 index 0421d76b..00000000 --- a/systemd-v252.4+suse.44.g5a506d73bd.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c897cd9b3d3b7ba9fdb5600ddb2f9aff285abc479f190bbbdcec8ca37c95b8b -size 8042788 diff --git a/systemd-v252.5+suse.46.gd87834a334.tar.xz b/systemd-v252.5+suse.46.gd87834a334.tar.xz new file mode 100644 index 00000000..8fe341c2 --- /dev/null +++ b/systemd-v252.5+suse.46.gd87834a334.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb506e9ea2783c8dff075ecfd6d253fd397d2bd017f928903aff0cd6f272c9e1 +size 8050412 diff --git a/systemd.changes b/systemd.changes index 7940f4e3..c99d8994 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Jan 30 08:39:24 UTC 2023 - Franck Bui + +- Import commit d87834a33444b7163e741e1089e82b44af663808 (merge of v252.5) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/5a506d73bde7ba9261985f8e9ce084044a519432...d87834a33444b7163e741e1089e82b44af663808 + +------------------------------------------------------------------- +Thu Jan 26 16:30:41 UTC 2023 - Franck Bui + +- Move the bash completion support for systemd-cryptenroll in udev. + +------------------------------------------------------------------- +Thu Jan 26 16:13:43 UTC 2023 - Franck Bui + +- systemd-testsuite: move the integration tests in a dedicated sub directory. + +------------------------------------------------------------------- +Thu Jan 26 14:02:11 UTC 2023 - Franck Bui + +- machines.target belongs to systemd-container, do its init/cleanup steps from + the scriptlets of this sub-package. + ------------------------------------------------------------------- Tue Jan 24 13:19:01 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index cdcc6532..f3627169 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.44.g5a506d73bd +%define archive_version +suse.46.gd87834a334 %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: 252.4 +Version: 252.5 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -557,24 +557,24 @@ Requires: systemd-portable Requires: xz %description testsuite -This package contains the unit tests as well as the extended -testsuite. The unit tests are used to check various internal functions -used by systemd whereas the extended testsuite is used to test various -functionalities of systemd and all its components. +This package contains the unit tests as well as the extended testsuite. The unit +tests are used to check various internal functions used by systemd whereas the +extended testsuite is used to test various functionalities of systemd and all +its components. -Note that the extended testsuite only works with UID=0. +Note that you need root privileges to run the extended testsuite. 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 TEST_NESTED_VM=1 %{_testsuitedir}/test/run-integration-tests.sh +$ NO_BUILD=1 TEST_NESTED_VM=1 %{_testsuitedir}/integration-tests/run-integration-tests.sh Or to run one specific integration test: -$ NO_BUILD=1 TEST_NESTED_VM=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run +$ NO_BUILD=1 TEST_NESTED_VM=1 make -C %{_testsuitedir}/integration-tests/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. +For more details on the available options to run the extended testsuite, please +refer to %{_testsuitedir}/integration-tests/README.testsuite. %endif %if %{with experimental} @@ -942,14 +942,18 @@ rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} -cp -a test %{buildroot}%{_testsuitedir}/ -# When the tests are installed, the effective testdata directory is in -# %{_testsuitedir}, the other one, which is actually a symlink, is only useful -# when the tests are run directly from the source. -rm %{buildroot}%{_testsuitedir}/test/testdata -# kbd-model-map became a dangling symlink, drop it. -rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map -find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; +# -Dinstall_test took care of installing the unit tests only (those in +# src/tests) and testdata directory. Here we copy the integration tests +# including also all related scripts used to prepare and run the integration +# tests in dedicated VMs. During the copy, all symlinks are replaced by the +# files they point to making sure we won't try to embed dangling symlinks. +mkdir -p %{buildroot}%{_testsuitedir}/integration-tests +tar -cO \ + --dereference \ + --exclude=testdata \ + --exclude-vcs \ + --exclude-vcs-ignores \ + -C test/ . | tar -xC %{buildroot}%{_testsuitedir}/integration-tests %endif %if %{without bootstrap} @@ -962,7 +966,6 @@ find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %pre # Units listed below can be enabled at installation according to their preset # setting. -%systemd_pre machines.target %systemd_pre remote-fs.target %systemd_pre getty@.service %systemd_pre systemd-timesyncd.service @@ -1022,7 +1025,6 @@ fi # Units listed below can be enabled at installation accoding to their preset # setting. -%systemd_post machines.target %systemd_post remote-fs.target %systemd_post getty@.service %systemd_post systemd-timesyncd.service @@ -1136,7 +1138,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n libudev%{?mini}1 -p %ldconfig %postun -n libsystemd0%{?mini} -p %ldconfig +%pre container +%systemd_pre machines.target + %post container +%systemd_post machines.target %tmpfiles_create systemd-nspawn.conf %if %{with machined} %ldconfig @@ -1157,7 +1163,11 @@ if [ $1 -gt 1 ]; then %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi +%preun container +%systemd_preun machines.target + %postun container +%systemd_postun machines.target %ldconfig %endif @@ -1381,7 +1391,7 @@ fi %if %{with testsuite} %files testsuite %defattr(-,root,root) -%doc %{_testsuitedir}/test/README.testsuite +%doc %{_testsuitedir}/integration-tests/README.testsuite %{_testsuitedir} %endif