From 1357dc7e2ba39dfc0e6e30848938a488c9ad5b1234a118ba187417d459716107 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Wed, 14 Dec 2016 16:08:32 +0000 Subject: [PATCH] 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 0c221776..29e1dbd1 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 f25087e5..17d28609 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 0c221776..29e1dbd1 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 76084668..cf2e2a0e 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