diff --git a/debian/changelog b/debian/changelog index 5baf6b3b3..e279596ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux (4.18~rc3-1~exp2) UNRELEASED; urgency=medium * Build docs using Python 3 version of Sphinx * linux-perf: Build docs using asciidoctor + * linux-perf: Use Python 3 for scripts -- Ben Hutchings Fri, 06 Jul 2018 20:55:47 +0100 diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile index 809273abe..027327a05 100644 --- a/debian/rules.d/tools/perf/Makefile +++ b/debian/rules.d/tools/perf/Makefile @@ -54,6 +54,9 @@ MAKE_PERF += LIBBABELTRACE=1 # Build with asciidoctor, not asciidoc MAKE_PERF += USE_ASCIIDOCTOR=1 +# Build with Python 3, not Python 2 +MAKE_PERF += PYTHON=/usr/bin/python3 + all: ifdef KERNEL_ARCH_PERF # perf changes some default directories depending on whether DESTDIR is diff --git a/debian/rules.real b/debian/rules.real index 20619c698..7ecc967bd 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -655,7 +655,7 @@ install-perf: $(STAMPS_DIR)/build-tools dh_prep $(call make-tools,tools/perf) install DESTDIR=$(DIR) dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/ - dh_python2 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/ + dh_python3 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/ dh_installchangelogs ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) dh_installdocs diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index fcbb6eaa7..4a06c465f 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -43,7 +43,7 @@ Build-Depends-Arch: libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc powerpcspe ppc64 ppc64el sparc x32] , libperl-dev , libunwind8-dev [amd64 armel armhf arm64 i386] , - python-dev , + python3-dev , # used by upstream to build usbip autoconf , automake ,