From ddd1e277bdede951dac8323d0cfab3b680f3ce65115ff4eb3e71b37ec3132ceb Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 31 Mar 2023 15:15:32 +0000 Subject: [PATCH] - Import commit b63f58661b08037d8cb04ed97b5e39d9bf415fdc (merge of v253.2) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/8b01686dd20124efc300d21ef38d85c1f75c372f...b63f58661b08037d8cb04ed97b5e39d9bf415fdc - Move systemd-fsck stuff to udev sub-package. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1366 --- files.systemd | 7 ------- files.udev | 9 +++++++++ systemd-v253.1+suse.14.g8b01686dd2.tar.xz | 3 --- systemd-v253.2+suse.15.gb63f58661b.tar.xz | 3 +++ systemd.changes | 10 ++++++++++ systemd.spec | 4 ++-- 6 files changed, 24 insertions(+), 12 deletions(-) delete mode 100644 systemd-v253.1+suse.14.g8b01686dd2.tar.xz create mode 100644 systemd-v253.2+suse.15.gb63f58661b.tar.xz diff --git a/files.systemd b/files.systemd index 6d2276f1..e2be4037 100644 --- a/files.systemd +++ b/files.systemd @@ -363,9 +363,6 @@ %{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz %{_mandir}/man8/systemd-debug-generator.8.gz %{_mandir}/man8/systemd-environment-d-generator.8.gz -%{_mandir}/man8/systemd-fsck-root.service.8.gz -%{_mandir}/man8/systemd-fsck.8.gz -%{_mandir}/man8/systemd-fsck@.service.8.gz %{_mandir}/man8/systemd-getty-generator.8.gz %{_mandir}/man8/systemd-halt.service.8.gz %{_mandir}/man8/systemd-hibernate-resume-generator.8.gz @@ -450,7 +447,6 @@ %{_systemd_util_dir}/systemd-binfmt %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent -%{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed %{_systemd_util_dir}/systemd-journald @@ -633,9 +629,6 @@ %{_unitdir}/systemd-binfmt.service %{_unitdir}/systemd-boot-check-no-failures.service %{_unitdir}/systemd-exit.service -%{_unitdir}/systemd-firstboot.service -%{_unitdir}/systemd-fsck-root.service -%{_unitdir}/systemd-fsck@.service %{_unitdir}/systemd-halt.service %{_unitdir}/systemd-hibernate-resume@.service %{_unitdir}/systemd-hibernate.service diff --git a/files.udev b/files.udev index a793d096..ed8b2918 100644 --- a/files.udev +++ b/files.udev @@ -54,8 +54,13 @@ %{_mandir}/man8/systemd-cryptsetup-generator.8.gz %{_mandir}/man8/systemd-cryptsetup.8.gz %{_mandir}/man8/systemd-cryptsetup@.service.8.gz +%{_mandir}/man8/systemd-fsck-root.service.8.gz +%{_mandir}/man8/systemd-fsck-usr.service.8.gz +%{_mandir}/man8/systemd-fsck.8.gz +%{_mandir}/man8/systemd-fsck@.service.8.gz %{_mandir}/man8/systemd-fstab-generator.8.gz %{_mandir}/man8/systemd-gpt-auto-generator.8.gz +%{_mandir}/man8/systemd-growfs-root.service.8.gz %{_mandir}/man8/systemd-growfs.8.gz %{_mandir}/man8/systemd-growfs@.service.8.gz %{_mandir}/man8/systemd-hwdb.8.gz @@ -101,6 +106,7 @@ %if %{without bootstrap} %{_systemd_util_dir}/systemd-cryptsetup %endif +%{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-growfs %if %{without bootstrap} %{_systemd_util_dir}/systemd-integritysetup @@ -224,6 +230,9 @@ %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/systemd-backlight@.service +%{_unitdir}/systemd-firstboot.service +%{_unitdir}/systemd-fsck-root.service +%{_unitdir}/systemd-fsck@.service %{_unitdir}/systemd-growfs-root.service %{_unitdir}/systemd-growfs@.service %{_unitdir}/systemd-hwdb-update.service diff --git a/systemd-v253.1+suse.14.g8b01686dd2.tar.xz b/systemd-v253.1+suse.14.g8b01686dd2.tar.xz deleted file mode 100644 index a9fad76e..00000000 --- a/systemd-v253.1+suse.14.g8b01686dd2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebbf20d2d10f6bced7a3a001b5ed122a52a5732ff36e1e48fb2cb69cb747b0bd -size 8202120 diff --git a/systemd-v253.2+suse.15.gb63f58661b.tar.xz b/systemd-v253.2+suse.15.gb63f58661b.tar.xz new file mode 100644 index 00000000..85aba6bf --- /dev/null +++ b/systemd-v253.2+suse.15.gb63f58661b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cf4c490eb720a0148eda7af657ccea4fc355eec2b7986727e5efc3e158d792b +size 8205900 diff --git a/systemd.changes b/systemd.changes index 27b768ca..2105e60a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Mar 31 14:41:49 UTC 2023 - Franck Bui + +- Import commit b63f58661b08037d8cb04ed97b5e39d9bf415fdc (merge of v253.2) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/8b01686dd20124efc300d21ef38d85c1f75c372f...b63f58661b08037d8cb04ed97b5e39d9bf415fdc + +- Move systemd-fsck stuff to udev sub-package. + ------------------------------------------------------------------- Fri Mar 31 12:55:21 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a74f9bc7..dde8a250 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.14.g8b01686dd2 +%define archive_version +suse.15.gb63f58661b %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: 253.1 +Version: 253.2 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later