[kernel] r21789 - in dists/trunk/linux-tools/debian: . build/scripts patches

Ben Hutchings benh at moszumanska.debian.org
Mon Sep 8 17:43:57 UTC 2014


Author: benh
Date: Mon Sep  8 17:43:57 2014
New Revision: 21789

Log:
linux-kbuild: Build and install recordmcount and recordmcount.pl

These are needed now that we build kernels with DYNAMIC_FTRACE enabled.

Also fix the recordmcount dependency for OOT modules - they should not
depend on its source files!

Added:
   dists/trunk/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch
Modified:
   dists/trunk/linux-tools/debian/build/scripts/Makefile
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/patches/series

Modified: dists/trunk/linux-tools/debian/build/scripts/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/Makefile	Mon Sep  8 17:39:59 2014	(r21788)
+++ dists/trunk/linux-tools/debian/build/scripts/Makefile	Mon Sep  8 17:43:57 2014	(r21789)
@@ -2,7 +2,8 @@
 	bin2c \
 	conmakehash \
 	kallsyms \
-	pnmtologo
+	pnmtologo \
+	recordmcount
 
 DATA = \
 	Kbuild.include \
@@ -33,6 +34,7 @@
 	mkuboot.sh \
 	namespace.pl \
 	patch-kernel \
+	recordmcount.pl \
 	setlocalversion \
 	ver_linux
 

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Mon Sep  8 17:39:59 2014	(r21788)
+++ dists/trunk/linux-tools/debian/changelog	Mon Sep  8 17:43:57 2014	(r21789)
@@ -5,6 +5,11 @@
   [ Mauricio Faria de Oliveira ]
   * [ppc64el] Build linux-tools binary package (Closes: #754213)
 
+  [ Ben Hutchings ]
+  * linux-kbuild: Build and install recordmcount and recordmcount.pl,
+    needed for kernels with DYNAMIC_FTRACE enabled
+  * linux-kbuild: Fix recordmcount dependency for OOT modules
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 23 Aug 2014 17:50:42 -0700
 
 linux-tools (3.16~rc7-1~exp1) experimental; urgency=medium

Added: dists/trunk/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch	Mon Sep  8 17:43:57 2014	(r21789)
@@ -0,0 +1,22 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: kbuild: Fix recordmcount dependency for OOT modules
+Date: Mon, 08 Sep 2014 18:31:24 +0100
+
+We never rebuild anything in-tree when building an out-of-tree
+modules, so external modules should not depend on the recordmcount
+sources.
+
+--- a/scripts/Makefile.build
++++ b/scripts/Makefile.build
+@@ -240,6 +240,11 @@ cmd_record_mcount = 						\
+ 	fi;
+ endif
+ 
++# Don't require recordmcount source for an OOT build.
++ifdef KBUILD_EXTMOD
++recordmcount_source :=
++endif
++
+ define rule_cc_o_c
+ 	$(call echo-cmd,checksrc) $(cmd_checksrc)			  \
+ 	$(call echo-cmd,cc_o_c) $(cmd_cc_o_c);				  \

Modified: dists/trunk/linux-tools/debian/patches/series
==============================================================================
--- dists/trunk/linux-tools/debian/patches/series	Mon Sep  8 17:39:59 2014	(r21788)
+++ dists/trunk/linux-tools/debian/patches/series	Mon Sep  8 17:43:57 2014	(r21789)
@@ -2,3 +2,4 @@
 tools-perf-version.patch
 tools-perf-install.patch
 usbip-document-tcp-wrappers.patch
+kbuild-fix-recordmcount-dependency.patch



More information about the Kernel-svn-changes mailing list