From d40672a9948ef3887173a9aa564892dcd82dc50ecf3c336d65f728b15521aa4e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 25 Oct 2018 06:11:24 +0000 Subject: [PATCH] Accepting request 642104 from Base:System OBS-URL: https://build.opensuse.org/request/show/642104 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=287 --- systemd-mini.changes | 24 ++++++++++++++++++++++++ systemd-mini.spec | 20 +++++++++++++------- systemd-v237+suse.100.g19b3868d3.tar.xz | 3 +++ systemd-v237+suse.93.ga67b516d4.tar.xz | 3 --- systemd.changes | 24 ++++++++++++++++++++++++ systemd.spec | 20 +++++++++++++------- 6 files changed, 77 insertions(+), 17 deletions(-) create mode 100644 systemd-v237+suse.100.g19b3868d3.tar.xz delete mode 100644 systemd-v237+suse.93.ga67b516d4.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 14ec559e..64a87a55 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Oct 15 16:23:05 UTC 2018 - Franck Bui + +- Ship systemd-sysv-install helper via the main package + + This script was part of systemd-sysvinit sub-package but it was + wrong since systemd-sysv-install is a script used to redirect + enable/disable operations to chkconfig when the unit targets are + sysv init scripts. Therefore it's never been a SySV init tool. + + While at it, don't ship this script (as well as + systemd-sysv-convert) when sysvcompat is not defined. + +------------------------------------------------------------------- +Mon Oct 15 15:01:48 UTC 2018 - Franck Bui + +- Import commit 19b3868d32af20f1ecc86fe3c997144ff456fd65 + + 06c2284d64 core: introduce systemd.early_core_pattern= kernel cmdline option + 479b002083 core: add missing 'continue' statement + c7fbccc62e journald: don't ship systemd-journald-audit.socket (bsc#1109252) + f17a6c790c detect-virt: do not try to read all of /proc/cpuinfo (bsc#1109197) + 5a1aa84544 compat-rules: generate more compat by-id symlinks for NVMe devices (bsc#1095096) + ------------------------------------------------------------------- Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 758d4d87..55537c48 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.93.ga67b516d4 +%define suse_version +suse.100.g19b3868d3 %bcond_with gnuefi %if 0%{?bootstrap} @@ -143,10 +143,12 @@ Obsoletes: suspend <= 1.0 Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user +%if %{with sysvcompat} Source3: systemd-sysv-convert +Source4: systemd-sysv-install +%endif Source6: baselibs.conf Source11: after-local.service -Source12: systemd-sysv-install Source14: kbd-model-map.legacy Source100: scripts-systemd-fix-machines-btrfs-subvol.sh @@ -492,11 +494,13 @@ ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd +%if %{with sysvcompat} mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert -install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +%endif # The rules that we shouldn't maintain install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules @@ -914,7 +918,9 @@ fi %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl +%if %{with sysvcompat} %{_sbindir}/systemd-sysv-convert +%endif %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat @@ -934,7 +940,6 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif %exclude %{_prefix}/lib/systemd/systemd-coredump -%exclude %{_prefix}/lib/systemd/systemd-sysv* %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* @@ -1150,9 +1155,11 @@ fi %{_udevrulesdir}/73-seat-late.rules %{_udevrulesdir}/99-systemd.rules %dir %{_localstatedir}/lib/systemd +%dir %{_localstatedir}/lib/systemd/catalog +%if %{with sysvcompat} %dir %{_localstatedir}/lib/systemd/sysv-convert %dir %{_localstatedir}/lib/systemd/migrated -%dir %{_localstatedir}/lib/systemd/catalog +%endif %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/random-seed @@ -1194,7 +1201,6 @@ fi %{_mandir}/man8/telinit.8* %{_mandir}/man8/runlevel.8* %endif -%{_prefix}/lib/systemd/systemd-sysv-install %files -n udev%{?mini} %defattr(-,root,root) diff --git a/systemd-v237+suse.100.g19b3868d3.tar.xz b/systemd-v237+suse.100.g19b3868d3.tar.xz new file mode 100644 index 00000000..5e7c3bb1 --- /dev/null +++ b/systemd-v237+suse.100.g19b3868d3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a821019ddd446a6a4d25c5152b0cdd42b197c8657c69dadc393dd36b189784f +size 4629044 diff --git a/systemd-v237+suse.93.ga67b516d4.tar.xz b/systemd-v237+suse.93.ga67b516d4.tar.xz deleted file mode 100644 index f9e9ce79..00000000 --- a/systemd-v237+suse.93.ga67b516d4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:197b53c8d49a912f600a234884ea7000b34147bc13068fe71946550cfc090552 -size 4628352 diff --git a/systemd.changes b/systemd.changes index 14ec559e..64a87a55 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Oct 15 16:23:05 UTC 2018 - Franck Bui + +- Ship systemd-sysv-install helper via the main package + + This script was part of systemd-sysvinit sub-package but it was + wrong since systemd-sysv-install is a script used to redirect + enable/disable operations to chkconfig when the unit targets are + sysv init scripts. Therefore it's never been a SySV init tool. + + While at it, don't ship this script (as well as + systemd-sysv-convert) when sysvcompat is not defined. + +------------------------------------------------------------------- +Mon Oct 15 15:01:48 UTC 2018 - Franck Bui + +- Import commit 19b3868d32af20f1ecc86fe3c997144ff456fd65 + + 06c2284d64 core: introduce systemd.early_core_pattern= kernel cmdline option + 479b002083 core: add missing 'continue' statement + c7fbccc62e journald: don't ship systemd-journald-audit.socket (bsc#1109252) + f17a6c790c detect-virt: do not try to read all of /proc/cpuinfo (bsc#1109197) + 5a1aa84544 compat-rules: generate more compat by-id symlinks for NVMe devices (bsc#1095096) + ------------------------------------------------------------------- Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 0bf5d959..15a79547 100644 --- a/systemd.spec +++ b/systemd.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.93.ga67b516d4 +%define suse_version +suse.100.g19b3868d3 %bcond_with gnuefi %if 0%{?bootstrap} @@ -141,10 +141,12 @@ Obsoletes: suspend <= 1.0 Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user +%if %{with sysvcompat} Source3: systemd-sysv-convert +Source4: systemd-sysv-install +%endif Source6: baselibs.conf Source11: after-local.service -Source12: systemd-sysv-install Source14: kbd-model-map.legacy Source100: scripts-systemd-fix-machines-btrfs-subvol.sh @@ -490,11 +492,13 @@ ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd +%if %{with sysvcompat} mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert -install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +%endif # The rules that we shouldn't maintain install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules @@ -912,7 +916,9 @@ fi %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl +%if %{with sysvcompat} %{_sbindir}/systemd-sysv-convert +%endif %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat @@ -932,7 +938,6 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif %exclude %{_prefix}/lib/systemd/systemd-coredump -%exclude %{_prefix}/lib/systemd/systemd-sysv* %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* @@ -1148,9 +1153,11 @@ fi %{_udevrulesdir}/73-seat-late.rules %{_udevrulesdir}/99-systemd.rules %dir %{_localstatedir}/lib/systemd +%dir %{_localstatedir}/lib/systemd/catalog +%if %{with sysvcompat} %dir %{_localstatedir}/lib/systemd/sysv-convert %dir %{_localstatedir}/lib/systemd/migrated -%dir %{_localstatedir}/lib/systemd/catalog +%endif %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/random-seed @@ -1192,7 +1199,6 @@ fi %{_mandir}/man8/telinit.8* %{_mandir}/man8/runlevel.8* %endif -%{_prefix}/lib/systemd/systemd-sysv-install %files -n udev%{?mini} %defattr(-,root,root)