[kernel] r8401 - in dists/trunk/linux-2.6/debian: .
patches/bugfix/ia64 patches/series
Dann Frazier
dannf at alioth.debian.org
Mon Mar 26 23:30:51 UTC 2007
Author: dannf
Date: Mon Mar 26 22:30:51 2007
New Revision: 8401
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
continue merging hack to workaround #392592, against my better judgment
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Mon Mar 26 22:30:51 2007
@@ -165,7 +165,13 @@
[ Frederik Schüler ]
* Disable NAPI on forcedeth, it is broken.
- -- Bastian Blank <waldi at debian.org> Fri, 16 Mar 2007 19:24:10 +0100
+ [ dann frazier ]
+ * Hardcode the output of the scripts under arch/ia64/scripts as executed
+ in an etch environment so that we can build out of tree modules correctly
+ (re-add; patch seems to have been dropped during a merge.)
+ See: #392592
+
+ -- dann frazier <dannf at debian.org> Mon, 26 Mar 2007 15:57:54 -0600
linux-2.6 (2.6.18.dfsg.1-10) unstable; urgency=low
Added: dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch Mon Mar 26 22:30:51 2007
@@ -0,0 +1,45 @@
+--- 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 @@
+ -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
+ CFLAGS_KERNEL := -mconstant-gp
+
+-GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
+-CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
+-
+-ifeq ($(GAS_STATUS),buggy)
+-$(error Sorry, you need a newer version of the assember, one that is built from \
+- a source-tree that post-dates 18-Dec-2002. You can find a pre-compiled \
+- static binary of such an assembler at: \
+- \
+- ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
+-endif
++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 @@
+
+ PHONY += boot compressed check
+
+-all: compressed unwcheck
++all: compressed
+
+ compressed: vmlinux.gz
+
+@@ -76,9 +67,6 @@
+ vmlinux.gz: vmlinux
+ $(Q)$(MAKE) $(build)=$(boot) $@
+
+-unwcheck: vmlinux
+- -$(Q)READELF=$(READELF) $(srctree)/arch/ia64/scripts/unwcheck.py $<
+-
+ archclean:
+ $(Q)$(MAKE) $(clean)=$(boot)
+
+@@ -94,5 +82,4 @@
+ 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
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Mon Mar 26 22:30:51 2007
@@ -38,3 +38,4 @@
+ bugfix/all/stable/2.6.20.2
+ bugfix/powerpc/drivers_macintosh-broken.patch
+ bugfix/2.6.20.3
++ bugfix/ia64/hardcode-arch-script-output.patch
More information about the Kernel-svn-changes
mailing list