Hello community,
here is the log from the commit of package CoreFreq for openSUSE:Factory
checked in at 2020-09-15 16:30:49
Comparing /work/SRC/openSUSE:Factory/CoreFreq (Old)
and /work/SRC/openSUSE:Factory/.CoreFreq.new.4249 (New)
Package is "CoreFreq"
Tue Sep 15 16:30:49 2020 rev:3 rq:834361 version:1.80.9+git20200914
Changes:
--- /work/SRC/openSUSE:Factory/CoreFreq/CoreFreq.changes2020-04-22
20:55:01.095630209 +0200
+++ /work/SRC/openSUSE:Factory/.CoreFreq.new.4249/CoreFreq.changes
2020-09-15 16:31:10.566762568 +0200
@@ -1,0 +2,23 @@
+Mon Sep 14 19:33:07 UTC 2020 - Michael Pujos
+
+- updated changelog to mention leap15_2.patch
+
+---
+Mon Sep 14 11:25:44 UTC 2020 - Michael Pujos
+
+- updated to git 20200914, fixes compilation on kernel 5.8
+
+---
+Tue Aug 18 15:31:19 UTC 2020 - Dominique Leuenberger
+
+- Fix invalid usage of %{_libexecdir} for systemd owned paths below
+ %{_prefix}/lib.
+
+---
+Tue Jul 14 13:41:15 UTC 2020 - Michael Pujos
+
+- added patch leap15_2.patch: fix failure to build on Leap 15.2
+- fix failure to build on Tumbleweed
+- updated to 1.79.9 + current git
+
+---
Old:
CoreFreq-1.75.2+git20200418.tar.gz
New:
CoreFreq-1.80.9+git20200914.tar.gz
leap15_2.patch
Other differences:
--
++ CoreFreq.spec ++
--- /var/tmp/diff_new_pack.59WPhO/_old 2020-09-15 16:31:12.530764448 +0200
+++ /var/tmp/diff_new_pack.59WPhO/_new 2020-09-15 16:31:12.534764452 +0200
@@ -18,9 +18,9 @@
# from coretypes.h
%define corefreq_major 1
-%define corefreq_minor 75
-%define corefreq_rev2
-%define gitdate 20200418
+%define corefreq_minor 80
+%define corefreq_rev9
+%define gitdate 20200914
Name: CoreFreq
Version:
%{corefreq_major}.%{corefreq_minor}.%{corefreq_rev}+git%{gitdate}
Release:0
@@ -28,13 +28,14 @@
License:GPL-2.0-or-later
URL:https://github.com/cyring/CoreFreq
Source: %{name}-%{version}.tar.gz
+Patch0: leap15_2.patch
BuildRequires: %{kernel_module_package_buildreqs}
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libsystemd)
Requires: CoreFreq-kmp
ExclusiveArch: x86_64
%systemd_ordering
-%kernel_module_package
+%kernel_module_package -x preempt
%description
A CPU monitoring software with BIOS like functionalities, is designed for the
64-bits
@@ -43,6 +44,9 @@
%prep
%setup -q -n CoreFreq
+%if 0%{?sle_version} == 150200
+%patch0 -p1
+%endif
%build
%make_build
@@ -52,12 +56,9 @@
export INSTALL_MOD_DIR=updates
PREFIX=%{buildroot}%{_prefix} make install
-# replace invocation in corefreqd.service of /bin/corefreqd by
/usr/bin/corefreqd
-sed -i -e 's/\/bin\/corefreqd/\/usr\/bin\/corefreqd/g'
%{buildroot}%{_unitdir}/corefreqd.service
-
# load module on boot. Necessary for corefreqd to be able to run
-mkdir -p %{buildroot}%{_libexecdir}/modules-load.d
-echo corefreqk > %{buildroot}%{_libexecdir}/modules-load.d/corefreq.conf
+mkdir -p %{buildroot}%{_prefix}/lib/modules-load.d
+echo corefreqk > %{buildroot}%{_prefix}/lib/modules-load.d/corefreq.conf
mkdir -p %{buildroot}%{_sbindir}
ln -s service %{buildroot}%{_sbindir}/rccorefreqd
@@ -69,8 +70,8 @@
%{_bindir}/corefreqd
%{_unitdir}/corefreqd.service
%{_sbindir}/rccorefreqd
-%dir %{_libexecdir}/modules-load.d
-%{_libexecdir}/modules-load.d/corefreq.conf
+%dir %{_prefix}/lib/modules-load.d
+%{_prefix}/lib/modules-load.d/corefreq.conf
%pre
%service_add_pre corefreqd.service
++ CoreFreq-1.75.2+git20200418.tar.gz -> CoreFreq-1.80.9+git20200914.tar.gz
++
35269 lines of diff (skipped)
++ leap15_2.patch ++
diff -ruN CoreFreq/corefreqk.c CoreFreq.patch/corefreqk.c
--- CoreFreq/corefreqk.c2020-09-14 12:09:57.649180393 +0200
+++ CoreFreq.patch/corefreqk.c 2020-09-14 13:15:40.676704837 +0200
@@ -11491,13 +11491,7 @@
return (0);
}
-#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 19)) \
- && (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 5, 0))) \
- || (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 3))
static int CoreFreqK_Policy_Verify(struct cpufreq_policy_data *policy)
-#else
-static int CoreFreqK_Policy_Verify(struct cpufreq_policy *policy)
-#endif
{
if (policy != NULL) {
cpufreq_verify_within_cpu_limits(policy);
diff -ruN CoreFreq/corefreqk.h CoreFreq.patch/corefreqk.h
--- CoreFreq/corefreqk.h2020-09-14 12:09:57.649180393 +0200
+++ CoreFreq.patch/corefreqk.h 2020-09-14 13:15:57.060752684 +0200
@@ -3983,13 +3983,7 @@
#endif