diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/libcpupower1.install (renamed from debian/libcpupower2.install) | 0 | ||||
| -rw-r--r-- | debian/libcpupower1.symbols | 40 | ||||
| -rw-r--r-- | debian/libcpupower2.symbols | 38 | ||||
| -rw-r--r-- | debian/patches/bugfix/all/cpupower-bump-soname-version.patch | 21 | ||||
| -rw-r--r-- | debian/templates/control.tools-unversioned.in | 4 |
6 files changed, 57 insertions, 50 deletions
diff --git a/debian/changelog b/debian/changelog index f9c07febe132..f8640d78914e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,10 @@ linux (5.5.8-1~exp1) UNRELEASED; urgency=medium [ Mark Pearson ] * [amd64] CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT and CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT + [ Salvatore Bonaccorso ] + * libcpupower: Lower back soname version to 1 and add new + cpufreq_{get,put}_boost_frequencies methods + -- Ben Hutchings <ben@decadent.org.uk> Mon, 20 Jan 2020 01:00:04 +0000 linux (5.5~rc5-1~exp1) experimental; urgency=medium diff --git a/debian/libcpupower2.install b/debian/libcpupower1.install index 3ddde5841984..3ddde5841984 100644 --- a/debian/libcpupower2.install +++ b/debian/libcpupower1.install diff --git a/debian/libcpupower1.symbols b/debian/libcpupower1.symbols new file mode 100644 index 000000000000..5639cbe8ab64 --- /dev/null +++ b/debian/libcpupower1.symbols @@ -0,0 +1,40 @@ +libcpupower.so.1 libcpupower1 #MINVER# + cpu_topology_release@Base 4.7~rc2-1~exp1 + cpufreq_get_affected_cpus@Base 4.7~rc2-1~exp1 + cpufreq_get_available_frequencies@Base 4.7~rc2-1~exp1 + cpufreq_get_available_governors@Base 4.7~rc2-1~exp1 + cpufreq_get_boost_frequencies@Base 5.5.8-1~exp1 + cpufreq_get_driver@Base 4.7~rc2-1~exp1 + cpufreq_get_freq_hardware@Base 4.7~rc2-1~exp1 + cpufreq_get_freq_kernel@Base 4.7~rc2-1~exp1 + cpufreq_get_hardware_limits@Base 4.7~rc2-1~exp1 + cpufreq_get_policy@Base 4.7~rc2-1~exp1 + cpufreq_get_related_cpus@Base 4.7~rc2-1~exp1 + cpufreq_get_stats@Base 4.7~rc2-1~exp1 + cpufreq_get_transition_latency@Base 4.7~rc2-1~exp1 + cpufreq_get_transitions@Base 4.7~rc2-1~exp1 + cpufreq_modify_policy_governor@Base 4.7~rc2-1~exp1 + cpufreq_modify_policy_max@Base 4.7~rc2-1~exp1 + cpufreq_modify_policy_min@Base 4.7~rc2-1~exp1 + cpufreq_put_affected_cpus@Base 4.7~rc2-1~exp1 + cpufreq_put_available_frequencies@Base 4.7~rc2-1~exp1 + cpufreq_put_available_governors@Base 4.7~rc2-1~exp1 + cpufreq_put_boost_frequencies@Base 5.5.8-1~exp1 + cpufreq_put_driver@Base 4.7~rc2-1~exp1 + cpufreq_put_policy@Base 4.7~rc2-1~exp1 + cpufreq_put_related_cpus@Base 4.7~rc2-1~exp1 + cpufreq_put_stats@Base 4.7~rc2-1~exp1 + cpufreq_set_frequency@Base 4.7~rc2-1~exp1 + cpufreq_set_policy@Base 4.7~rc2-1~exp1 + cpuidle_get_driver@Base 4.7~rc2-1~exp1 + cpuidle_get_governor@Base 4.7~rc2-1~exp1 + cpuidle_is_state_disabled@Base 4.7~rc2-1~exp1 + cpuidle_state_count@Base 4.7~rc2-1~exp1 + cpuidle_state_desc@Base 4.7~rc2-1~exp1 + cpuidle_state_disable@Base 4.7~rc2-1~exp1 + cpuidle_state_latency@Base 4.7~rc2-1~exp1 + cpuidle_state_name@Base 4.7~rc2-1~exp1 + cpuidle_state_time@Base 4.7~rc2-1~exp1 + cpuidle_state_usage@Base 4.7~rc2-1~exp1 + cpupower_is_cpu_online@Base 4.7~rc2-1~exp1 + get_cpu_topology@Base 4.7~rc2-1~exp1 diff --git a/debian/libcpupower2.symbols b/debian/libcpupower2.symbols deleted file mode 100644 index 7717db2ff5a5..000000000000 --- a/debian/libcpupower2.symbols +++ /dev/null @@ -1,38 +0,0 @@ -libcpupower.so.2 libcpupower2 #MINVER# - cpu_topology_release@Base 5.1.3-1~exp1 - cpufreq_get_affected_cpus@Base 5.1.3-1~exp1 - cpufreq_get_available_governors@Base 5.1.3-1~exp1 - cpufreq_get_driver@Base 5.1.3-1~exp1 - cpufreq_get_freq_hardware@Base 5.1.3-1~exp1 - cpufreq_get_freq_kernel@Base 5.1.3-1~exp1 - cpufreq_get_frequencies@Base 5.1.3-1~exp1 - cpufreq_get_hardware_limits@Base 5.1.3-1~exp1 - cpufreq_get_policy@Base 5.1.3-1~exp1 - cpufreq_get_related_cpus@Base 5.1.3-1~exp1 - cpufreq_get_stats@Base 5.1.3-1~exp1 - cpufreq_get_transition_latency@Base 5.1.3-1~exp1 - cpufreq_get_transitions@Base 5.1.3-1~exp1 - cpufreq_modify_policy_governor@Base 5.1.3-1~exp1 - cpufreq_modify_policy_max@Base 5.1.3-1~exp1 - cpufreq_modify_policy_min@Base 5.1.3-1~exp1 - cpufreq_put_affected_cpus@Base 5.1.3-1~exp1 - cpufreq_put_available_governors@Base 5.1.3-1~exp1 - cpufreq_put_driver@Base 5.1.3-1~exp1 - cpufreq_put_frequencies@Base 5.1.3-1~exp1 - cpufreq_put_policy@Base 5.1.3-1~exp1 - cpufreq_put_related_cpus@Base 5.1.3-1~exp1 - cpufreq_put_stats@Base 5.1.3-1~exp1 - cpufreq_set_frequency@Base 5.1.3-1~exp1 - cpufreq_set_policy@Base 5.1.3-1~exp1 - cpuidle_get_driver@Base 5.1.3-1~exp1 - cpuidle_get_governor@Base 5.1.3-1~exp1 - cpuidle_is_state_disabled@Base 5.1.3-1~exp1 - cpuidle_state_count@Base 5.1.3-1~exp1 - cpuidle_state_desc@Base 5.1.3-1~exp1 - cpuidle_state_disable@Base 5.1.3-1~exp1 - cpuidle_state_latency@Base 5.1.3-1~exp1 - cpuidle_state_name@Base 5.1.3-1~exp1 - cpuidle_state_time@Base 5.1.3-1~exp1 - cpuidle_state_usage@Base 5.1.3-1~exp1 - cpupower_is_cpu_online@Base 5.1.3-1~exp1 - get_cpu_topology@Base 5.1.3-1~exp1 diff --git a/debian/patches/bugfix/all/cpupower-bump-soname-version.patch b/debian/patches/bugfix/all/cpupower-bump-soname-version.patch index b6eb2dd8e05b..eebb23b44677 100644 --- a/debian/patches/bugfix/all/cpupower-bump-soname-version.patch +++ b/debian/patches/bugfix/all/cpupower-bump-soname-version.patch @@ -1,11 +1,12 @@ From: Ben Hutchings <ben@decadent.org.uk> -Date: Sun, 19 May 2019 17:17:33 +0100 +Date: Thu, 9 Jun 2016 23:35:08 +0100 Subject: cpupower: Bump soname version +Forwarded: http://mid.gmane.org/20160610005619.GQ7555@decadent.org.uk -Several functions in the libcpupower API were renamed or removed in -Linux 4.7, and again in 5.1. This is a backward-incompatible ABI -change, so the library soname should change from libcpupower.so.0 to -libcpupower.so.2. +Several functions in the libcpupower API are renamed or removed in +Linux 4.7. This is an backward-incompatible ABI change, so the +library soname should change from libcpupower.so.0 to +libcpupower.so.1. Fixes: ac5a181d065d ("cpupower: Add cpuidle parts into library") Signed-off-by: Ben Hutchings <ben@decadent.org.uk> @@ -13,16 +14,16 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> tools/power/cpupower/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile +index 8358863259c5..0b85f5915ce8 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile -@@ -65,8 +65,8 @@ DESTDIR ?= - # and _should_ modify the PACKAGE_BUGREPORT definition +@@ -64,7 +64,7 @@ DESTDIR ?= VERSION= $(shell ./utils/version-gen.sh) --LIB_MAJ= 0.0.1 + LIB_MAJ= 0.0.1 -LIB_MIN= 0 -+LIB_MAJ= 2.0.1 -+LIB_MIN= 2 ++LIB_MIN= 1 PACKAGE = cpupower PACKAGE_BUGREPORT = linux-pm@vger.kernel.org diff --git a/debian/templates/control.tools-unversioned.in b/debian/templates/control.tools-unversioned.in index 0305546e3a21..4416a1f6bb86 100644 --- a/debian/templates/control.tools-unversioned.in +++ b/debian/templates/control.tools-unversioned.in @@ -11,7 +11,7 @@ Description: CPU power management tools for Linux . ${cpupower:Arch-Description} -Package: libcpupower2 +Package: libcpupower1 Build-Profiles: <!stage1 !pkg.linux.notools> Section: libs Architecture: linux-any @@ -26,7 +26,7 @@ Package: libcpupower-dev Build-Profiles: <!stage1 !pkg.linux.notools> Section: libdevel Architecture: linux-any -Depends: ${misc:Depends}, libcpupower2 (= ${binary:Version}) +Depends: ${misc:Depends}, libcpupower1 (= ${binary:Version}) Provides: libcpufreq-dev Conflicts: libcpufreq-dev Replaces: libcpufreq-dev |