From: Andy Whitcroft <apw@canonical.com>
Date: Sat, 27 Feb 2016 11:28:02 +0000 (+0000)
Subject: UBUNTU: [Debian] perf -- build in the context of the full generated local headers
X-Git-Tag: Ubuntu-4.10.0-9.11~530
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=a5dc0bc8bea976bb0643eac6c3ae6ecd15892e28;p=mirror_ubuntu-zesty-kernel.git

UBUNTU: [Debian] perf -- build in the context of the full generated local headers

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index bdf9a3bdb898..f5b7464cad42 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -569,9 +569,7 @@ $(stampdir)/stamp-prepare-perarch:
 ifeq ($(do_any_tools),true)
 	rm -rf $(builddirpa)
 	install -d $(builddirpa)
-	for i in *; do $(LN) $(CURDIR)/$$i $(builddirpa); done
-	rm $(builddirpa)/tools
-	rsync -a tools/ $(builddirpa)/tools/
+	rsync -a --exclude debian --exclude debian.master --exclude $(DEBIAN) --exclude .git -a ./ $(builddirpa)/
 endif
 	touch $@
 
@@ -594,8 +592,15 @@ ifeq ($(do_tools_cpupower),true)
 		LIB_MIN=$(abi_release) CPUFREQ_BENCH=false
 endif
 ifeq ($(do_tools_perf),true)
+	cd $(builddirpa) && $(kmake) $(defconfig)
+	mv $(builddirpa)/.config $(builddirpa)/.config.old
+	sed -e 's/^# \(CONFIG_MODVERSIONS\) is not set$$/\1=y/' \
+	  -e 's/.*CONFIG_LOCALVERSION_AUTO.*/# CONFIG_LOCALVERSION_AUTO is not set/' \
+	  $(builddirpa)/.config.old > $(builddirpa)/.config
+	cd $(builddirpa) && $(kmake) silentoldconfig
+	cd $(builddirpa) && $(kmake) prepare
 	cd $(builddirpa)/tools/perf && \
-		make prefix=/usr HAVE_CPLUS_DEMANGLE=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 PYTHON=python2.7
+		$(kmake) prefix=/usr HAVE_CPLUS_DEMANGLE=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 PYTHON=python2.7
 endif
 ifeq ($(do_tools_x86),true)
 	cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE)