pool/tuned
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 662697 from home:trenn:branches:Base:System

Browse Source 
- Remove sap subpackages entirely for SLE and Leap products.
  These conflict with possible other SLE optimized sap subpackages
  (bnc#1064832).
- Create systemd tmpfiles correctly for different releases again.

OBS-URL: https://build.opensuse.org/request/show/662697
OBS-URL: https://build.opensuse.org/package/show/Base:System/tuned?expand=0&rev=55
This commit is contained in:
Thomas Renninger 2019-01-03 16:10:06 +00:00 committed by Git OBS Bridge
parent b20ead1a27
commit a386903106
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tuned.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 3 15:43:38 UTC 2019 - trenn@suse.de
- Remove sap subpackages entirely for SLE and Leap products.
These conflict with possible other SLE optimized sap subpackages
(bnc#1064832).
- Create systemd tmpfiles correctly for different releases again.
-------------------------------------------------------------------
Tue Dec 25 20:32:33 UTC 2018 - Martin Herkt <9+suse@cirno.systems>

16
tuned.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package tuned
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 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
@ -30,7 +30,6 @@ Source1: tuned.rpmlintrc
# PATCH-FIX-OPENSUSE fix-allow-receive_sender-default.patch <allow receive_sender="com.redhat.com"/> allow receive_* is normally
# not needed as that is the default --<p.drouand@gmail.com>
Patch0: fix-allow-receive_sender-default.patch
# Do not own standard directories
BuildRequires: bash-completion
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
@ -69,6 +68,9 @@ Requires: powertop
%description gtk
GTK GUI that can control tuned and provide simple profile editor.
# Do not ship SAP profiles for SLE and Leap, there are other packages
# providing these profiles
%if !0%{?sle_version}
%package profiles-sap
Summary: Additional tuned profile(s) targeted to SAP NetWeaver loads
Group: System/Base
@ -84,6 +86,7 @@ Requires: %{name} = %{version}
%description profiles-sap-hana
Additional profile(s) for the tuned daemon, targeted to SAP HANA loads.
%endif
%package profiles-atomic
Summary: Additional tuned profiles targeted to Atomic
@ -160,7 +163,11 @@ ln -sf service %{buildroot}%{_sbindir}/rctuned
%post
%service_add_post %{name}.service
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%if 0%{?suse_version} <= 1320
systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || :
%else
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%endif
# convert active_profile from full path to name (if needed)
sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
%if 0%{?suse_version} < 1500
@ -199,6 +206,7 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
%exclude %{_libexecdir}/tuned/sap-netweaver
%exclude %{_libexecdir}/tuned/sap-hana
%exclude %{_libexecdir}/tuned/sap-hana-vmware
%exclude %{_mandir}/man7/tuned-profiles-sap*.7.gz
%exclude %{_libexecdir}/tuned/atomic-host
%exclude %{_libexecdir}/tuned/atomic-guest
%exclude %{_libexecdir}/tuned/oracle
@ -241,6 +249,7 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
%{_datadir}/tuned/ui
%{_datadir}/polkit-1/actions/com.redhat.tuned.gui.policy
%if !0%{?sle_version}
%files profiles-sap
%{_libexecdir}/tuned/sap-netweaver
%{_mandir}/man7/tuned-profiles-sap.7%{?ext_man}
@ -249,6 +258,7 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
%{_libexecdir}/tuned/sap-hana
%{_libexecdir}/tuned/sap-hana-vmware
%{_mandir}/man7/tuned-profiles-sap-hana.7%{?ext_man}
%endif
%files profiles-atomic
%{_libexecdir}/tuned/atomic-host