Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2018-02-28 19:56:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Wed Feb 28 19:56:02 2018 rev:273 rq:580183 version:234 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2018-02-21 14:08:54.847715053 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2018-02-28 19:56:04.554414261 +0100 @@ -1,0 +2,28 @@ +Mon Feb 26 10:47:39 UTC 2018 - [email protected] + +- Fix build errors due to the split-off of systemd-containe: + + found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64: + - /usr/share/man/man5/systemd.nspawn.5.gz + - /usr/share/man/man1/systemd-nspawn.1.gz + found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64: + - /usr/bin/systemd-nspawn + - /usr/lib/systemd/system/[email protected] + - /usr/lib/tmpfiles.d/systemd-nspawn.conf + +------------------------------------------------------------------- +Thu Feb 22 15:11:13 UTC 2018 - [email protected] + +- Use %license (boo#1082318) + +------------------------------------------------------------------- +Thu Feb 22 14:57:19 UTC 2018 - [email protected] + +- Split systemd-container sub-package off + + Other distros already do it and it seems a good idea to not install + this stuff on new installations by default. At least + /var/lib/machines subvol is not created anymore at boot even if it + wasn't used at all. + +------------------------------------------------------------------- @@ -78 +106 @@ - we still ship a copy in /var. + we still ship a copy in /usr/share/systemd. @@ -81 +109 @@ - /etc/ pointing to the copy shipped in /var. + /etc/ pointing to the copy shipped in /usr/share/systemd. @@ -84 +112 @@ - tmp.mount in use is located in /usr. + tmp.mount in use is located in /usr/lib/systemd. systemd.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.Oo76xp/_old 2018-02-28 19:56:06.266352313 +0100 +++ /var/tmp/diff_new_pack.Oo76xp/_new 2018-02-28 19:56:06.274352024 +0100 @@ -293,6 +293,20 @@ This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. +%package container +Summary: Systemd tools for container management +License: LGPL-2.1+ +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires +Provides: systemd:%{_bindir}/systemd-nspawn + +%description container +Systemd tools to spawn and manage containers and virtual machines. + +This package contains systemd-nspawn, machinectl, systemd-machined, +and systemd-importd. + %if ! 0%{?bootstrap} %package logger Summary: Journal only logging @@ -461,6 +475,9 @@ mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* +rm %{buildroot}%{_bindir}/systemd-nspawn +rm %{buildroot}%{_unitdir}/[email protected] +rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf %endif # FIXME: these symlinks should die. @@ -697,23 +714,6 @@ %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : if [ $1 -gt 1 ]; then - # Convert /var/lib/machines subvolume to make it suitable for - # rollbacks, if needed. See bsc#992573. The installer has been fixed - # to create it at installation time. - # - # The convertion might only be problematic for openSUSE distros - # (TW/Factory) where previous versions had already created the - # subvolume at the wrong place (via tmpfiles for example) and user - # started to populate and use it. In this case we'll let the user fix - # it manually. - # - # For SLE12 this subvolume was only introduced during the upgrade from - # v210 to v228 when we added this workaround. Note that the subvolume - # is still created at the wrong place due to the call to - # tmpfiles_create macro previously however it's empty so there - # shouldn't be any issues. - %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : - # Migrate i18n setting stuff thout could be previously # configured in /etc/sysconfig but now is defined only in the # systemd official places (/etc/locale.conf, @@ -779,6 +779,26 @@ %postun -n libsystemd0%{?mini} -p /sbin/ldconfig %if ! 0%{?bootstrap} +%post container +if [ $1 -gt 1 ]; then + # Convert /var/lib/machines subvolume to make it suitable for + # rollbacks, if needed. See bsc#992573. The installer has been fixed + # to create it at installation time. + # + # The convertion might only be problematic for openSUSE distros + # (TW/Factory) where previous versions had already created the + # subvolume at the wrong place (via tmpfiles for example) and user + # started to populate and use it. In this case we'll let the user fix + # it manually. + # + # For SLE12 this subvolume was only introduced during the upgrade from + # v210 to v228 when we added this workaround. Note that the subvolume + # is still created at the wrong place due to the call to + # tmpfiles_create macro previously however it's empty so there + # shouldn't be any issues. + %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : +fi + %post logger %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then @@ -831,6 +851,7 @@ %files -f systemd.lang %defattr(-,root,root) +%license LICENSE* /bin/systemd /bin/systemd-ask-password /bin/systemctl @@ -842,9 +863,6 @@ %{_bindir}/kernel-install %{_bindir}/hostnamectl %{_bindir}/localectl -%if %{with machined} -%{_bindir}/machinectl -%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/coredumpctl @@ -864,7 +882,6 @@ %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup -%{_bindir}/systemd-nspawn %if %{with resolved} %{_bindir}/systemd-resolve %endif @@ -896,6 +913,24 @@ %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%exclude %{_unitdir}/[email protected] +%if %{with machined} +%exclude %{_prefix}/lib/systemd/systemd-machined +%exclude %{_unitdir}/systemd-machined.service +%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service +%exclude %{_unitdir}/var-lib-machines.mount +%exclude %{_unitdir}/machine.slice +%exclude %{_unitdir}/machines.target* +%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount +%endif +%if %{with importd} +%exclude %{_prefix}/lib/systemd/systemd-import* +%exclude %{_prefix}/lib/systemd/systemd-pull +%exclude %{_prefix}/lib/systemd/import-pubring.gpg +%exclude %{_unitdir}/systemd-importd.service +%exclude %{_unitdir}/dbus-org.freedesktop.import1.service +%endif + %{_unitdir}/*.automount %{_unitdir}/*.service %{_unitdir}/*.slice @@ -914,6 +949,7 @@ %{_prefix}/lib/systemd/resolv.conf %endif %{_prefix}/lib/systemd/scripts +%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %dir %{_journalcatalogdir} %{_journalcatalogdir}/systemd.catalog %{_journalcatalogdir}/systemd.*.catalog @@ -930,9 +966,6 @@ %dir %{_unitdir}/[email protected] %{_unitdir}/[email protected]/noclear.conf %{_unitdir}/[email protected]/nodelagate.conf -%if %{with importd} -%{_prefix}/lib/systemd/import-pubring.gpg -%endif /%{_lib}/security/pam_systemd.so %if %{with gnuefi} @@ -949,6 +982,7 @@ %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d %{_tmpfilesdir}/ +%exclude %{_tmpfilesdir}/systemd-nspawn.conf %if %{with journal_remote} %exclude %{_sysusersdir}/systemd-remote.conf @@ -998,9 +1032,6 @@ %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf -%if %{with machined} -%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf -%endif %if %{with networkd} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf @@ -1009,9 +1040,6 @@ %{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif -%if %{with importd} -%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf -%endif # Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf @@ -1043,12 +1071,6 @@ %if %{with resolved} %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %endif -%if %{with machined} -%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service -%endif -%if %{with importd} -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%endif %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -1057,12 +1079,6 @@ %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy -%if %{with machined} -%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy -%endif -%if %{with importd} -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif %if %{with networkd} %{_datadir}/polkit-1/rules.d/systemd-networkd.rules %endif @@ -1081,6 +1097,14 @@ %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man*/*nspawn* +%if %{with machined} +%exclude %{_mandir}/man*/machinectl* +%exclude %{_mandir}/man*/systemd-machined* +%endif +%if %{with importd} +%exclude %{_mandir}/man*/systemd-importd* +%endif %endif %{_docdir}/systemd @@ -1203,6 +1227,44 @@ %endif %if ! 0%{?bootstrap} +%files container +%defattr(-,root,root) +%{_bindir}/systemd-nspawn +%{_unitdir}/[email protected] +%{_tmpfilesdir}/systemd-nspawn.conf +%if %{with machined} +%{_bindir}/machinectl +%{_prefix}/lib/systemd/systemd-machined +%{_unitdir}/systemd-machined.service +%{_unitdir}/dbus-org.freedesktop.machine1.service +%{_unitdir}/var-lib-machines.mount +%{_unitdir}/machine.slice +%{_unitdir}/machines.target* +%{_unitdir}/*.target.wants/var-lib-machines.mount +%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh +%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service +%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%endif +%if %{with importd} +%{_prefix}/lib/systemd/systemd-import* +%{_prefix}/lib/systemd/systemd-pull +%{_prefix}/lib/systemd/import-pubring.gpg +%{_unitdir}/systemd-importd.service +%{_unitdir}/dbus-org.freedesktop.import1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service +%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy +%endif +%{_mandir}/man*/*nspawn* +%if %{with machined} +%{_mandir}/man*/machinectl* +%{_mandir}/man*/systemd-machined* +%endif +%if %{with importd} +%{_mandir}/man*/systemd-importd* +%endif + %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.Oo76xp/_old 2018-02-28 19:56:06.322350286 +0100 +++ /var/tmp/diff_new_pack.Oo76xp/_new 2018-02-28 19:56:06.326350142 +0100 @@ -291,6 +291,20 @@ This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. +%package container +Summary: Systemd tools for container management +License: LGPL-2.1+ +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires +Provides: systemd:%{_bindir}/systemd-nspawn + +%description container +Systemd tools to spawn and manage containers and virtual machines. + +This package contains systemd-nspawn, machinectl, systemd-machined, +and systemd-importd. + %if ! 0%{?bootstrap} %package logger Summary: Journal only logging @@ -459,6 +473,9 @@ mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* +rm %{buildroot}%{_bindir}/systemd-nspawn +rm %{buildroot}%{_unitdir}/[email protected] +rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf %endif # FIXME: these symlinks should die. @@ -695,23 +712,6 @@ %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : if [ $1 -gt 1 ]; then - # Convert /var/lib/machines subvolume to make it suitable for - # rollbacks, if needed. See bsc#992573. The installer has been fixed - # to create it at installation time. - # - # The convertion might only be problematic for openSUSE distros - # (TW/Factory) where previous versions had already created the - # subvolume at the wrong place (via tmpfiles for example) and user - # started to populate and use it. In this case we'll let the user fix - # it manually. - # - # For SLE12 this subvolume was only introduced during the upgrade from - # v210 to v228 when we added this workaround. Note that the subvolume - # is still created at the wrong place due to the call to - # tmpfiles_create macro previously however it's empty so there - # shouldn't be any issues. - %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : - # Migrate i18n setting stuff thout could be previously # configured in /etc/sysconfig but now is defined only in the # systemd official places (/etc/locale.conf, @@ -777,6 +777,26 @@ %postun -n libsystemd0%{?mini} -p /sbin/ldconfig %if ! 0%{?bootstrap} +%post container +if [ $1 -gt 1 ]; then + # Convert /var/lib/machines subvolume to make it suitable for + # rollbacks, if needed. See bsc#992573. The installer has been fixed + # to create it at installation time. + # + # The convertion might only be problematic for openSUSE distros + # (TW/Factory) where previous versions had already created the + # subvolume at the wrong place (via tmpfiles for example) and user + # started to populate and use it. In this case we'll let the user fix + # it manually. + # + # For SLE12 this subvolume was only introduced during the upgrade from + # v210 to v228 when we added this workaround. Note that the subvolume + # is still created at the wrong place due to the call to + # tmpfiles_create macro previously however it's empty so there + # shouldn't be any issues. + %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : +fi + %post logger %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then @@ -829,6 +849,7 @@ %files -f systemd.lang %defattr(-,root,root) +%license LICENSE* /bin/systemd /bin/systemd-ask-password /bin/systemctl @@ -840,9 +861,6 @@ %{_bindir}/kernel-install %{_bindir}/hostnamectl %{_bindir}/localectl -%if %{with machined} -%{_bindir}/machinectl -%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/coredumpctl @@ -862,7 +880,6 @@ %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup -%{_bindir}/systemd-nspawn %if %{with resolved} %{_bindir}/systemd-resolve %endif @@ -894,6 +911,24 @@ %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%exclude %{_unitdir}/[email protected] +%if %{with machined} +%exclude %{_prefix}/lib/systemd/systemd-machined +%exclude %{_unitdir}/systemd-machined.service +%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service +%exclude %{_unitdir}/var-lib-machines.mount +%exclude %{_unitdir}/machine.slice +%exclude %{_unitdir}/machines.target* +%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount +%endif +%if %{with importd} +%exclude %{_prefix}/lib/systemd/systemd-import* +%exclude %{_prefix}/lib/systemd/systemd-pull +%exclude %{_prefix}/lib/systemd/import-pubring.gpg +%exclude %{_unitdir}/systemd-importd.service +%exclude %{_unitdir}/dbus-org.freedesktop.import1.service +%endif + %{_unitdir}/*.automount %{_unitdir}/*.service %{_unitdir}/*.slice @@ -912,6 +947,7 @@ %{_prefix}/lib/systemd/resolv.conf %endif %{_prefix}/lib/systemd/scripts +%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %dir %{_journalcatalogdir} %{_journalcatalogdir}/systemd.catalog %{_journalcatalogdir}/systemd.*.catalog @@ -928,9 +964,6 @@ %dir %{_unitdir}/[email protected] %{_unitdir}/[email protected]/noclear.conf %{_unitdir}/[email protected]/nodelagate.conf -%if %{with importd} -%{_prefix}/lib/systemd/import-pubring.gpg -%endif /%{_lib}/security/pam_systemd.so %if %{with gnuefi} @@ -947,6 +980,7 @@ %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d %{_tmpfilesdir}/ +%exclude %{_tmpfilesdir}/systemd-nspawn.conf %if %{with journal_remote} %exclude %{_sysusersdir}/systemd-remote.conf @@ -996,9 +1030,6 @@ %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf -%if %{with machined} -%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf -%endif %if %{with networkd} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf @@ -1007,9 +1038,6 @@ %{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif -%if %{with importd} -%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf -%endif # Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf @@ -1041,12 +1069,6 @@ %if %{with resolved} %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %endif -%if %{with machined} -%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service -%endif -%if %{with importd} -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%endif %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -1055,12 +1077,6 @@ %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy -%if %{with machined} -%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy -%endif -%if %{with importd} -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif %if %{with networkd} %{_datadir}/polkit-1/rules.d/systemd-networkd.rules %endif @@ -1079,6 +1095,14 @@ %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man*/*nspawn* +%if %{with machined} +%exclude %{_mandir}/man*/machinectl* +%exclude %{_mandir}/man*/systemd-machined* +%endif +%if %{with importd} +%exclude %{_mandir}/man*/systemd-importd* +%endif %endif %{_docdir}/systemd @@ -1201,6 +1225,44 @@ %endif %if ! 0%{?bootstrap} +%files container +%defattr(-,root,root) +%{_bindir}/systemd-nspawn +%{_unitdir}/[email protected] +%{_tmpfilesdir}/systemd-nspawn.conf +%if %{with machined} +%{_bindir}/machinectl +%{_prefix}/lib/systemd/systemd-machined +%{_unitdir}/systemd-machined.service +%{_unitdir}/dbus-org.freedesktop.machine1.service +%{_unitdir}/var-lib-machines.mount +%{_unitdir}/machine.slice +%{_unitdir}/machines.target* +%{_unitdir}/*.target.wants/var-lib-machines.mount +%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh +%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service +%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%endif +%if %{with importd} +%{_prefix}/lib/systemd/systemd-import* +%{_prefix}/lib/systemd/systemd-pull +%{_prefix}/lib/systemd/import-pubring.gpg +%{_unitdir}/systemd-importd.service +%{_unitdir}/dbus-org.freedesktop.import1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service +%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy +%endif +%{_mandir}/man*/*nspawn* +%if %{with machined} +%{_mandir}/man*/machinectl* +%{_mandir}/man*/systemd-machined* +%endif +%if %{with importd} +%{_mandir}/man*/systemd-importd* +%endif + %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
