SHA256
1
0
forked from pool/systemd

Accepting request 512646 from home:fbui:systemd:Factory

- 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)"

- Drop support for compression from the mini package
  Hence remove the relevant build-requires from the mini package.

- 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

- Make sure dracut (if installed) will embed the new compat rule
- 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)"

- Drop support of compression from the mini package
  Hence remove the relevant build-requires from the mini package.

- 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

- Make sure dracut (if installed) will embed the new compat rule

OBS-URL: https://build.opensuse.org/request/show/512646
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=983
This commit is contained in:
Franck Bui 2017-07-26 12:26:16 +00:00 committed by Git OBS Bridge
parent 6a096ce315
commit 63eb454e7b
6 changed files with 65 additions and 11 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:31fe0c3bea971e0dd40b9bec3f08080859ab3710f3882e0009582dd0bf16086d
size 3257376

3
systemd-234.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a9739b54b02f16519b7955de54a9b5cfe2d745d14d06a601651dd0dbc39e9315
size 3350120

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
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 Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de
@ -86,7 +109,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 7 08:17:54 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 (bsc#982303) - Make sure dracut (if installed) will embed the new compat rule
The new compat rule must be embedded in the initramfs so make sure The new compat rule must be embedded in the initramfs so make sure
that the installed dracut supports it. that the installed dracut supports it.

View File

@ -49,7 +49,7 @@
Name: systemd-mini Name: systemd-mini
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 233 Version: 234
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1+ License: LGPL-2.1+
@ -66,6 +66,8 @@ BuildRequires: libxslt-tools
BuildRequires: python3 BuildRequires: python3
BuildRequires: python3-lxml BuildRequires: python3-lxml
BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libqrencode)
%endif %endif
BuildRequires: fdupes BuildRequires: fdupes
@ -83,8 +85,6 @@ BuildRequires: suse-module-tools >= 12.4
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(blkid) >= 2.26
BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libkmod) >= 15
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpci) >= 3
BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libselinux) >= 2.1.9
@ -954,7 +954,9 @@ fi
%{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd-*
%{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/systemd
%{_prefix}/lib/systemd/libsystemd-shared-*.so %{_prefix}/lib/systemd/libsystemd-shared-*.so
%if %{with resolved}
%{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/resolv.conf
%endif
%{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh
%dir %{_prefix}/lib/systemd/catalog %dir %{_prefix}/lib/systemd/catalog
%{_prefix}/lib/systemd/catalog/systemd.catalog %{_prefix}/lib/systemd/catalog/systemd.catalog
@ -1034,9 +1036,11 @@ fi
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
%endif %endif
%if %{with networkd} %if %{with networkd}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf
%endif %endif
%if %{with resolved} %if %{with resolved}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%endif %endif
%if %{with importd} %if %{with importd}

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
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 Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de
@ -86,7 +109,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 7 08:17:54 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 (bsc#982303) - Make sure dracut (if installed) will embed the new compat rule
The new compat rule must be embedded in the initramfs so make sure The new compat rule must be embedded in the initramfs so make sure
that the installed dracut supports it. that the installed dracut supports it.

View File

@ -47,7 +47,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 233 Version: 234
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1+ License: LGPL-2.1+
@ -64,6 +64,8 @@ BuildRequires: libxslt-tools
BuildRequires: python3 BuildRequires: python3
BuildRequires: python3-lxml BuildRequires: python3-lxml
BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libqrencode)
%endif %endif
BuildRequires: fdupes BuildRequires: fdupes
@ -81,8 +83,6 @@ BuildRequires: suse-module-tools >= 12.4
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(blkid) >= 2.26
BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libkmod) >= 15
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpci) >= 3
BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libselinux) >= 2.1.9
@ -952,7 +952,9 @@ fi
%{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd-*
%{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/systemd
%{_prefix}/lib/systemd/libsystemd-shared-*.so %{_prefix}/lib/systemd/libsystemd-shared-*.so
%if %{with resolved}
%{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/resolv.conf
%endif
%{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh
%dir %{_prefix}/lib/systemd/catalog %dir %{_prefix}/lib/systemd/catalog
%{_prefix}/lib/systemd/catalog/systemd.catalog %{_prefix}/lib/systemd/catalog/systemd.catalog
@ -1032,9 +1034,11 @@ fi
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
%endif %endif
%if %{with networkd} %if %{with networkd}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf
%endif %endif
%if %{with resolved} %if %{with resolved}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%endif %endif
%if %{with importd} %if %{with importd}