From 8c0226951b5e613d0e2922bad7270f123a150ea3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 15:40:05 +0000 Subject: [PATCH 1/8] Update to 4.4.6 --- debian/changelog | 14 +++++++++++ ...ling-kernel-only-linux-nvme.h-as-uap.patch | 23 ------------------- debian/patches/series | 1 - 3 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch diff --git a/debian/changelog b/debian/changelog index 3a35e5065..726613e6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +linux-tools (4.4.6-1) UNRELEASED; urgency=medium + + * New upstream stable update: + - tools lib traceevent: Fix output of %llu for 64 bit values read on + 32 bit machines + - perf tools: tracepoint_error() can receive e=NULL, robustify it + - perf kvm record/report: 'unprocessable sample' error while + recording/reporting guest data + - tools: hv: vss: fix the write()'s argument: error -> vss_msg + - uapi: update install list after nvme.h rename + - perf stat: Do not clean event's private stats + + -- Ben Hutchings Sun, 20 Mar 2016 15:35:32 +0000 + linux-tools (4.4-4) unstable; urgency=medium * hyperv-daemons: Only build the progarams on x86 (fixes FTBFS) diff --git a/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch b/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch deleted file mode 100644 index 66a08d4ea..000000000 --- a/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Ben Hutchings -Date: Mon, 14 Dec 2015 01:09:32 +0000 -Subject: nvme: Stop installing kernel-only as UAPI -Forwarded: not-needed - -Fixes: 9d99a8dda154 ("nvme: move hardware structures out of the uapi ...") -Signed-off-by: Ben Hutchings ---- - include/uapi/linux/Kbuild | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild -index 628e6e6..41652af 100644 ---- a/include/uapi/linux/Kbuild -+++ b/include/uapi/linux/Kbuild -@@ -306,7 +306,6 @@ header-y += nfs_mount.h - header-y += nl80211.h - header-y += n_r3964.h - header-y += nubus.h --header-y += nvme.h - header-y += nvram.h - header-y += omap3isp.h - header-y += omapfb.h diff --git a/debian/patches/series b/debian/patches/series index 1f4f8c538..c1383d0b6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,7 +14,6 @@ tools-lib-lockdep-use-ldflags.patch tools-hv-fix-fortify-format-warning.patch revert-perf-build-fix-libunwind-feature-detection-on.patch alpha-uapi-add-support-for-__sane_userspace_types__.patch -nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch perf-tools-fix-reading-of-build-id-from-vdso.patch perf-fix-misleadingly-indented-assignment-whitespace.patch perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing.patch From 96559e9c4c52d4c36de89c5a18ea8bbbaead2352 Mon Sep 17 00:00:00 2001 From: Mattia Dongili Date: Fri, 11 Mar 2016 06:55:41 -0800 Subject: [PATCH 2/8] Build tools from power/cpupower They'll eventually replace cpufrequtils and libcpufreq{0,-dev} so the structure of the packages is the same. --- debian/build/tools/Makefile | 1 + debian/build/tools/power/cpupower/Makefile | 20 ++++++ debian/changelog | 3 + debian/libcpupower-dev.install | 2 + debian/libcpupower0.install | 1 + debian/libcpupower0.symbols | 44 +++++++++++++ debian/linux-cpupower.install | 2 + ...-cpupower-fix-incorrect-if-statement.patch | 21 +++++++ .../power-cpupower-fix-manpages-NAME.patch | 63 +++++++++++++++++++ debian/patches/series | 2 + debian/rules.real | 23 ++++++- debian/templates/control.main.in | 29 +++++++++ debian/templates/control.source.in | 2 +- 13 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 debian/build/tools/power/cpupower/Makefile create mode 100644 debian/libcpupower-dev.install create mode 100644 debian/libcpupower0.install create mode 100644 debian/libcpupower0.symbols create mode 100644 debian/linux-cpupower.install create mode 100644 debian/patches/power-cpupower-fix-incorrect-if-statement.patch create mode 100644 debian/patches/power-cpupower-fix-manpages-NAME.patch diff --git a/debian/build/tools/Makefile b/debian/build/tools/Makefile index a3cdd8728..1ea9cf3d2 100644 --- a/debian/build/tools/Makefile +++ b/debian/build/tools/Makefile @@ -2,6 +2,7 @@ SUBDIRS = \ hv \ lib/lockdep \ perf \ + power/cpupower \ usb/usbip include ../Makefile.inc diff --git a/debian/build/tools/power/cpupower/Makefile b/debian/build/tools/power/cpupower/Makefile new file mode 100644 index 000000000..66e2c75aa --- /dev/null +++ b/debian/build/tools/power/cpupower/Makefile @@ -0,0 +1,20 @@ +OUTDIR = tools/power/cpupower +prefix = /usr/sbin + +include ../../../Makefile.inc + +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + DEBUG = true +endif + +all: + mkdir out + $(shell dpkg-buildflags --export=cmdline) $(MAKE) -C $(top_srcdir)/tools/power/cpupower -f Makefile O=$(CURDIR)/out DEBUG=$(DEBUG) CPUFREQ_BENCH=false V=true + +install: + $(MAKE) -C $(top_srcdir)/tools/power/cpupower -f Makefile O=$(CURDIR)/out install mandir=/usr/share/man DESTDIR=$(DESTDIR) CPUFREQ_BENCH=false + +clean: + mkdir -p out + $(MAKE) -C $(top_srcdir)/tools/power/cpupower -f Makefile O=$(CURDIR)/out clean + rm -rf out diff --git a/debian/changelog b/debian/changelog index 726613e6a..a6b12f4a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ linux-tools (4.4.6-1) UNRELEASED; urgency=medium - uapi: update install list after nvme.h rename - perf stat: Do not clean event's private stats + [ Mattia Dongili ] + * Build linux-cpupower. + -- Ben Hutchings Sun, 20 Mar 2016 15:35:32 +0000 linux-tools (4.4-4) unstable; urgency=medium diff --git a/debian/libcpupower-dev.install b/debian/libcpupower-dev.install new file mode 100644 index 000000000..b34190552 --- /dev/null +++ b/debian/libcpupower-dev.install @@ -0,0 +1,2 @@ +usr/include/* +usr/lib/lib*.so diff --git a/debian/libcpupower0.install b/debian/libcpupower0.install new file mode 100644 index 000000000..d0dbfd18a --- /dev/null +++ b/debian/libcpupower0.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* diff --git a/debian/libcpupower0.symbols b/debian/libcpupower0.symbols new file mode 100644 index 000000000..a356760d1 --- /dev/null +++ b/debian/libcpupower0.symbols @@ -0,0 +1,44 @@ +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/linux-cpupower.install b/debian/linux-cpupower.install new file mode 100644 index 000000000..21cca7cd9 --- /dev/null +++ b/debian/linux-cpupower.install @@ -0,0 +1,2 @@ +usr/bin +usr/share/ diff --git a/debian/patches/power-cpupower-fix-incorrect-if-statement.patch b/debian/patches/power-cpupower-fix-incorrect-if-statement.patch new file mode 100644 index 000000000..f9ea8613a --- /dev/null +++ b/debian/patches/power-cpupower-fix-incorrect-if-statement.patch @@ -0,0 +1,21 @@ +commit 2fecc6ec4961703ea2c8936f3e37154399a56a68 +Author: Mattia Dongili +Date: Sun Feb 14 11:55:43 2016 -0800 + + warning: comparison of constant ‘-1’ with boolean expression is always false + + Signed-off-by: Mattia Dongili + +diff --git a/tools/power/cpupower/utils/helpers/topology.c b/tools/power/cpupower/utils/helpers/topology.c +index 9cbb7fd..771ec60 100644 +--- a/tools/power/cpupower/utils/helpers/topology.c ++++ b/tools/power/cpupower/utils/helpers/topology.c +@@ -106,7 +106,7 @@ int get_cpu_topology(struct cpupower_topology *cpu_top) + cpu_top->pkgs++; + } + } +- if (!cpu_top->core_info[0].pkg == -1) ++ if (cpu_top->core_info[0].pkg != -1) + cpu_top->pkgs++; + + /* Intel's cores count is not consecutively numbered, there may diff --git a/debian/patches/power-cpupower-fix-manpages-NAME.patch b/debian/patches/power-cpupower-fix-manpages-NAME.patch new file mode 100644 index 000000000..491e0bce2 --- /dev/null +++ b/debian/patches/power-cpupower-fix-manpages-NAME.patch @@ -0,0 +1,63 @@ +commit 33104a54437ff182a3541d6c0089e5b8d89c25cd +Author: Mattia Dongili +Date: Fri Feb 19 07:46:32 2016 -0800 + + Fix cpupower manpages "NAME" section + + The token before "-" should be the program name, no spaces allowed. + See man(7) and lexgrog(1). + + Signed-off-by: Mattia Dongili + +diff --git a/tools/power/cpupower/man/cpupower-frequency-info.1 b/tools/power/cpupower/man/cpupower-frequency-info.1 +index 9c85a38..6aa8d23 100644 +--- a/tools/power/cpupower/man/cpupower-frequency-info.1 ++++ b/tools/power/cpupower/man/cpupower-frequency-info.1 +@@ -1,7 +1,7 @@ + .TH "CPUPOWER\-FREQUENCY\-INFO" "1" "0.1" "" "cpupower Manual" + .SH "NAME" + .LP +-cpupower frequency\-info \- Utility to retrieve cpufreq kernel information ++cpupower\-frequency\-info \- Utility to retrieve cpufreq kernel information + .SH "SYNTAX" + .LP + cpupower [ \-c cpulist ] frequency\-info [\fIoptions\fP] +diff --git a/tools/power/cpupower/man/cpupower-frequency-set.1 b/tools/power/cpupower/man/cpupower-frequency-set.1 +index 3eacc8d..b505702 100644 +--- a/tools/power/cpupower/man/cpupower-frequency-set.1 ++++ b/tools/power/cpupower/man/cpupower-frequency-set.1 +@@ -1,7 +1,7 @@ + .TH "CPUPOWER\-FREQUENCY\-SET" "1" "0.1" "" "cpupower Manual" + .SH "NAME" + .LP +-cpupower frequency\-set \- A small tool which allows to modify cpufreq settings. ++cpupower\-frequency\-set \- A small tool which allows to modify cpufreq settings. + .SH "SYNTAX" + .LP + cpupower [ \-c cpu ] frequency\-set [\fIoptions\fP] +diff --git a/tools/power/cpupower/man/cpupower-idle-info.1 b/tools/power/cpupower/man/cpupower-idle-info.1 +index 7b3646a..80a1311 100644 +--- a/tools/power/cpupower/man/cpupower-idle-info.1 ++++ b/tools/power/cpupower/man/cpupower-idle-info.1 +@@ -1,7 +1,7 @@ + .TH "CPUPOWER-IDLE-INFO" "1" "0.1" "" "cpupower Manual" + .SH "NAME" + .LP +-cpupower idle\-info \- Utility to retrieve cpu idle kernel information ++cpupower\-idle\-info \- Utility to retrieve cpu idle kernel information + .SH "SYNTAX" + .LP + cpupower [ \-c cpulist ] idle\-info [\fIoptions\fP] +diff --git a/tools/power/cpupower/man/cpupower-idle-set.1 b/tools/power/cpupower/man/cpupower-idle-set.1 +index 580c4e3..21916cf 100644 +--- a/tools/power/cpupower/man/cpupower-idle-set.1 ++++ b/tools/power/cpupower/man/cpupower-idle-set.1 +@@ -1,7 +1,7 @@ + .TH "CPUPOWER-IDLE-SET" "1" "0.1" "" "cpupower Manual" + .SH "NAME" + .LP +-cpupower idle\-set \- Utility to set cpu idle state specific kernel options ++cpupower\-idle\-set \- Utility to set cpu idle state specific kernel options + .SH "SYNTAX" + .LP + cpupower [ \-c cpulist ] idle\-info [\fIoptions\fP] diff --git a/debian/patches/series b/debian/patches/series index c1383d0b6..b1dd533e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,5 @@ perf-remove-wrong-semicolon-in-while-loop.patch revert-perf-tools-x86-build-perf-on-older-user-space.patch perf-tools-fix-bpf-feature-check.patch tools-build-use-fixdep-with-output-path-prefix.patch +power-cpupower-fix-incorrect-if-statement.patch +power-cpupower-fix-manpages-NAME.patch diff --git a/debian/rules.real b/debian/rules.real index ca34334c8..891c39ba1 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -3,7 +3,7 @@ export KBUILD_BUILD_TIMESTAMP := $(shell dpkg-parsechangelog | sed -ne 's,^Date: include debian/rules.defs -binary-arch: install-kbuild install-usbip install-liblockdep +binary-arch: install-kbuild install-usbip install-liblockdep install-cpupower ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),) binary-arch: install-perf endif @@ -43,6 +43,27 @@ install-kbuild: $(STAMPS_DIR)/build dh_md5sums dh_builddeb + +install-cpupower: DH_OPTIONS = -plinux-cpupower -plibcpupower0 -plibcpupower-dev +install-cpupower: DIR = $(CURDIR)/debian/cpupower-tmp +install-cpupower: $(STAMPS_DIR)/build + dh_testdir + dh_testroot + dh_prep + $(MAKE) -C $(BUILD_DIR)/tools/power/cpupower install top_srcdir=$(CURDIR) DESTDIR=$(DIR) + dh_install --sourcedir=$(DIR) + dh_installchangelogs + dh_installdocs + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + install-perf: PACKAGE_NAME = linux-perf-$(VERSION) install-perf: DH_OPTIONS = -p$(PACKAGE_NAME) install-perf: DIR = $(CURDIR)/debian/$(PACKAGE_NAME) diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 9da6d26ef..a64794b27 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -5,6 +5,35 @@ Multi-Arch: foreign Description: Kbuild infrastructure for Linux @version@ This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@. +Package: linux-cpupower +Section: admin +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: CPU frequency and voltage scaling tools for Linux + This package contains the 'power/cpupower' tools for Linux. + . + This set of userspace tools allow inspection and control of cpufreq and + cpuidle tunables for hardware that support these features. + The "cpupower" command replaces "cpufreq-info" and "cpufreq-set" in + cpufrequtils. + +Package: libcpupower0 +Section: libs +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: CPU frequency and voltage scaling tools for Linux (libraries) + This package contains the shared library. + +Package: libcpupower-dev +Section: libdevel +Architecture: linux-any +Depends: ${shlibs:Depends} +Provides: libcpufreq-dev +Conflicts: libcpufreq-dev +Replaces: libcpufreq-dev +Description: CPU frequency and voltage scaling tools for Linux (development files) + This package contains the 'power/cpupower' headers and library shared objects. + Package: linux-perf-@version@ Section: devel Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 761bf9b6a..109be7b49 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -7,7 +7,7 @@ Standards-Version: 3.9.6 Build-Depends: debhelper (>> 7), python3, asciidoc, bison, flex, gcc-multilib [amd64 ppc64 s390x sparc64], libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32], libperl-dev, libunwind8-dev [amd64 armel armhf arm64 i386], python-dev, xmlto, - autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev, + autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev, libpci-dev, dh-systemd Vcs-Git: https://anonscm.debian.org/git/kernel/linux-tools.git Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux-tools.git From ef781efeb9999d53dc48afa0a69005c996d5c2ed Mon Sep 17 00:00:00 2001 From: Mattia Dongili Date: Fri, 11 Mar 2016 08:07:19 -0800 Subject: [PATCH 3/8] W: linux-tools source: debhelper-but-no-misc-depends libcpupower-dev --- debian/templates/control.main.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index a64794b27..3b9372292 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -27,7 +27,7 @@ Description: CPU frequency and voltage scaling tools for Linux (libraries) Package: libcpupower-dev Section: libdevel Architecture: linux-any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Provides: libcpufreq-dev Conflicts: libcpufreq-dev Replaces: libcpufreq-dev From 6996e3594c7c895202fc09aa41af3ee99b8600e2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 15:57:16 +0000 Subject: [PATCH 4/8] Fix header format and add Forwarded fields for cpupower patches --- ...er-cpupower-fix-incorrect-if-statement.patch | 13 ++++++------- .../power-cpupower-fix-manpages-NAME.patch | 17 ++++++++--------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/debian/patches/power-cpupower-fix-incorrect-if-statement.patch b/debian/patches/power-cpupower-fix-incorrect-if-statement.patch index f9ea8613a..7773fa756 100644 --- a/debian/patches/power-cpupower-fix-incorrect-if-statement.patch +++ b/debian/patches/power-cpupower-fix-incorrect-if-statement.patch @@ -1,11 +1,10 @@ -commit 2fecc6ec4961703ea2c8936f3e37154399a56a68 -Author: Mattia Dongili -Date: Sun Feb 14 11:55:43 2016 -0800 - - warning: comparison of constant ‘-1’ with boolean expression is always false - - Signed-off-by: Mattia Dongili +From: Mattia Dongili +Date: Sun, 14 Feb 2016 19:55:43 +0000 +Subject: warning: comparison of constant ‘-1’ with boolean expression is always false +Forwarded: http://article.gmane.org/gmane.linux.power-management.general/73193 +Signed-off-by: Mattia Dongili +--- diff --git a/tools/power/cpupower/utils/helpers/topology.c b/tools/power/cpupower/utils/helpers/topology.c index 9cbb7fd..771ec60 100644 --- a/tools/power/cpupower/utils/helpers/topology.c diff --git a/debian/patches/power-cpupower-fix-manpages-NAME.patch b/debian/patches/power-cpupower-fix-manpages-NAME.patch index 491e0bce2..ee9534a8b 100644 --- a/debian/patches/power-cpupower-fix-manpages-NAME.patch +++ b/debian/patches/power-cpupower-fix-manpages-NAME.patch @@ -1,14 +1,13 @@ -commit 33104a54437ff182a3541d6c0089e5b8d89c25cd -Author: Mattia Dongili -Date: Fri Feb 19 07:46:32 2016 -0800 +From: Mattia Dongili +Date: Fri, 19 Feb 2016 07:46:32 -0800 +Subject: Fix cpupower manpages "NAME" section +Forwarded: http://article.gmane.org/gmane.linux.power-management.general/73191 - Fix cpupower manpages "NAME" section - - The token before "-" should be the program name, no spaces allowed. - See man(7) and lexgrog(1). - - Signed-off-by: Mattia Dongili +The token before "-" should be the program name, no spaces allowed. +See man(7) and lexgrog(1). +Signed-off-by: Mattia Dongili +--- diff --git a/tools/power/cpupower/man/cpupower-frequency-info.1 b/tools/power/cpupower/man/cpupower-frequency-info.1 index 9c85a38..6aa8d23 100644 --- a/tools/power/cpupower/man/cpupower-frequency-info.1 From cf4f32ccd156d2d35cf20fb13814c74c93b891a3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 16:06:01 +0000 Subject: [PATCH 5/8] debian/control: Update policy version to 3.9.7; no changes required --- debian/changelog | 3 +++ debian/templates/control.source.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a6b12f4a7..7674e585b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ linux-tools (4.4.6-1) UNRELEASED; urgency=medium [ Mattia Dongili ] * Build linux-cpupower. + [ Ben Hutchings ] + * debian/control: Update policy version to 3.9.7; no changes required + -- Ben Hutchings Sun, 20 Mar 2016 15:35:32 +0000 linux-tools (4.4-4) unstable; urgency=medium diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 109be7b49..4e9f714ed 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -3,7 +3,7 @@ Section: kernel Priority: optional Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Ben Hutchings , Jonathan Nieder -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Build-Depends: debhelper (>> 7), python3, asciidoc, bison, flex, gcc-multilib [amd64 ppc64 s390x sparc64], libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32], libperl-dev, libunwind8-dev [amd64 armel armhf arm64 i386], python-dev, xmlto, From 466e99f39753af7b4dd3fc0fe444efc44a1e1c58 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 16:19:25 +0000 Subject: [PATCH 6/8] linux-perf: Override lintian errors for perf-read-vdso{,x}32 in 64-bit packages --- debian/bin/gencontrol.py | 7 +++++++ debian/changelog | 2 ++ debian/rules.real | 1 + debian/templates/lintian-overrides.perf.in | 3 +++ 4 files changed, 13 insertions(+) create mode 100644 debian/templates/lintian-overrides.perf.in diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index d299ef252..33f4241fd 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -51,6 +51,13 @@ class gencontrol(Gencontrol): main = self.templates["control.main"] packages.extend(self.process_packages(main, self.vars)) + def substitute_file(template, target): + with codecs.open(target, 'w', 'utf-8') as f: + f.write(self.substitute(self.templates[template], self.vars)) + substitute_file('lintian-overrides.perf', + 'debian/linux-perf-%s.lintian-overrides' % + self.vars['version']) + def process_changelog(self): changelog = Changelog(version = VersionLinux) self.version = version = changelog[0].version diff --git a/debian/changelog b/debian/changelog index 7674e585b..b09489845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ linux-tools (4.4.6-1) UNRELEASED; urgency=medium [ Ben Hutchings ] * debian/control: Update policy version to 3.9.7; no changes required + * linux-perf: Override lintian errors for perf-read-vdso{,x}32 in + 64-bit packages -- Ben Hutchings Sun, 20 Mar 2016 15:35:32 +0000 diff --git a/debian/rules.real b/debian/rules.real index 891c39ba1..dd3980a64 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -76,6 +76,7 @@ install-perf: $(STAMPS_DIR)/build dh_python2 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/ dh_installchangelogs dh_installdocs + dh_lintian dh_strip dh_compress dh_fixperms diff --git a/debian/templates/lintian-overrides.perf.in b/debian/templates/lintian-overrides.perf.in new file mode 100644 index 000000000..858faa782 --- /dev/null +++ b/debian/templates/lintian-overrides.perf.in @@ -0,0 +1,3 @@ +# These executables are needed to handle processes running in compat mode +linux-perf-@version@: binary-from-other-architecture usr/lib/perf_@version@-core/perf-read-vdso32 +linux-perf-@version@: binary-from-other-architecture usr/lib/perf_@version@-core/perf-read-vdsox32 From cb4117a268832a5b2df44b10c7cbd98debf82028 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 16:22:21 +0000 Subject: [PATCH 7/8] debian/copyright: Move GPL-2 boilerplate to its own paragraph It is apparently valid to refer to licenses by short name alone only if the full text is placed in a standalone License paragraph, not as part of an earlier Files paragraph. --- debian/changelog | 1 + debian/copyright | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index b09489845..4d89242b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ linux-tools (4.4.6-1) UNRELEASED; urgency=medium * debian/control: Update policy version to 3.9.7; no changes required * linux-perf: Override lintian errors for perf-read-vdso{,x}32 in 64-bit packages + * debian/copyright: Move GPL-2 boilerplate to its own paragraph -- Ben Hutchings Sun, 20 Mar 2016 15:35:32 +0000 diff --git a/debian/copyright b/debian/copyright index 7ba027e84..6016868e6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,21 +11,6 @@ Comment: Files: * Copyright: 1991-2012 Linus Torvalds and many others License: GPL-2 - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of the GNU General Public License version - 2 can be found in `/usr/share/common-licenses/GPL-2'. Files: debian/* Copyright: 2006-2012 Debian kernel team @@ -49,3 +34,20 @@ License: LGPL-2.1 . On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General Public License version + 2 can be found in `/usr/share/common-licenses/GPL-2'. From 6e8c2c9ccde6047bcdc91f4af1657811d1cf70cf Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 16:23:48 +0000 Subject: [PATCH 8/8] Prepare to release linux-tools (4.4.6-1). --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4d89242b3..54bfd6245 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-tools (4.4.6-1) UNRELEASED; urgency=medium +linux-tools (4.4.6-1) unstable; urgency=medium * New upstream stable update: - tools lib traceevent: Fix output of %llu for 64 bit values read on @@ -19,7 +19,7 @@ linux-tools (4.4.6-1) UNRELEASED; urgency=medium 64-bit packages * debian/copyright: Move GPL-2 boilerplate to its own paragraph - -- Ben Hutchings Sun, 20 Mar 2016 15:35:32 +0000 + -- Ben Hutchings Sun, 20 Mar 2016 16:23:48 +0000 linux-tools (4.4-4) unstable; urgency=medium