[kernel] r15734 - in dists/sid/linux-2.6/debian: . patches/bugfix/ia64 patches/series

[Ben Hutchings]

Author: benh
Date: Tue May 18 01:29:21 2010
New Revision: 15734

Log:
[ia64] Hardcode the output of the scripts under arch/ia64/scripts so
that we can build out-of-tree modules correctly (refresh and re-add
dropped patch) (Closes: #392592)

Added:
   dists/sid/linux-2.6/debian/patches/series/14
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue May 18 01:11:51 2010	(r15733)
+++ dists/sid/linux-2.6/debian/changelog	Tue May 18 01:29:21 2010	(r15734)
@@ -1,3 +1,12 @@
+linux-2.6 (2.6.32-14) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [ia64] Hardcode the output of the scripts under arch/ia64/scripts so
+    that we can build out-of-tree modules correctly (refresh and re-add
+    dropped patch) (Closes: #392592)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 18 May 2010 02:13:44 +0100
+
 linux-2.6 (2.6.32-13) unstable; urgency=low
 
   [ Frederik Schueler ]

Modified: dists/sid/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch	Tue May 18 01:11:51 2010	(r15733)
+++ dists/sid/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch	Tue May 18 01:29:21 2010	(r15734)
@@ -1,6 +1,8 @@
---- linux-source-2.6.18/arch/ia64/Makefile.orig	2007-01-03 17:26:31.000000000 -0700
-+++ linux-source-2.6.18/arch/ia64/Makefile	2007-01-03 17:57:52.000000000 -0700
-@@ -28,16 +28,7 @@
+diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
+index e7cbaa0..c8af869 100644
+--- a/arch/ia64/Makefile
++++ b/arch/ia64/Makefile
+@@ -30,16 +30,7 @@ cflags-y	:= -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \
  		   -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
  CFLAGS_KERNEL	:= -mconstant-gp
  
@@ -16,9 +18,9 @@
 -endif
 +KBUILD_CPPFLAGS += -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE
  
- ifeq ($(call cc-version),0304)
- 	cflags-$(CONFIG_ITANIUM)	+= -mtune=merced
-@@ -67,7 +58,7 @@
+ KBUILD_CFLAGS += $(cflags-y)
+ head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
+@@ -69,7 +60,7 @@ boot := arch/ia64/hp/sim/boot
  
  PHONY += boot compressed check
  
@@ -27,7 +29,7 @@
  
  compressed: vmlinux.gz
  
-@@ -76,9 +67,6 @@
+@@ -78,9 +69,6 @@ vmlinuz: vmlinux.gz
  vmlinux.gz: vmlinux
  	$(Q)$(MAKE) $(build)=$(boot) $@
  
@@ -37,9 +39,11 @@
  archclean:
  	$(Q)$(MAKE) $(clean)=$(boot)
  
-@@ -94,5 +82,4 @@
+@@ -96,7 +84,6 @@ define archhelp
    echo '* compressed	- Build compressed kernel image'
    echo '  install	- Install compressed kernel image'
    echo '  boot		- Build vmlinux and bootloader for Ski simulator'
 -  echo '* unwcheck	- Check vmlinux for invalid unwind info'
  endef
+ 
+ archprepare: make_nr_irqs_h FORCE

Added: dists/sid/linux-2.6/debian/patches/series/14
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/14	Tue May 18 01:29:21 2010	(r15734)
@@ -0,0 +1 @@
++ bugfix/ia64/hardcode-arch-script-output.patch