From ce591eedbf3cf87d19679c7a25ecd1c42e08be4d Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Tue, 21 Jun 2011 12:06:28 +0000 Subject: [PATCH] prepare for 3.0-rc4 all the build fixes landed svn path=/dists/trunk/linux-2.6/; revision=17714 --- debian/changelog | 4 +- .../all/Fix-build-for-patch-1-users.patch | 28 ------------ ...ake-flags-when-calling-kernel-make-k.patch | 31 ------------- ...SYMBOL-default_idle-pm_idle-if-CONFI.patch | 43 ------------------- debian/patches/series/base | 3 -- 5 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 debian/patches/bugfix/all/Fix-build-for-patch-1-users.patch delete mode 100644 debian/patches/bugfix/all/perf-clear-out-make-flags-when-calling-kernel-make-k.patch delete mode 100644 debian/patches/bugfix/x86/x86-idle-EXPORT_SYMBOL-default_idle-pm_idle-if-CONFI.patch diff --git a/debian/changelog b/debian/changelog index 2fec4e807..e288bde27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -linux-2.6 (3.0.0~rc3-1~experimental.2) UNRELEASED; urgency=low +linux-2.6 (3.0.0~rc4-1~experimental.1) UNRELEASED; urgency=low + + * New upstream release candidate [ maximilian attems ] * [x86] enable modular INTEL_OAKTRAIL, ACPI_APEI_PCIEAER. diff --git a/debian/patches/bugfix/all/Fix-build-for-patch-1-users.patch b/debian/patches/bugfix/all/Fix-build-for-patch-1-users.patch deleted file mode 100644 index ad08adc14..000000000 --- a/debian/patches/bugfix/all/Fix-build-for-patch-1-users.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f6477b487741738528bbc74741ef00885fdea56c Mon Sep 17 00:00:00 2001 -From: maximilian attems -Date: Tue, 14 Jun 2011 22:54:35 +0200 -Subject: [PATCH] Fix build for patch(1) users - -fixes: -make: execvp: /usr/src/linux-3.0-rc3/scripts/depmod.sh: Permission denied -Signed-off-by: maximilian attems ---- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index badb923..b6230c4 100644 ---- a/Makefile -+++ b/Makefile -@@ -1526,7 +1526,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) - - # Run depmod only if we have System.map and depmod is executable - quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) -- cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE) -+ cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE) - - # Create temporary dir for module support files - # clean it up only when building all modules --- -1.7.2.5 - 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 deleted file mode 100644 index c5d1d4527..000000000 --- a/debian/patches/bugfix/all/perf-clear-out-make-flags-when-calling-kernel-make-k.patch +++ /dev/null @@ -1,31 +0,0 @@ -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/bugfix/x86/x86-idle-EXPORT_SYMBOL-default_idle-pm_idle-if-CONFI.patch b/debian/patches/bugfix/x86/x86-idle-EXPORT_SYMBOL-default_idle-pm_idle-if-CONFI.patch deleted file mode 100644 index 37b7a557c..000000000 --- a/debian/patches/bugfix/x86/x86-idle-EXPORT_SYMBOL-default_idle-pm_idle-if-CONFI.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f9d090586dd64c90271782a2cb738e1ab0b720f2 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Fri, 10 Jun 2011 04:30:04 +0100 -Subject: [PATCH] x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) if - CONFIG_APM_MODULE (only) - -Commit 06ae40ce073daf233607a3c54a489f2c1e44683e ('x86 idle: -EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it') made -these exports dependent on CONFIG_APM_MODULE && CONFIG_APM_CPU_IDLE. -However, the apm module always needs these symbols. -CONFIG_APM_CPU_IDLE only controls whether it installs its CPU idle -handler by default. - -Signed-off-by: Ben Hutchings ---- - arch/x86/kernel/process.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c -index 2e4928d..e1ba8cb 100644 ---- a/arch/x86/kernel/process.c -+++ b/arch/x86/kernel/process.c -@@ -337,7 +337,7 @@ EXPORT_SYMBOL(boot_option_idle_override); - * Powermanagement idle function, if any.. - */ - void (*pm_idle)(void); --#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE) -+#ifdef CONFIG_APM_MODULE - EXPORT_SYMBOL(pm_idle); - #endif - -@@ -399,7 +399,7 @@ void default_idle(void) - cpu_relax(); - } - } --#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE) -+#ifdef CONFIG_APM_MODULE - EXPORT_SYMBOL(default_idle); - #endif - --- -1.7.5.3 - diff --git a/debian/patches/series/base b/debian/patches/series/base index b61043f45..718754017 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -45,6 +45,3 @@ + bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch + bugfix/mips/mips-i8259-use-struct-syscore_ops-instead-of-sysdevs.patch + 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