[linux] 05/05: cpupower: Bump soname version and rename library package accordingly
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Fri Jun 10 13:47:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit ff5804f2085862a2308c1507256d352a1dc4497c
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Fri Jun 10 00:10:18 2016 +0100
cpupower: Bump soname version and rename library package accordingly
---
debian/changelog | 1 +
debian/libcpupower0.symbols | 44 ----------------------
.../{libcpupower0.install => libcpupower1.install} | 0
debian/libcpupower1.symbols | 39 +++++++++++++++++++
.../bugfix/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(-)
diff --git a/debian/changelog b/debian/changelog
index 0827757..aab6079 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 <ben at decadent.org.uk> Tue, 07 Jun 2016 19:37:55 +0100
diff --git a/debian/libcpupower0.symbols b/debian/libcpupower0.symbols
deleted file mode 100644
index a356760..0000000
--- a/debian/libcpupower0.symbols
+++ /dev/null
@@ -1,44 +0,0 @@
-libcpupower.so.0 libcpupower0 #MINVER#
- cpufreq_cpu_exists at Base 4.4
- cpufreq_get_affected_cpus at Base 4.4
- cpufreq_get_available_frequencies at Base 4.4
- cpufreq_get_available_governors at Base 4.4
- cpufreq_get_driver at Base 4.4
- cpufreq_get_freq_hardware at Base 4.4
- cpufreq_get_freq_kernel at Base 4.4
- cpufreq_get_hardware_limits at Base 4.4
- cpufreq_get_policy at Base 4.4
- cpufreq_get_related_cpus at Base 4.4
- cpufreq_get_stats at Base 4.4
- cpufreq_get_transition_latency at Base 4.4
- cpufreq_get_transitions at Base 4.4
- cpufreq_modify_policy_governor at Base 4.4
- cpufreq_modify_policy_max at Base 4.4
- cpufreq_modify_policy_min at Base 4.4
- cpufreq_put_affected_cpus at Base 4.4
- cpufreq_put_available_frequencies at Base 4.4
- cpufreq_put_available_governors at Base 4.4
- cpufreq_put_driver at Base 4.4
- cpufreq_put_policy at Base 4.4
- cpufreq_put_related_cpus at Base 4.4
- cpufreq_put_stats at Base 4.4
- cpufreq_set_frequency at Base 4.4
- cpufreq_set_policy at Base 4.4
- sysfs_cpu_exists at Base 4.4
- sysfs_get_available_frequencies at Base 4.4
- sysfs_get_freq_affected_cpus at Base 4.4
- sysfs_get_freq_available_governors at Base 4.4
- sysfs_get_freq_driver at Base 4.4
- sysfs_get_freq_hardware at Base 4.4
- sysfs_get_freq_hardware_limits at Base 4.4
- sysfs_get_freq_kernel at Base 4.4
- sysfs_get_freq_policy at Base 4.4
- sysfs_get_freq_related_cpus at Base 4.4
- sysfs_get_freq_stats at Base 4.4
- sysfs_get_freq_transition_latency at Base 4.4
- sysfs_get_freq_transitions at Base 4.4
- sysfs_modify_freq_policy_governor at Base 4.4
- sysfs_modify_freq_policy_max at Base 4.4
- sysfs_modify_freq_policy_min at Base 4.4
- sysfs_set_freq_policy at Base 4.4
- sysfs_set_frequency at 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 0000000..1e691c2
--- /dev/null
+++ b/debian/libcpupower1.symbols
@@ -0,0 +1,39 @@
+libcpupower.so.1 libcpupower1 #MINVER#
+ cpu_topology_release at Base 4.7~rc2-1~exp1
+ cpufreq_get_affected_cpus at Base 4.7~rc2-1~exp1
+ cpufreq_get_available_frequencies at Base 4.7~rc2-1~exp1
+ cpufreq_get_available_governors at Base 4.7~rc2-1~exp1
+ cpufreq_get_driver at Base 4.7~rc2-1~exp1
+ cpufreq_get_freq_hardware at Base 4.7~rc2-1~exp1
+ cpufreq_get_freq_kernel at Base 4.7~rc2-1~exp1
+ cpufreq_get_hardware_limits at Base 4.7~rc2-1~exp1
+ cpufreq_get_policy at Base 4.7~rc2-1~exp1
+ cpufreq_get_related_cpus at Base 4.7~rc2-1~exp1
+ cpufreq_get_stats at Base 4.7~rc2-1~exp1
+ cpufreq_get_transition_latency at Base 4.7~rc2-1~exp1
+ cpufreq_get_transitions at Base 4.7~rc2-1~exp1
+ cpufreq_modify_policy_governor at Base 4.7~rc2-1~exp1
+ cpufreq_modify_policy_max at Base 4.7~rc2-1~exp1
+ cpufreq_modify_policy_min at Base 4.7~rc2-1~exp1
+ cpufreq_put_affected_cpus at Base 4.7~rc2-1~exp1
+ cpufreq_put_available_frequencies at Base 4.7~rc2-1~exp1
+ cpufreq_put_available_governors at Base 4.7~rc2-1~exp1
+ cpufreq_put_driver at Base 4.7~rc2-1~exp1
+ cpufreq_put_policy at Base 4.7~rc2-1~exp1
+ cpufreq_put_related_cpus at Base 4.7~rc2-1~exp1
+ cpufreq_put_stats at Base 4.7~rc2-1~exp1
+ cpufreq_set_frequency at Base 4.7~rc2-1~exp1
+ cpufreq_set_policy at Base 4.7~rc2-1~exp1
+ cpuidle_get_driver at Base 4.7~rc2-1~exp1
+ cpuidle_get_governor at Base 4.7~rc2-1~exp1
+ cpuidle_is_state_disabled at Base 4.7~rc2-1~exp1
+ cpuidle_state_count at Base 4.7~rc2-1~exp1
+ cpuidle_state_desc at Base 4.7~rc2-1~exp1
+ cpuidle_state_disable at Base 4.7~rc2-1~exp1
+ cpuidle_state_latency at Base 4.7~rc2-1~exp1
+ cpuidle_state_name at Base 4.7~rc2-1~exp1
+ cpuidle_state_time at Base 4.7~rc2-1~exp1
+ cpuidle_state_usage at Base 4.7~rc2-1~exp1
+ cpupower_is_cpu_online at Base 4.7~rc2-1~exp1
+ get_cpu_topology at Base 4.7~rc2-1~exp1
+ sysfs_read_file at 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 0000000..f26a5ed
--- /dev/null
+++ b/debian/patches/bugfix/all/cpupower-bump-soname-version.patch
@@ -0,0 +1,28 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+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 <ben at 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
+@@ -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 at vger.kernel.org
diff --git a/debian/patches/series b/debian/patches/series
index 173290c..993523e 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 d8b8a18..f828d3c 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 8ffd800..2bc86b1 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: <!stage1 !pkg.linux.notools>
Section: libs
Architecture: linux-any
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list