diff --git a/systemd-233.tar.xz b/systemd-233.tar.xz new file mode 100644 index 00000000..a77e6941 --- /dev/null +++ b/systemd-233.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31fe0c3bea971e0dd40b9bec3f08080859ab3710f3882e0009582dd0bf16086d +size 3257376 diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz deleted file mode 100644 index ebe7c123..00000000 --- a/systemd-234.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ecf38c4f36975e978edd400fe9405528393b656f97feb6188f45de0a9886091 -size 3350388 diff --git a/systemd-mini.changes b/systemd-mini.changes index 68837bb6..cf442750 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,33 +1,3 @@ -------------------------------------------------------------------- -Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com - -- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 - - 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) - -------------------------------------------------------------------- -Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com - -- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b - - 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled - 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" - -------------------------------------------------------------------- -Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com - -- Drop support of compression from the mini package - - Hence remove the relevant build-requires from the mini package. - -------------------------------------------------------------------- -Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com - -- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) - - - package /etc/systemd/system/dbus-org.freedesktop.network1.service - - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled - ------------------------------------------------------------------- Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de @@ -116,7 +86,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com ------------------------------------------------------------------- Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com -- Make sure dracut (if installed) will embed the new compat rule +- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) The new compat rule must be embedded in the initramfs so make sure that the installed dracut supports it. diff --git a/systemd-mini.spec b/systemd-mini.spec index 8dcb079e..dbb34853 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -49,7 +49,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 234 +Version: 233 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -66,8 +66,6 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) %endif BuildRequires: fdupes @@ -85,6 +83,8 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libselinux) >= 2.1.9 @@ -954,9 +954,7 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so -%if %{with resolved} %{_prefix}/lib/systemd/resolv.conf -%endif %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -1036,11 +1034,9 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd} diff --git a/systemd.changes b/systemd.changes index 68837bb6..cf442750 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,33 +1,3 @@ -------------------------------------------------------------------- -Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com - -- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 - - 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) - -------------------------------------------------------------------- -Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com - -- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b - - 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled - 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" - -------------------------------------------------------------------- -Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com - -- Drop support of compression from the mini package - - Hence remove the relevant build-requires from the mini package. - -------------------------------------------------------------------- -Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com - -- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) - - - package /etc/systemd/system/dbus-org.freedesktop.network1.service - - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled - ------------------------------------------------------------------- Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de @@ -116,7 +86,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com ------------------------------------------------------------------- Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com -- Make sure dracut (if installed) will embed the new compat rule +- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) The new compat rule must be embedded in the initramfs so make sure that the installed dracut supports it. diff --git a/systemd.spec b/systemd.spec index a6ebaa3a..680dcecb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -47,7 +47,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 234 +Version: 233 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -64,8 +64,6 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) %endif BuildRequires: fdupes @@ -83,6 +81,8 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libselinux) >= 2.1.9 @@ -952,9 +952,7 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so -%if %{with resolved} %{_prefix}/lib/systemd/resolv.conf -%endif %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -1034,11 +1032,9 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd}