From 4b190e77a730f6a8ddcd775515f4d4773d3a8017981cd64fa883a677dde2e58b Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Mon, 19 Apr 2021 17:40:19 +0000
Subject: [PATCH] Accepting request 886729 from home:trenn:branches:Base:System
- Update _service file to always get latest sources from github
master branch and auto-set version correctly
- Update to version v2.15.0+git.20210416.e828fa8:
* plugin_net: Fix check for channels supported mode
* udev: explicitly sort udev properties
* powertop2tuned: work with PowerTOP 2.13 and newer
* Changes to scheduler plugin to support os interface instead of schedutils in newer python versions.
* Lower the threading.Event's wait() timeout.
* added postgresql server profile
* spectrumcale-ece: package the profile to own subpackage
- Update to version 2.14.0
Changelog entry below (from 19. Aug. 2020) is wrong.
Mainline has the profiles in /usr/lib,
so let's better stay there, too. This also fixes bsc#1175932.
Patch is not needed anymore with latest mainline changes:
D adjust_README_path_in_manpage.patch
OBS-URL: https://build.opensuse.org/request/show/886729
OBS-URL: https://build.opensuse.org/package/show/Base:System/tuned?expand=0&rev=77
---
_service | 19 ++++++------
adjust_README_path_in_manpage.patch | 13 --------
tuned-2.13.0.tar.gz | 3 --
tuned-2.15.0+git.1618526018.e828fa8.tar.xz | 3 ++
tuned.changes | 25 +++++++++++++++
tuned.spec | 36 +++++++++++++++++++---
6 files changed, 69 insertions(+), 30 deletions(-)
delete mode 100644 adjust_README_path_in_manpage.patch
delete mode 100644 tuned-2.13.0.tar.gz
create mode 100644 tuned-2.15.0+git.1618526018.e828fa8.tar.xz
diff --git a/_service b/_service
index 008659f..914ab83 100644
--- a/_service
+++ b/_service
@@ -1,16 +1,17 @@
<services>
- <service name="tar_scm" mode="disabled">
+ <service mode="disabled" name="tar_scm">
<param name="scm">git</param>
<param name="url">https://github.com/redhat-performance/tuned</param>
- <!--
- <param name="versionformat">2.13.0+git%cd.%h</param>
- -->
- <param name="versionformat">2.13.0</param>
- <param name="changesgenerate">disable</param>
+ <param name="versionformat">@PARENT_TAG@+git.%ct.%h</param>
+ <param name="versionrewrite-pattern">v(.*)</param>
+ <param name="revision">master</param>
+ <param name="changesgenerate">enable</param>
</service>
- <service name="recompress" mode="disabled">
- <param name="file">tuned*.tar</param>
+ <service mode="disabled" name="set_version">
+ <param name="basename">tuned</param>
+ </service>
+ <service mode="disabled" name="recompress">
<param name="compression">xz</param>
+ <param name="file">*.tar</param>
</service>
- <service name="set_version" mode="disabled"/>
</services>
diff --git a/adjust_README_path_in_manpage.patch b/adjust_README_path_in_manpage.patch
deleted file mode 100644
index ac42cd7..0000000
--- a/adjust_README_path_in_manpage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tuned-2.11.0+git20190405.b4d9dfc/man/tuned.8
-===================================================================
---- tuned-2.11.0+git20190405.b4d9dfc.orig/man/tuned.8 2019-04-05 10:49:17.000000000 +0200
-+++ tuned-2.11.0+git20190405.b4d9dfc/man/tuned.8 2019-04-11 14:36:06.736132817 +0200
-@@ -59,7 +59,7 @@ Show version information.
- .SH "FILES"
- .nf
- /etc/tuned
--/usr/share/doc/tuned/README
-+/usr/share/doc/packages/tuned/README
- .SH "SEE ALSO"
- .LP
- tuned.conf(5)
diff --git a/tuned-2.13.0.tar.gz b/tuned-2.13.0.tar.gz
deleted file mode 100644
index c8cc98f..0000000
--- a/tuned-2.13.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:528b34ef0d2c219def11cea8bd8dbba83dce04adb78ab4b78ef65cf63885496d
-size 193816
diff --git a/tuned-2.15.0+git.1618526018.e828fa8.tar.xz b/tuned-2.15.0+git.1618526018.e828fa8.tar.xz
new file mode 100644
index 0000000..471cb2f
--- /dev/null
+++ b/tuned-2.15.0+git.1618526018.e828fa8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a08197a2aa3dd736a06bcbbd9b46bab7acfaca59921a02ab90454c58daa0a625
+size 164376
diff --git a/tuned.changes b/tuned.changes
index cbaafe0..fca3c38 100644
--- a/tuned.changes
+++ b/tuned.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Apr 19 10:40:34 UTC 2021 - trenn@suse.de
+
+- Update _service file to always get latest sources from github
+ master branch and auto-set version correctly
+- Update to version v2.15.0+git.20210416.e828fa8:
+ * plugin_net: Fix check for channels supported mode
+ * udev: explicitly sort udev properties
+ * powertop2tuned: work with PowerTOP 2.13 and newer
+ * Changes to scheduler plugin to support os interface instead of schedutils in newer python versions.
+ * Lower the threading.Event's wait() timeout.
+ * added postgresql server profile
+ * spectrumcale-ece: package the profile to own subpackage
+
+-------------------------------------------------------------------
+Mon Nov 30 19:23:43 UTC 2020 - Thomas Renninger <trenn@suse.de>
+
+- Update to version 2.14.0
+ Changelog entry below (from 19. Aug. 2020) is wrong.
+ Mainline has the profiles in /usr/lib,
+ so let's better stay there, too. This also fixes bsc#1175932.
+
+ Patch is not needed anymore with latest mainline changes:
+D adjust_README_path_in_manpage.patch
+
-------------------------------------------------------------------
Wed Aug 19 11:30:17 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
diff --git a/tuned.spec b/tuned.spec
index 29ba8b1..fce9e7e 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -1,7 +1,7 @@
#
# spec file for package tuned
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,20 @@
#
-%define profile_dir %{_libexecdir}/%{name}
+%define profile_dir %{_prefix}/lib/%{name}
Name: tuned
-Version: 2.13.0
+Version: 2.15.0+git.1618526018.e828fa8
Release: 0
Summary: A dynamic adaptive system tuning daemon
License: GPL-2.0-or-later
Group: System/Base
URL: https://github.com/redhat-performance/tuned
-Source0: https://github.com/redhat-performance/tuned/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0: tuned-%{version}.tar.xz
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
-Patch1: adjust_README_path_in_manpage.patch
BuildRequires: bash-completion
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
@@ -137,6 +136,13 @@ Group: System/Base
Requires: %{name} = %{version}
Requires: systemtap
+%package profiles-spectrumscale
+Summary: Additional tuned profile(s) optimized for IBM Spectrum Scale
+Requires: %{name} = %{version}
+
+%description profiles-spectrumscale
+Additional tuned profile(s) optimized for IBM Spectrum Scale.
+
%description utils-systemtap
This package contains several systemtap scripts to allow detailed
manual monitoring of the system. Instead of the typical IO/sec it collects
@@ -144,6 +150,13 @@ minimal, maximal and average time between operations to be able to
identify applications that behave power inefficient (many small operations
instead of fewer large ones).
+%package profiles-postgresql
+Summary: Additional tuned profile(s) targeted to PostgreSQL server loads
+Requires: %{name} = %{version}
+
+%description profiles-postgresql
+Additional tuned profile(s) targeted to PostgreSQL server loads.
+
%prep
%setup -q
%autopatch -p1
@@ -213,6 +226,8 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
%exclude %{profile_dir}/oracle
%exclude %{profile_dir}/realtime
%exclude %{profile_dir}/defirqaffinity*
+%exclude %{_prefix}/lib/tuned/postgresql
+%exclude %{_prefix}/lib/tuned/spectrumscale-ece
%{profile_dir}/pmqos-static.py
%{profile_dir}
# active_profile might be empty when built via build service, but typically
@@ -222,6 +237,7 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
%config(noreplace) %{_sysconfdir}/tuned/cpu-partitioning-variables.conf
%config(noreplace) %{_sysconfdir}/tuned/tuned-main.conf
%config(noreplace) %{_sysconfdir}/tuned/profile_mode
+%config(noreplace) %{_sysconfdir}/tuned/post_loaded_profile
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/bootcmdline
%dir %{_sysconfdir}/dbus-1
%dir %{_sysconfdir}/dbus-1/system.d
@@ -281,6 +297,16 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
%{profile_dir}/realtime-virtual-host
%{_mandir}/man7/tuned-profiles-nfv-*.7%{?ext_man}
+%files profiles-postgresql
+%defattr(-,root,root,-)
+%{_prefix}/lib/tuned/postgresql
+%{_mandir}/man7/tuned-profiles-postgresql.7*
+
+%files profiles-spectrumscale
+%defattr(-,root,root,-)
+%{_prefix}/lib/tuned/spectrumscale-ece
+%{_mandir}/man7/tuned-profiles-spectrumscale-ece.7*
+
%files utils
%license COPYING
%{_bindir}/powertop2tuned