From 72ba9b1b884f74359f270fc6e7f827cdf3e423dd9ef43ffd2b513de0d024ce3a Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Thu, 8 Dec 2016 13:23:11 +0000 Subject: [PATCH 1/4] Accepting request 444813 from home:fbui:systemd:Factory - Good bye compatlibs support There's no longer need for enabling/disabling the support for the compatlibs as it's been dropped from the source code. - Drop /usr/lib/systemd/libsystemd-shared-%{version}.so from the 32bit package This shared library is not for public use, and is neither API nor ABI stable, but is likely to change with every new released update. Only systemd binaries are supposed to link against it. This also prevents from the 32bit package to conflit with the 64bit one if this lib was installed by both packages. - Upgrade to v232, commit c5c3445825981e2a5c3ed71214127d5b1b9de802: - Dropped backported commits which has been merged - Forward-port Suse specific patches - Added --disable-lto option to ./configure - Added systemd-mount - Removed in %file /usr/lib/systemd/user/*.socket: since 798c486fbcdce3346cd86 units/systemd-bus-proxyd.socket has been removed. - Removed in %file %{_sysconfdir}/systemd/bootchart.conf since commit 232c84b2d22f2d96982b3c bootchart is not part of systemd anymore. - Backward compat libs have been disabled since it's been dropped from the source code. - Added /usr/bin/systemd-socket-activate in %file - Added --without-kill-user-processes ./configure option - Bump libseccomp build require (>= 2.3.1) as described in README - Specifiy version of libmount as required in the README OBS-URL: https://build.opensuse.org/request/show/444813 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=963 --- baselibs.conf | 4 +++ systemd-228.tar.xz | 3 -- systemd-232.tar.xz | 3 ++ systemd-mini-rpmlintrc | 1 + systemd-mini.changes | 42 ++++++++++++++++++++++++++++ systemd-mini.spec | 63 +++++++++++++++++++++++++----------------- systemd-rpmlintrc | 1 + systemd.changes | 42 ++++++++++++++++++++++++++++ systemd.spec | 63 +++++++++++++++++++++++++----------------- 9 files changed, 169 insertions(+), 53 deletions(-) delete mode 100644 systemd-228.tar.xz create mode 100644 systemd-232.tar.xz diff --git a/baselibs.conf b/baselibs.conf index 9c73aa0..073ad0e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,10 @@ +# +# https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart +# systemd supplements "packageand(systemd:pam-)" -/lib/systemd/system/ + -/usr/lib/systemd/libsystemd-shared.*\.so post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 diff --git a/systemd-228.tar.xz b/systemd-228.tar.xz deleted file mode 100644 index c8f3fdc..0000000 --- a/systemd-228.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:141d1609469579adeaf62d76e3527149c5a0140a54c8538f706b4eb97a447f8a -size 2866192 diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz new file mode 100644 index 0000000..3fc3c44 --- /dev/null +++ b/systemd-232.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b2f98e7ce22841f533949ebb89d23683598f4adbf909739ad0a7d2517f5affc +size 3211692 diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index a9e12af..5b7980e 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -16,6 +16,7 @@ addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") addFilter(".*libgudev-.*shlib-fixed-dependency.*") addFilter(".*suse-filelist-forbidden-systemd-userdirs.*") addFilter("libudev-mini.*shlib-policy-name-error.*") +addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") diff --git a/systemd-mini.changes b/systemd-mini.changes index ddcda17..0c22177 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Tue Dec 6 16:46:52 UTC 2016 - fbui@suse.com + +- Good by compatlibs support + + There's no longer need for enabling/disabling the support for the + compatlibs as it's been dropped from the source code. + +------------------------------------------------------------------- +Tue Nov 29 16:38:41 UTC 2016 - fbui@suse.com + +- Drop /usr/lib/systemd/libsystemd-shared-%{version}.so from the 32bit package + + This shared library is not for public use, and is neither API nor + ABI stable, but is likely to change with every new released + update. Only systemd binaries are supposed to link against it. + + This also prevents from the 32bit package to conflit with the 64bit + one if this lib was installed by both packages. + +------------------------------------------------------------------- +Tue Nov 22 15:02:08 UTC 2016 - fbui@suse.com + +- Upgrade to v232, commit c5c3445825981e2a5c3ed71214127d5b1b9de802: + + - Dropped backported commits which has been merged + - Forward-port Suse specific patches + - Added --disable-lto option to ./configure + - Added systemd-mount + - Removed in %file /usr/lib/systemd/user/*.socket: since + 798c486fbcdce3346cd86 units/systemd-bus-proxyd.socket has been + removed. + - Removed in %file %{_sysconfdir}/systemd/bootchart.conf + since commit 232c84b2d22f2d96982b3c bootchart is not part of systemd + anymore. + - Backward compat libs have been disabled since it's been dropped from + the source code. + - Added /usr/bin/systemd-socket-activate in %file + - Added --without-kill-user-processes ./configure option + - Bump libseccomp build require (>= 2.3.1) as described in README + - Specifiy version of libmount as required in the README + ------------------------------------------------------------------- Fri Nov 18 21:07:11 UTC 2016 - meissner@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 800b586..f25087e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -44,13 +44,12 @@ %bcond_without gnuefi %endif %endif -%bcond_without compatlibs %bcond_with resolved %bcond_with parentpathid Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 228 +Version: 232 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -74,7 +73,7 @@ BuildRequires: gperf BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel -BuildRequires: libmount-devel +BuildRequires: libmount-devel >= 2.27.1 BuildRequires: libsepol-devel BuildRequires: libtool BuildRequires: pam-config >= 0.79-5 @@ -101,7 +100,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x -BuildRequires: pkgconfig(libseccomp) +BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif %if %{with gnuefi} BuildRequires: gnu-efi @@ -302,6 +301,19 @@ Conflicts: otherproviders(syslog) %description logger This package marks the installation to not use syslog but only the journal. +%package -n nss-systemd +Summary: Plugin for local virtual host name resolution +License: LGPL-2.1+ +Group: System/Libraries + +%description -n nss-systemd +This package contains a plugin for the Name Service Switch (NSS), +which enables resolution of all dynamically allocated service +users. (See the DynamicUser= setting in unit files.) + +To activate this NSS module, you will need to include it in +/etc/nsswitch.conf, see nss-systemd(8) manpage for more details. + %package -n nss-resolve Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1+ @@ -418,14 +430,13 @@ systemd_cryptsetup_LDFLAGS =\\\ %if 0%{?bootstrap} --disable-myhostname \ --disable-manpages \ -%endif -%if %{with compatlibs} - --enable-compat-libs \ %endif --enable-selinux \ --enable-split-usr \ --disable-static \ + --disable-lto \ --disable-tests \ + --without-kill-user-processes \ --with-rc-local-script-path-start=/etc/init.d/boot.local \ --with-rc-local-script-path-stop=/etc/init.d/halt.local \ --with-debug-shell=/bin/bash \ @@ -456,6 +467,8 @@ make %{?_smp_mflags} V=e # move to %{_lib} %if ! 0%{?bootstrap} mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} +%else +rm %{buildroot}%{_libdir}/libnss_systemd.so* %endif # FIXME: these symlinks should die. @@ -503,6 +516,10 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf sg EOF +# Remove .so file for the shared library, it's not supposed to be +# used. +rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so + # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf @@ -787,6 +804,9 @@ fi %post -n nss-myhostname -p /sbin/ldconfig %postun -n nss-myhostname -p /sbin/ldconfig + +%post -n nss-systemd -p /sbin/ldconfig +%postun -n nss-systemd -p /sbin/ldconfig %endif %if %{with resolved} @@ -849,6 +869,7 @@ fi %{_bindir}/systemd-firstboot %{_bindir}/systemd-path %{_bindir}/systemd-sysusers +%{_bindir}/systemd-mount %{_bindir}/systemd-notify %{_bindir}/systemd-run %{_bindir}/systemd-journalctl @@ -861,6 +882,7 @@ fi %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup %{_bindir}/systemd-nspawn +%{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl @@ -897,9 +919,10 @@ fi %{_prefix}/lib/systemd/system/*.path %{_prefix}/lib/systemd/user/*.target %{_prefix}/lib/systemd/user/*.service -%{_prefix}/lib/systemd/user/*.socket %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd +%{_prefix}/lib/systemd/libsystemd-shared-%{version}.so +%{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -954,11 +977,11 @@ fi %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd +%{_sysconfdir}/systemd/system/ctrl-alt-del.target %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user -%config(noreplace) %{_sysconfdir}/systemd/bootchart.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf @@ -1092,16 +1115,6 @@ fi %{_libdir}/libsystemd.so %{_libdir}/pkgconfig/libsystemd.pc %{_includedir}/systemd/ -%if %{with compatlibs} -%{_libdir}/libsystemd-daemon.so -%{_libdir}/libsystemd-login.so -%{_libdir}/libsystemd-id128.so -%{_libdir}/libsystemd-journal.so -%{_libdir}/pkgconfig/libsystemd-daemon.pc -%{_libdir}/pkgconfig/libsystemd-login.pc -%{_libdir}/pkgconfig/libsystemd-id128.pc -%{_libdir}/pkgconfig/libsystemd-journal.pc -%endif %if ! 0%{?bootstrap} %{_mandir}/man3/SD*.3* %{_mandir}/man3/sd*.3* @@ -1181,12 +1194,6 @@ fi %files -n libsystemd0%{?mini} %defattr(-,root,root) %{_libdir}/libsystemd.so.* -%if %{with compatlibs} -%{_libdir}/libsystemd-daemon.so.* -%{_libdir}/libsystemd-login.so.* -%{_libdir}/libsystemd-id128.so.* -%{_libdir}/libsystemd-journal.so.* -%endif %files -n libudev%{?mini}1 %defattr(-,root,root) @@ -1214,6 +1221,12 @@ fi /%{_lib}/*nss_myhostname* %{_mandir}/man8/libnss_myhostname.* %{_mandir}/man8/nss-myhostname.* + +%files -n nss-systemd +%defattr(-, root, root) +%{_libdir}/libnss_systemd.so* +%{_mandir}/man8/libnss_systemd.so.* +%{_mandir}/man8/nss-systemd.* %endif %if %{with resolved} diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index a9e12af..5b7980e 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -16,6 +16,7 @@ addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") addFilter(".*libgudev-.*shlib-fixed-dependency.*") addFilter(".*suse-filelist-forbidden-systemd-userdirs.*") addFilter("libudev-mini.*shlib-policy-name-error.*") +addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") diff --git a/systemd.changes b/systemd.changes index ddcda17..0c22177 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Tue Dec 6 16:46:52 UTC 2016 - fbui@suse.com + +- Good by compatlibs support + + There's no longer need for enabling/disabling the support for the + compatlibs as it's been dropped from the source code. + +------------------------------------------------------------------- +Tue Nov 29 16:38:41 UTC 2016 - fbui@suse.com + +- Drop /usr/lib/systemd/libsystemd-shared-%{version}.so from the 32bit package + + This shared library is not for public use, and is neither API nor + ABI stable, but is likely to change with every new released + update. Only systemd binaries are supposed to link against it. + + This also prevents from the 32bit package to conflit with the 64bit + one if this lib was installed by both packages. + +------------------------------------------------------------------- +Tue Nov 22 15:02:08 UTC 2016 - fbui@suse.com + +- Upgrade to v232, commit c5c3445825981e2a5c3ed71214127d5b1b9de802: + + - Dropped backported commits which has been merged + - Forward-port Suse specific patches + - Added --disable-lto option to ./configure + - Added systemd-mount + - Removed in %file /usr/lib/systemd/user/*.socket: since + 798c486fbcdce3346cd86 units/systemd-bus-proxyd.socket has been + removed. + - Removed in %file %{_sysconfdir}/systemd/bootchart.conf + since commit 232c84b2d22f2d96982b3c bootchart is not part of systemd + anymore. + - Backward compat libs have been disabled since it's been dropped from + the source code. + - Added /usr/bin/systemd-socket-activate in %file + - Added --without-kill-user-processes ./configure option + - Bump libseccomp build require (>= 2.3.1) as described in README + - Specifiy version of libmount as required in the README + ------------------------------------------------------------------- Fri Nov 18 21:07:11 UTC 2016 - meissner@suse.com diff --git a/systemd.spec b/systemd.spec index 2ad1f88..7608466 100644 --- a/systemd.spec +++ b/systemd.spec @@ -42,13 +42,12 @@ %bcond_without gnuefi %endif %endif -%bcond_without compatlibs %bcond_with resolved %bcond_with parentpathid Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 228 +Version: 232 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -72,7 +71,7 @@ BuildRequires: gperf BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel -BuildRequires: libmount-devel +BuildRequires: libmount-devel >= 2.27.1 BuildRequires: libsepol-devel BuildRequires: libtool BuildRequires: pam-config >= 0.79-5 @@ -99,7 +98,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x -BuildRequires: pkgconfig(libseccomp) +BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif %if %{with gnuefi} BuildRequires: gnu-efi @@ -300,6 +299,19 @@ Conflicts: otherproviders(syslog) %description logger This package marks the installation to not use syslog but only the journal. +%package -n nss-systemd +Summary: Plugin for local virtual host name resolution +License: LGPL-2.1+ +Group: System/Libraries + +%description -n nss-systemd +This package contains a plugin for the Name Service Switch (NSS), +which enables resolution of all dynamically allocated service +users. (See the DynamicUser= setting in unit files.) + +To activate this NSS module, you will need to include it in +/etc/nsswitch.conf, see nss-systemd(8) manpage for more details. + %package -n nss-resolve Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1+ @@ -416,14 +428,13 @@ systemd_cryptsetup_LDFLAGS =\\\ %if 0%{?bootstrap} --disable-myhostname \ --disable-manpages \ -%endif -%if %{with compatlibs} - --enable-compat-libs \ %endif --enable-selinux \ --enable-split-usr \ --disable-static \ + --disable-lto \ --disable-tests \ + --without-kill-user-processes \ --with-rc-local-script-path-start=/etc/init.d/boot.local \ --with-rc-local-script-path-stop=/etc/init.d/halt.local \ --with-debug-shell=/bin/bash \ @@ -454,6 +465,8 @@ make %{?_smp_mflags} V=e # move to %{_lib} %if ! 0%{?bootstrap} mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} +%else +rm %{buildroot}%{_libdir}/libnss_systemd.so* %endif # FIXME: these symlinks should die. @@ -501,6 +514,10 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf sg EOF +# Remove .so file for the shared library, it's not supposed to be +# used. +rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so + # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf @@ -785,6 +802,9 @@ fi %post -n nss-myhostname -p /sbin/ldconfig %postun -n nss-myhostname -p /sbin/ldconfig + +%post -n nss-systemd -p /sbin/ldconfig +%postun -n nss-systemd -p /sbin/ldconfig %endif %if %{with resolved} @@ -847,6 +867,7 @@ fi %{_bindir}/systemd-firstboot %{_bindir}/systemd-path %{_bindir}/systemd-sysusers +%{_bindir}/systemd-mount %{_bindir}/systemd-notify %{_bindir}/systemd-run %{_bindir}/systemd-journalctl @@ -859,6 +880,7 @@ fi %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup %{_bindir}/systemd-nspawn +%{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl @@ -895,9 +917,10 @@ fi %{_prefix}/lib/systemd/system/*.path %{_prefix}/lib/systemd/user/*.target %{_prefix}/lib/systemd/user/*.service -%{_prefix}/lib/systemd/user/*.socket %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd +%{_prefix}/lib/systemd/libsystemd-shared-%{version}.so +%{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -952,11 +975,11 @@ fi %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd +%{_sysconfdir}/systemd/system/ctrl-alt-del.target %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user -%config(noreplace) %{_sysconfdir}/systemd/bootchart.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf @@ -1090,16 +1113,6 @@ fi %{_libdir}/libsystemd.so %{_libdir}/pkgconfig/libsystemd.pc %{_includedir}/systemd/ -%if %{with compatlibs} -%{_libdir}/libsystemd-daemon.so -%{_libdir}/libsystemd-login.so -%{_libdir}/libsystemd-id128.so -%{_libdir}/libsystemd-journal.so -%{_libdir}/pkgconfig/libsystemd-daemon.pc -%{_libdir}/pkgconfig/libsystemd-login.pc -%{_libdir}/pkgconfig/libsystemd-id128.pc -%{_libdir}/pkgconfig/libsystemd-journal.pc -%endif %if ! 0%{?bootstrap} %{_mandir}/man3/SD*.3* %{_mandir}/man3/sd*.3* @@ -1179,12 +1192,6 @@ fi %files -n libsystemd0%{?mini} %defattr(-,root,root) %{_libdir}/libsystemd.so.* -%if %{with compatlibs} -%{_libdir}/libsystemd-daemon.so.* -%{_libdir}/libsystemd-login.so.* -%{_libdir}/libsystemd-id128.so.* -%{_libdir}/libsystemd-journal.so.* -%endif %files -n libudev%{?mini}1 %defattr(-,root,root) @@ -1212,6 +1219,12 @@ fi /%{_lib}/*nss_myhostname* %{_mandir}/man8/libnss_myhostname.* %{_mandir}/man8/nss-myhostname.* + +%files -n nss-systemd +%defattr(-, root, root) +%{_libdir}/libnss_systemd.so* +%{_mandir}/man8/libnss_systemd.so.* +%{_mandir}/man8/nss-systemd.* %endif %if %{with resolved} From ce6f33969ffa3aec220935895be6859c2f95f84efba4e111deffe9a2135a5239 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Wed, 14 Dec 2016 16:08:32 +0000 Subject: [PATCH 2/4] Accepting request 445798 from home:fbui:systemd:Factory - Really include legacy kbd maps in kbd-model-map (bsc#1015515) Instead of fix-machines-subvol-for-rollbacks.sh... - Enable lz4 (which becomes the default) It's much faster than xz and thus should be more appropriate to compress journals and coredumps. The LZ4 logic is now officially supported and no longer considered experimental. The new frame api was released in v125. OBS-URL: https://build.opensuse.org/request/show/445798 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=964 --- systemd-mini.changes | 20 ++++++++++++++++++++ systemd-mini.spec | 6 +++--- systemd.changes | 20 ++++++++++++++++++++ systemd.spec | 6 +++--- 4 files changed, 46 insertions(+), 6 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 0c22177..29e1dbd 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Dec 14 14:51:41 UTC 2016 - fbui@suse.com + +- Really include legacy kbd maps in kbd-model-map (bsc#1015515) + + Instead of fix-machines-subvol-for-rollbacks.sh... + +------------------------------------------------------------------- +Thu Dec 8 12:55:51 UTC 2016 - fbui@suse.com + +- Enable lz4 (which becomes the default) + + It's much faster than xz and thus should be more appropriate to + compress journals and coredumps. + + The LZ4 logic is now officially supported and no longer considered + experimental. + + The new frame api was released in v125. + ------------------------------------------------------------------- Tue Dec 6 16:46:52 UTC 2016 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index f25087e..17d2860 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -82,9 +82,9 @@ BuildRequires: pam-devel # BR. Also this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros -BuildRequires: xz BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 +BuildRequires: pkgconfig(liblz4) >= 125 BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) @@ -463,6 +463,7 @@ make %{?_smp_mflags} V=e %install %make_install +find %{buildroot} -type f -name '*.la' -delete # move to %{_lib} %if ! 0%{?bootstrap} @@ -480,7 +481,6 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs rm -rf %{buildroot}%{_sysconfdir}/rpm -find %{buildroot} -type f -name '*.la' -delete mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -635,7 +635,7 @@ fi # kbd-model-map.legacy is used to provide mapping for legacy keymaps, # which may still be used by yast. -cat %{S:13} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map %find_lang systemd diff --git a/systemd.changes b/systemd.changes index 0c22177..29e1dbd 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Dec 14 14:51:41 UTC 2016 - fbui@suse.com + +- Really include legacy kbd maps in kbd-model-map (bsc#1015515) + + Instead of fix-machines-subvol-for-rollbacks.sh... + +------------------------------------------------------------------- +Thu Dec 8 12:55:51 UTC 2016 - fbui@suse.com + +- Enable lz4 (which becomes the default) + + It's much faster than xz and thus should be more appropriate to + compress journals and coredumps. + + The LZ4 logic is now officially supported and no longer considered + experimental. + + The new frame api was released in v125. + ------------------------------------------------------------------- Tue Dec 6 16:46:52 UTC 2016 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 7608466..cf2e2a0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -80,9 +80,9 @@ BuildRequires: pam-devel # BR. Also this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros -BuildRequires: xz BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 +BuildRequires: pkgconfig(liblz4) >= 125 BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) @@ -461,6 +461,7 @@ make %{?_smp_mflags} V=e %install %make_install +find %{buildroot} -type f -name '*.la' -delete # move to %{_lib} %if ! 0%{?bootstrap} @@ -478,7 +479,6 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs rm -rf %{buildroot}%{_sysconfdir}/rpm -find %{buildroot} -type f -name '*.la' -delete mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -633,7 +633,7 @@ fi # kbd-model-map.legacy is used to provide mapping for legacy keymaps, # which may still be used by yast. -cat %{S:13} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map %find_lang systemd From 5e5cc2c23995525dcd3b09e4b0cb07368af3a107968b01db5f4cbb0d5d3e1bd8 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Tue, 20 Dec 2016 08:22:16 +0000 Subject: [PATCH 3/4] Accepting request 447029 from home:fbui:systemd:Factory - Upgrade to v232, commit de62e96da6a62ac61a7dea45cc558f5fa4342032 - a4dff165d nspawn: resolv.conf might not be created initially (#4799) - b543fe907 nspawn: fix condition for mounting resolv.conf (#4622) - 1aed89e55 core: make mount units from /proc/self/mountinfo possibly bind to a device (#4515) (boo#909418 bsc#912715 bsc#945340) - bfb54ecdc coredumpctl: let gdb handle the SIGINT signal (#4901) (bsc#1012591) OBS-URL: https://build.opensuse.org/request/show/447029 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=965 --- systemd-232.tar.xz | 4 ++-- systemd-mini.changes | 10 ++++++++++ systemd.changes | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz index 3fc3c44..e4e3a8a 100644 --- a/systemd-232.tar.xz +++ b/systemd-232.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b2f98e7ce22841f533949ebb89d23683598f4adbf909739ad0a7d2517f5affc -size 3211692 +oid sha256:b5bb6b2c38604d082aa1afc46bbb24476142826474e7bf1be8bb85a50117893e +size 3211232 diff --git a/systemd-mini.changes b/systemd-mini.changes index 29e1dbd..3ac654c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com + +- Upgrade to v232, commit de62e96da6a62ac61a7dea45cc558f5fa4342032 + + - a4dff165d nspawn: resolv.conf might not be created initially (#4799) + - b543fe907 nspawn: fix condition for mounting resolv.conf (#4622) + - 1aed89e55 core: make mount units from /proc/self/mountinfo possibly bind to a device (#4515) (boo#909418 bsc#912715 bsc#945340) + - bfb54ecdc coredumpctl: let gdb handle the SIGINT signal (#4901) (bsc#1012591) + ------------------------------------------------------------------- Wed Dec 14 14:51:41 UTC 2016 - fbui@suse.com diff --git a/systemd.changes b/systemd.changes index 29e1dbd..3ac654c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com + +- Upgrade to v232, commit de62e96da6a62ac61a7dea45cc558f5fa4342032 + + - a4dff165d nspawn: resolv.conf might not be created initially (#4799) + - b543fe907 nspawn: fix condition for mounting resolv.conf (#4622) + - 1aed89e55 core: make mount units from /proc/self/mountinfo possibly bind to a device (#4515) (boo#909418 bsc#912715 bsc#945340) + - bfb54ecdc coredumpctl: let gdb handle the SIGINT signal (#4901) (bsc#1012591) + ------------------------------------------------------------------- Wed Dec 14 14:51:41 UTC 2016 - fbui@suse.com From fc9cb37b753abbcb33eda4420e1df72efa579a06b1d8b0eb27f2f6495f572473 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 11 Jan 2017 15:31:45 +0000 Subject: [PATCH 4/4] Accepting request 449530 from home:fbui:systemd:Factory - Import commit 3edb876e3b80437a95502aa5d31d454606ea94bd 27b544224 core: make sure to not call device_is_bound_by_mounts() when dev is null (#5033) (bsc#1018399) - Use the %{resolved} build conditional for the nss-resolve subpackage - /usr/bin/systemd-resolve was missing from the filelist - Silent warnings emitted when udev socket units are restarted during package upgrade (bsc#1018214) OBS-URL: https://build.opensuse.org/request/show/449530 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=966 --- systemd-232.tar.xz | 4 ++-- systemd-mini.changes | 22 ++++++++++++++++++++++ systemd-mini.spec | 45 +++++++++++++++++++++++++++----------------- systemd.changes | 22 ++++++++++++++++++++++ systemd.spec | 45 +++++++++++++++++++++++++++----------------- 5 files changed, 102 insertions(+), 36 deletions(-) diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz index e4e3a8a..904a437 100644 --- a/systemd-232.tar.xz +++ b/systemd-232.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5bb6b2c38604d082aa1afc46bbb24476142826474e7bf1be8bb85a50117893e -size 3211232 +oid sha256:a0f63b20f91eeed656a9d2bf9ad453cd7cfbb786663714b9b17886624f5ea69c +size 3211060 diff --git a/systemd-mini.changes b/systemd-mini.changes index 3ac654c..ac7b036 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jan 10 10:54:20 UTC 2017 - fbui@suse.com + +- Import commit 3edb876e3b80437a95502aa5d31d454606ea94bd + + 27b544224 core: make sure to not call device_is_bound_by_mounts() when dev is null (#5033) (bsc#1018399) + +------------------------------------------------------------------- +Fri Jan 6 08:27:03 UTC 2017 - fbui@suse.com + +- Use the %{resolved} build conditional for the nss-resolve subpackage + +------------------------------------------------------------------- +Thu Jan 5 17:46:44 UTC 2017 - fbui@suse.com + +- /usr/bin/systemd-resolve was missing from the filelist + +------------------------------------------------------------------- +Thu Jan 5 17:09:01 UTC 2017 - fbui@suse.com + +- Silent warnings emitted when udev socket units are restarted during package upgrade (bsc#1018214) + ------------------------------------------------------------------- Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 17d2860..0ea7287 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-mini # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -314,21 +314,6 @@ users. (See the DynamicUser= setting in unit files.) To activate this NSS module, you will need to include it in /etc/nsswitch.conf, see nss-systemd(8) manpage for more details. -%package -n nss-resolve -Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1+ -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description -n nss-resolve -This package contains a plug-in module for the Name Service Switch -(NSS), which enables host name resolutions via the systemd-resolved(8) -local network name resolution service. It replaces the nss-dns plug-in -module that traditionally resolves hostnames via DNS. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. - %package -n nss-myhostname Summary: Plugin for local system host name resolution License: LGPL-2.1+ @@ -345,6 +330,23 @@ To activate this NSS module, you will need to include it in /etc/nsswitch.conf, see nss-hostname(8) manpage for more details. %endif +%if %{with resolved} +%package -n nss-resolve +Summary: Plugin for local hostname resolution via systemd-resolved +License: LGPL-2.1+ +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n nss-resolve +This package contains a plug-in module for the Name Service Switch +(NSS), which enables host name resolutions via the systemd-resolved(8) +local network name resolution service. It replaces the nss-dns plug-in +module that traditionally resolves hostnames via DNS. + +To activate this NSS module, you will need to include it in +/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. +%endif + %if %{with machined} %package -n nss-mymachines Summary: Plugin for local virtual host name resolution @@ -783,7 +785,13 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %regenerate_initrd_post %insserv_cleanup systemctl daemon-reload || : -%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket systemd-udevd.service +# On package update: the restart of the socket units will probably +# fail as the daemon is most likely running. It's not really an issue +# since we restart systemd-udevd right after and that will pull in the +# socket units again. We should be informed at that time if something +# really went wrong the first time we started the socket units. +%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null +%systemd_postun_with_restart systemd-udevd.service %posttrans -n udev%{?mini} %regenerate_initrd_posttrans @@ -882,6 +890,9 @@ fi %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup %{_bindir}/systemd-nspawn +%if %{with resolved} +%{_bindir}/systemd-resolve +%endif %{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt diff --git a/systemd.changes b/systemd.changes index 3ac654c..ac7b036 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jan 10 10:54:20 UTC 2017 - fbui@suse.com + +- Import commit 3edb876e3b80437a95502aa5d31d454606ea94bd + + 27b544224 core: make sure to not call device_is_bound_by_mounts() when dev is null (#5033) (bsc#1018399) + +------------------------------------------------------------------- +Fri Jan 6 08:27:03 UTC 2017 - fbui@suse.com + +- Use the %{resolved} build conditional for the nss-resolve subpackage + +------------------------------------------------------------------- +Thu Jan 5 17:46:44 UTC 2017 - fbui@suse.com + +- /usr/bin/systemd-resolve was missing from the filelist + +------------------------------------------------------------------- +Thu Jan 5 17:09:01 UTC 2017 - fbui@suse.com + +- Silent warnings emitted when udev socket units are restarted during package upgrade (bsc#1018214) + ------------------------------------------------------------------- Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index cf2e2a0..5b84fd7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -312,21 +312,6 @@ users. (See the DynamicUser= setting in unit files.) To activate this NSS module, you will need to include it in /etc/nsswitch.conf, see nss-systemd(8) manpage for more details. -%package -n nss-resolve -Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1+ -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description -n nss-resolve -This package contains a plug-in module for the Name Service Switch -(NSS), which enables host name resolutions via the systemd-resolved(8) -local network name resolution service. It replaces the nss-dns plug-in -module that traditionally resolves hostnames via DNS. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. - %package -n nss-myhostname Summary: Plugin for local system host name resolution License: LGPL-2.1+ @@ -343,6 +328,23 @@ To activate this NSS module, you will need to include it in /etc/nsswitch.conf, see nss-hostname(8) manpage for more details. %endif +%if %{with resolved} +%package -n nss-resolve +Summary: Plugin for local hostname resolution via systemd-resolved +License: LGPL-2.1+ +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n nss-resolve +This package contains a plug-in module for the Name Service Switch +(NSS), which enables host name resolutions via the systemd-resolved(8) +local network name resolution service. It replaces the nss-dns plug-in +module that traditionally resolves hostnames via DNS. + +To activate this NSS module, you will need to include it in +/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. +%endif + %if %{with machined} %package -n nss-mymachines Summary: Plugin for local virtual host name resolution @@ -781,7 +783,13 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %regenerate_initrd_post %insserv_cleanup systemctl daemon-reload || : -%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket systemd-udevd.service +# On package update: the restart of the socket units will probably +# fail as the daemon is most likely running. It's not really an issue +# since we restart systemd-udevd right after and that will pull in the +# socket units again. We should be informed at that time if something +# really went wrong the first time we started the socket units. +%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null +%systemd_postun_with_restart systemd-udevd.service %posttrans -n udev%{?mini} %regenerate_initrd_posttrans @@ -880,6 +888,9 @@ fi %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup %{_bindir}/systemd-nspawn +%if %{with resolved} +%{_bindir}/systemd-resolve +%endif %{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt