From 12d9a93b79dadbc8c4eaeb2c80a5c13f834d50c0 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 16 Jun 2011 13:06:27 +0000 Subject: [PATCH] release 3.0-rc3 now all build fixes have materialised in linux-next. svn path=/dists/trunk/linux-2.6/; revision=17702 --- debian/changelog | 5 +-- ...ake-flags-when-calling-kernel-make-k.patch | 31 +++++++++++++++++++ debian/patches/series/base | 1 + 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 debian/patches/bugfix/all/perf-clear-out-make-flags-when-calling-kernel-make-k.patch diff --git a/debian/changelog b/debian/changelog index 6d7ef6426..c87a35889 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (3.0.0~rc3-1~experimental.1) UNRELEASED; urgency=low +linux-2.6 (3.0.0~rc3-1~experimental.1) experimental; urgency=low * New upstream release candidate @@ -10,8 +10,9 @@ linux-2.6 (3.0.0~rc3-1~experimental.1) UNRELEASED; urgency=low * Update configs. * Topconfig enable BPF_JIT. (closes: #630553) * Update debconf pt (Américo Monteiro) translations. (closes: #627631) + * Add kbuild fixes out of linux-next. - -- maximilian attems Tue, 14 Jun 2011 23:02:35 +0200 + -- maximilian attems Thu, 16 Jun 2011 15:04:33 +0200 linux-2.6 (3.0.0~rc2-1~experimental.1) experimental; urgency=low diff --git a/debian/patches/bugfix/all/perf-clear-out-make-flags-when-calling-kernel-make-k.patch b/debian/patches/bugfix/all/perf-clear-out-make-flags-when-calling-kernel-make-k.patch new file mode 100644 index 000000000..c5d1d4527 --- /dev/null +++ b/debian/patches/bugfix/all/perf-clear-out-make-flags-when-calling-kernel-make-k.patch @@ -0,0 +1,31 @@ +From 37aa9a2eb4d9b1a4aec1fd18bb2bb6bca029de27 Mon Sep 17 00:00:00 2001 +From: Andy Whitcroft +Date: Wed, 15 Jun 2011 14:35:00 +0100 +Subject: [PATCH] perf: clear out make flags when calling kernel make kernelver + +When generating the perf version from the kernel version using 'make +kernelver' it is necessary to clear out any MAKEFLAGS otherwise they may +trigger additional output which pollute the contents. + +Signed-off-by: Andy Whitcroft +Signed-off-by: Michal Marek +--- + tools/perf/util/PERF-VERSION-GEN | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN +index 9c5fb4d..ad73300 100755 +--- a/tools/perf/util/PERF-VERSION-GEN ++++ b/tools/perf/util/PERF-VERSION-GEN +@@ -23,7 +23,7 @@ if test -d ../../.git -o -f ../../.git && + then + VN=$(echo "$VN" | sed -e 's/-/./g'); + else +- VN=$(make -sC ../.. kernelversion) ++ VN=$(MAKEFLAGS= make -sC ../.. kernelversion) + fi + + VN=$(expr "$VN" : v*'\(.*\)') +-- +1.7.2.5 + diff --git a/debian/patches/series/base b/debian/patches/series/base index 89b0a2c79..b61043f45 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -47,3 +47,4 @@ + bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch + bugfix/x86/x86-idle-EXPORT_SYMBOL-default_idle-pm_idle-if-CONFI.patch + bugfix/all/Fix-build-for-patch-1-users.patch ++ bugfix/all/perf-clear-out-make-flags-when-calling-kernel-make-k.patch