debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

linux-perf: Use Python 3 for scripts

This commit is contained in:
Ben Hutchings 2018-07-06 22:35:41 +01:00
parent e442796757
commit 07eb9ee019
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -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 <ben@decadent.org.uk> Fri, 06 Jul 2018 20:55:47 +0100

3
debian/rules.d/tools/perf/Makefile vendored
View File

@ -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

2
debian/rules.real vendored
View File

@ -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

2
debian/templates/control.source.in vendored
View File

@ -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] <!stage1 !pkg.linux.notools !nopython>,
libperl-dev <!stage1 !pkg.linux.notools !nopython>,
libunwind8-dev [amd64 armel armhf arm64 i386] <!stage1 !pkg.linux.notools !nopython>,
python-dev <!stage1 !pkg.linux.notools !nopython>,
python3-dev <!stage1 !pkg.linux.notools !nopython>,
# used by upstream to build usbip
autoconf <!stage1 !pkg.linux.notools>,
automake <!stage1 !pkg.linux.notools>,