forked from pool/tuned
Accepting request 705687 from home:trenn:branches:Base:System
- Adjust README path in manpage (bsc#1131858) A adjust_README_path_in_manpage.patch - Upgrade to latest git HEAD (v2.11.0 + latest fixes): commit b4d9dfc31c46ed9cda100f03227ac5be087d3d74 Date: Fri Apr 5 10:49:17 2019 +0200 - tuned gui does not need polkit anymore as it can now run as non-root user - Fixes bsc#1126609 - Includes this patch: D tuned_differ_x86_and_other_archs_in_cpu_plugin.patch OBS-URL: https://build.opensuse.org/request/show/705687 OBS-URL: https://build.opensuse.org/package/show/Base:System/tuned?expand=0&rev=64
This commit is contained in:
Git OBS Bridge
parent
a033f1382e
commit
834e9b6f0b
4
_service
4
_service
@ -2,10 +2,10 @@
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/redhat-performance/tuned</param>
|
||||
<param name="versionformat">2.11.0+git%cd.%h</param>
|
||||
<!--
|
||||
<param name="versionformat">2.9.0+git%cd.%h</param>
|
||||
<param name="versionformat">2.11.0</param>
|
||||
-->
|
||||
<param name="versionformat">2.10.0</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">tuned*.tar</param>
|
||||
|
||||
13
adjust_README_path_in_manpage.patch
Normal file
13
adjust_README_path_in_manpage.patch
Normal file
@ -0,0 +1,13 @@
|
||||
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)
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:845edda9d83d25643efa266f7edf11719a17b32e3955b79c89755ad20674cdce
|
||||
size 133120
|
||||
3
tuned-2.11.0+git20190405.b4d9dfc.tar.xz
Normal file
3
tuned-2.11.0+git20190405.b4d9dfc.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8c1c2952c20f7bb54753b6782c3fec65b79a1f52d9607eab7dde81d77bba897f
|
||||
size 150116
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 11 12:37:09 UTC 2019 - trenn@suse.de
|
||||
|
||||
- Adjust README path in manpage (bsc#1131858)
|
||||
A adjust_README_path_in_manpage.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 12 15:17:22 UTC 2019 - trenn@suse.de
|
||||
|
||||
- Upgrade to latest git HEAD (v2.11.0 + latest fixes):
|
||||
commit b4d9dfc31c46ed9cda100f03227ac5be087d3d74
|
||||
Date: Fri Apr 5 10:49:17 2019 +0200
|
||||
- tuned gui does not need polkit anymore as it can now run as non-root
|
||||
user
|
||||
- Fixes bsc#1126609
|
||||
- Includes this patch:
|
||||
D tuned_differ_x86_and_other_archs_in_cpu_plugin.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 16 10:47:12 UTC 2019 - trenn@suse.de
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%{!?_tmpfilesdir:%global _tmpfilesdir %{_libexecdir}/tmpfiles.d}
|
||||
Name: tuned
|
||||
Version: 2.10.0
|
||||
Version: 2.11.0+git20190405.b4d9dfc
|
||||
Release: 0
|
||||
Summary: A dynamic adaptive system tuning daemon
|
||||
License: GPL-2.0-or-later
|
||||
@ -30,7 +30,7 @@ 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: tuned_differ_x86_and_other_archs_in_cpu_plugin.patch
|
||||
Patch1: adjust_README_path_in_manpage.patch
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: pkgconfig
|
||||
@ -65,7 +65,6 @@ network and ATA harddisk devices are implemented.
|
||||
Summary: Disk and net statistic monitoring systemtap scripts - GTK GUI
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: polkit
|
||||
Requires: powertop
|
||||
|
||||
%description gtk
|
||||
@ -251,7 +250,6 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
|
||||
%{_sbindir}/tuned-gui
|
||||
%{python3_sitelib}/tuned/gtk
|
||||
%{_datadir}/tuned/ui
|
||||
%{_datadir}/polkit-1/actions/com.redhat.tuned.gui.policy
|
||||
|
||||
%if !0%{?sle_version}
|
||||
%files profiles-sap
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
diff --git a/tuned/plugins/plugin_cpu.py b/tuned/plugins/plugin_cpu.py
|
||||
index 8f0babd..241e157 100644
|
||||
--- a/tuned/plugins/plugin_cpu.py
|
||||
+++ b/tuned/plugins/plugin_cpu.py
|
||||
@@ -7,6 +7,8 @@ import tuned.consts as consts
|
||||
import os
|
||||
import struct
|
||||
import errno
|
||||
+import platform
|
||||
+import procfs
|
||||
|
||||
log = tuned.logs.get()
|
||||
|
||||
@@ -22,7 +24,11 @@ class CPULatencyPlugin(base.Plugin):
|
||||
super(CPULatencyPlugin, self).__init__(*args, **kwargs)
|
||||
|
||||
self._has_pm_qos = True
|
||||
- self._has_energy_perf_bias = True
|
||||
+ self._arch = "x86_64"
|
||||
+ self._is_x86 = False
|
||||
+ self._is_intel = False
|
||||
+ self._is_amd = False
|
||||
+ self._has_energy_perf_bias = False
|
||||
self._has_intel_pstate = False
|
||||
|
||||
self._min_perf_pct_save = None
|
||||
@@ -58,6 +64,33 @@ class CPULatencyPlugin(base.Plugin):
|
||||
"no_turbo" : None,
|
||||
}
|
||||
|
||||
+ def _check_arch(self):
|
||||
+ intel_archs = [ "x86_64", "i686", "i585", "i486", "i386" ]
|
||||
+ self._arch = platform.machine()
|
||||
+
|
||||
+ if self._arch in intel_archs:
|
||||
+ # Possible other x86 vendors (from arch/x86/kernel/cpu/*):
|
||||
+ # "CentaurHauls", "CyrixInstead", "Geode by NSC", "HygonGenuine", "GenuineTMx86",
|
||||
+ # "TransmetaCPU", "UMC UMC UMC"
|
||||
+ cpu = procfs.cpuinfo()
|
||||
+ vendor = cpu.tags.get("vendor_id")
|
||||
+ if vendor is "GenuineIntel":
|
||||
+ self._is_intel = True
|
||||
+ elif vendor is "AuthenticAMD" or vendor is "HygonGenuine":
|
||||
+ self._is_amd = True
|
||||
+ else:
|
||||
+ # We always assign Intel, unless we know better
|
||||
+ self._is_intel = True
|
||||
+ log.info("We are running on an x86 %s platform" % vendor)
|
||||
+ else:
|
||||
+ log.info("We are running on %s (non x86)" % self._arch)
|
||||
+
|
||||
+ if self._is_intel is True:
|
||||
+ # Check for x86_energy_perf_policy, ignore if not available / supported
|
||||
+ self._check_energy_perf_bias()
|
||||
+ # Check for intel_pstate
|
||||
+ self._check_intel_pstate()
|
||||
+
|
||||
def _check_energy_perf_bias(self):
|
||||
self._has_energy_perf_bias = False
|
||||
retcode_unsupported = 1
|
||||
@@ -110,10 +143,7 @@ class CPULatencyPlugin(base.Plugin):
|
||||
else:
|
||||
instance._load_monitor = None
|
||||
|
||||
- # Check for x86_energy_perf_policy, ignore if not available / supported
|
||||
- self._check_energy_perf_bias()
|
||||
- # Check for intel_pstate
|
||||
- self._check_intel_pstate()
|
||||
+ self._check_arch()
|
||||
else:
|
||||
instance._first_instance = False
|
||||
log.info("Latency settings from non-first CPU plugin instance '%s' will be ignored." % instance.name)
|
||||
Loading…
x
Reference in New Issue
Block a user