From ff5804f2085862a2308c1507256d352a1dc4497c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 10 Jun 2016 00:10:18 +0100 Subject: [PATCH] cpupower: Bump soname version and rename library package accordingly --- debian/changelog | 1 + debian/libcpupower0.symbols | 44 ------------------- ...cpupower0.install => libcpupower1.install} | 0 debian/libcpupower1.symbols | 39 ++++++++++++++++ .../all/cpupower-bump-soname-version.patch | 28 ++++++++++++ debian/patches/series | 1 + debian/rules.real | 2 +- debian/templates/control.tools.in | 2 +- 8 files changed, 71 insertions(+), 46 deletions(-) delete mode 100644 debian/libcpupower0.symbols rename debian/{libcpupower0.install => libcpupower1.install} (100%) create mode 100644 debian/libcpupower1.symbols create mode 100644 debian/patches/bugfix/all/cpupower-bump-soname-version.patch diff --git a/debian/changelog b/debian/changelog index 08277570b..aab6079a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ linux (4.7~rc2-1~exp1) UNRELEASED; urgency=medium * linux-image: Add '-unsigned' suffix to packages with modules that will later be signed * [rt] Disable until it is updated for 4.7 or later + * cpupower: Bump soname version and rename library package accordingly -- Ben Hutchings Tue, 07 Jun 2016 19:37:55 +0100 diff --git a/debian/libcpupower0.symbols b/debian/libcpupower0.symbols deleted file mode 100644 index a356760d1..000000000 --- a/debian/libcpupower0.symbols +++ /dev/null @@ -1,44 +0,0 @@ -libcpupower.so.0 libcpupower0 #MINVER# - cpufreq_cpu_exists@Base 4.4 - cpufreq_get_affected_cpus@Base 4.4 - cpufreq_get_available_frequencies@Base 4.4 - cpufreq_get_available_governors@Base 4.4 - cpufreq_get_driver@Base 4.4 - cpufreq_get_freq_hardware@Base 4.4 - cpufreq_get_freq_kernel@Base 4.4 - cpufreq_get_hardware_limits@Base 4.4 - cpufreq_get_policy@Base 4.4 - cpufreq_get_related_cpus@Base 4.4 - cpufreq_get_stats@Base 4.4 - cpufreq_get_transition_latency@Base 4.4 - cpufreq_get_transitions@Base 4.4 - cpufreq_modify_policy_governor@Base 4.4 - cpufreq_modify_policy_max@Base 4.4 - cpufreq_modify_policy_min@Base 4.4 - cpufreq_put_affected_cpus@Base 4.4 - cpufreq_put_available_frequencies@Base 4.4 - cpufreq_put_available_governors@Base 4.4 - cpufreq_put_driver@Base 4.4 - cpufreq_put_policy@Base 4.4 - cpufreq_put_related_cpus@Base 4.4 - cpufreq_put_stats@Base 4.4 - cpufreq_set_frequency@Base 4.4 - cpufreq_set_policy@Base 4.4 - sysfs_cpu_exists@Base 4.4 - sysfs_get_available_frequencies@Base 4.4 - sysfs_get_freq_affected_cpus@Base 4.4 - sysfs_get_freq_available_governors@Base 4.4 - sysfs_get_freq_driver@Base 4.4 - sysfs_get_freq_hardware@Base 4.4 - sysfs_get_freq_hardware_limits@Base 4.4 - sysfs_get_freq_kernel@Base 4.4 - sysfs_get_freq_policy@Base 4.4 - sysfs_get_freq_related_cpus@Base 4.4 - sysfs_get_freq_stats@Base 4.4 - sysfs_get_freq_transition_latency@Base 4.4 - sysfs_get_freq_transitions@Base 4.4 - sysfs_modify_freq_policy_governor@Base 4.4 - sysfs_modify_freq_policy_max@Base 4.4 - sysfs_modify_freq_policy_min@Base 4.4 - sysfs_set_freq_policy@Base 4.4 - sysfs_set_frequency@Base 4.4 diff --git a/debian/libcpupower0.install b/debian/libcpupower1.install similarity index 100% rename from debian/libcpupower0.install rename to debian/libcpupower1.install diff --git a/debian/libcpupower1.symbols b/debian/libcpupower1.symbols new file mode 100644 index 000000000..1e691c28f --- /dev/null +++ b/debian/libcpupower1.symbols @@ -0,0 +1,39 @@ +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_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_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 + sysfs_read_file@Base 4.7~rc2-1~exp1 diff --git a/debian/patches/bugfix/all/cpupower-bump-soname-version.patch b/debian/patches/bugfix/all/cpupower-bump-soname-version.patch new file mode 100644 index 000000000..f26a5edaf --- /dev/null +++ b/debian/patches/bugfix/all/cpupower-bump-soname-version.patch @@ -0,0 +1,28 @@ +From: Ben Hutchings +Date: Thu, 9 Jun 2016 23:35:08 +0100 +Subject: cpupower: Bump soname version + +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 +--- + 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 +@@ -64,7 +64,7 @@ DESTDIR ?= + + VERSION= $(shell ./utils/version-gen.sh) + LIB_MAJ= 0.0.1 +-LIB_MIN= 0 ++LIB_MIN= 1 + + PACKAGE = cpupower + PACKAGE_BUGREPORT = linux-pm@vger.kernel.org diff --git a/debian/patches/series b/debian/patches/series index 173290ca0..993523e53 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -112,3 +112,4 @@ bugfix/all/lockdep-add-missing-macros.patch bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch +bugfix/all/cpupower-bump-soname-version.patch diff --git a/debian/rules.real b/debian/rules.real index d8b8a18ce..f828d3c2c 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -528,7 +528,7 @@ endif dh_md5sums dh_builddeb -install-cpupower: DH_OPTIONS = -plinux-cpupower -plibcpupower0 -plibcpupower-dev +install-cpupower: DH_OPTIONS = -plinux-cpupower -plibcpupower1 -plibcpupower-dev install-cpupower: DIR = $(CURDIR)/debian/cpupower-tmp install-cpupower: $(STAMPS_DIR)/build-tools dh_testdir diff --git a/debian/templates/control.tools.in b/debian/templates/control.tools.in index 8ffd8009c..2bc86b166 100644 --- a/debian/templates/control.tools.in +++ b/debian/templates/control.tools.in @@ -19,7 +19,7 @@ Description: CPU frequency and voltage scaling tools for Linux The "cpupower" command replaces "cpufreq-info" and "cpufreq-set" in cpufrequtils. -Package: libcpupower0 +Package: libcpupower1 Build-Profiles: Section: libs Architecture: linux-any