[kernel] r5820 - in people/waldi/linux-2.6: . debian debian/arch debian/arch/amd64 debian/arch/i386 debian/arch/s390 debian/arch/sparc debian/bin debian/patches debian/patches/series

Bastian Blank waldi at costa.debian.org
Sat Feb 11 18:21:13 UTC 2006 

Author: waldi
Date: Sat Feb 11 18:21:10 2006
New Revision: 5820

Removed:
   people/waldi/linux-2.6/debian/patches/m68k-bvme.patch
   people/waldi/linux-2.6/debian/patches/m68k-incompatible.patch
   people/waldi/linux-2.6/debian/patches/m68k-mvme147.patch
   people/waldi/linux-2.6/debian/patches/m68k-mvme16x.patch
   people/waldi/linux-2.6/debian/patches/m68k-spinlock.patch
   people/waldi/linux-2.6/debian/patches/sparc64-atyfb-xl-gr-final.patch
Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/arch/amd64/config
   people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
   people/waldi/linux-2.6/debian/arch/amd64/defines
   people/waldi/linux-2.6/debian/arch/config
   people/waldi/linux-2.6/debian/arch/i386/config
   people/waldi/linux-2.6/debian/arch/i386/config.486
   people/waldi/linux-2.6/debian/arch/i386/config.686
   people/waldi/linux-2.6/debian/arch/i386/config.k7
   people/waldi/linux-2.6/debian/arch/i386/defines
   people/waldi/linux-2.6/debian/arch/s390/config
   people/waldi/linux-2.6/debian/arch/sparc/config.sparc64
   people/waldi/linux-2.6/debian/arch/sparc/config.sparc64-smp
   people/waldi/linux-2.6/debian/arch/sparc/defines
   people/waldi/linux-2.6/debian/bin/apply.py
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/changelog
   people/waldi/linux-2.6/debian/patches/arm-fix-dc21285.patch
   people/waldi/linux-2.6/debian/patches/arm-memory-h-page-shift.patch
   people/waldi/linux-2.6/debian/patches/series/0experimental.1
   people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra
   people/waldi/linux-2.6/debian/rules.real
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/arch/amd64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config	(original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config	Sat Feb 11 18:21:10 2006
@@ -1571,3 +1571,13 @@
 CONFIG_MOXA_INTELLIO=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_PCI_MSI=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC=m
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_POLL=y
+CONFIG_EDAC_I82860=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_R82600=m

Modified: people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	(original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	Sat Feb 11 18:21:10 2006
@@ -33,3 +33,4 @@
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_ACPI_NUMA=y
+CONFIG_MIGRATION=y

Modified: people/waldi/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/amd64/defines	Sat Feb 11 18:21:10 2006
@@ -6,7 +6,7 @@
  amd64-k8-smp
  em64t-p4
  em64t-p4-smp
-suggests: lilo (>= 19.1) | grub, fdutils
+suggests: grub | lilo (>= 19.1)
 
 kernel-arch: x86_64
 

Modified: people/waldi/linux-2.6/debian/arch/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/config	(original)
+++ people/waldi/linux-2.6/debian/arch/config	Sat Feb 11 18:21:10 2006
@@ -766,3 +766,6 @@
 CONFIG_MTD_DATAFLASH=m
 # CONFIG_FORCED_INLINING is not set
 CONFIG_CLEAN_COMPILE=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_USB_ET61X251=m
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set

Modified: people/waldi/linux-2.6/debian/arch/i386/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config	Sat Feb 11 18:21:10 2006
@@ -2,7 +2,6 @@
 CONFIG_UID16=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
-# CONFIG_CLEAN_COMPILE is not set
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 CONFIG_EMBEDDED=y
@@ -1833,3 +1832,19 @@
 CONFIG_SND_CS5535AUDIO=m
 CONFIG_VM86=y
 CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_PAGE_OFFSET=0xB0000000
+CONFIG_EDAC=m
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_POLL=y
+# CONFIG_VMSPLIT_3G is not set
+CONFIG_VMSPLIT_3G_OPT=y
+CONFIG_EDAC_I82860=m
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_R82600=m
+CONFIG_CLEAN_COMPILE=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.486
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.486	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.486	Sat Feb 11 18:21:10 2006
@@ -110,3 +110,4 @@
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_WP_WORKS_OK=y
+CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.686	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.686	Sat Feb 11 18:21:10 2006
@@ -84,3 +84,4 @@
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
+CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.k7	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.k7	Sat Feb 11 18:21:10 2006
@@ -85,3 +85,4 @@
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
+CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/i386/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/defines	Sat Feb 11 18:21:10 2006
@@ -8,7 +8,7 @@
  k7-smp
 kernel-arch: i386
 kernel-header-dirs: i386
-suggests: lilo (>= 19.1) | grub, fdutils
+suggests: grub | lilo (>= 19.1)
 
 [686]
 class: PPro/Celeron/PII/PIII/P4

Modified: people/waldi/linux-2.6/debian/arch/s390/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/s390/config	(original)
+++ people/waldi/linux-2.6/debian/arch/s390/config	Sat Feb 11 18:21:10 2006
@@ -179,3 +179,4 @@
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_IPW2100 is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_HANGCHECK_TIMER is not set

Modified: people/waldi/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/config.sparc64	(original)
+++ people/waldi/linux-2.6/debian/arch/sparc/config.sparc64	Sat Feb 11 18:21:10 2006
@@ -395,3 +395,4 @@
 # CONFIG_USB_TEST is not set
 # CONFIG_PROFILING is not set
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_MAGIC_SYSRQ is not set

Modified: people/waldi/linux-2.6/debian/arch/sparc/config.sparc64-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/config.sparc64-smp	(original)
+++ people/waldi/linux-2.6/debian/arch/sparc/config.sparc64-smp	Sat Feb 11 18:21:10 2006
@@ -400,3 +400,4 @@
 # CONFIG_PROFILING is not set
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_MAGIC_SYSRQ is not set

Modified: people/waldi/linux-2.6/debian/arch/sparc/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/sparc/defines	Sat Feb 11 18:21:10 2006
@@ -1,16 +1,27 @@
 [base]
 depends: initramfs-tools | yaird | linux-initramfs-tool
 flavours:
+ sparc32
  sparc64
  sparc64-smp
-kernel-arch: sparc64
-kpkg-subarch: sparc64
-kernel-header-dirs: sparc64
 suggests: silo, fdutils
 
+[sparc32]
+kernel-arch: sparc
+kernel-subarch: sparc
+kernel-headers-dirs: sparc
+image-postproc: strip -R .comment -R .note -K sun4u_init -K _end -K _start arch/sparc/boot/image
+class: uniprocessor sparc32 (sun4m) machines
+
 [sparc64]
+kernel-arch: sparc64
+kpkg-subarch: sparc64
+kernel-header-dirs: sparc64
 class: uniprocessor 64-bit UltraSPARC class
 
 [sparc64-smp]
+kernel-arch: sparc64
+kpkg-subarch: sparc64
+kernel-header-dirs: sparc64
 class: multi-processor 64-bit UltraSPARC class
 

Modified: people/waldi/linux-2.6/debian/bin/apply.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/apply.py	(original)
+++ people/waldi/linux-2.6/debian/bin/apply.py	Sat Feb 11 18:21:10 2006
@@ -24,7 +24,10 @@
                 continue
 
             items = line.split(' ')
-            operation, patch = items
+            if len(items) != 2:
+                raise RuntimeError, "Line '%s' in file %s malformed." % (line, filename)
+            else:
+                operation, patch = items
 
             if operation in ('+', '-'):
                 patchfile = os.path.join(home, patch)

Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Sat Feb 11 18:21:10 2006
@@ -83,6 +83,7 @@
             ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
+            ('image-postproc', 'IMAGE_POSTPROC'),
             ('type', 'TYPE'),
         ):
             if config_entry.has_key(i[0]):

Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog	(original)
+++ people/waldi/linux-2.6/debian/changelog	Sat Feb 11 18:21:10 2006
@@ -1,8 +1,24 @@
-linux-2.6 (2.6.15+2.6.16-rc1-0experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.15+2.6.16-rc2-0experimental.1) UNRELEASED; urgency=low
 
+  [ Frederik Schüler ]
   * New upstream release.
 
- -- Frederik Schüler <fs at debian.org>  Tue, 17 Jan 2006 20:25:26 +0100
+  [ maximilian attems ]
+  * Drop fdutils from i386 and amd64 Suggests.
+  * Swap lilo and grub Suggests for i386 and amd64.
+
+  [ Jurij Smakov ]
+  * Make sure that LOCALVERSION environment variable is not
+    passed to a shell while invoking make-kpkg, since it
+    appends it to the version string, breaking the build.
+    Closes: #349472
+  * [sparc32] Re-enable the building of sparc32 images.
+  * [sparc64] Re-add (partial) sparc64-atyf-xl-gr.patch, since it
+    was only partially applied upstream, so the problem (garbled
+    screen output on SunBlade 100) is still present. Thanks to
+    Luis Ortiz for pointing it out.
+    
+ -- Frederik Schüler <fs at debian.org>  Fri,  3 Feb 2006 14:36:04 +0100
 
 linux-2.6 (2.6.15-3) unstable; urgency=low
 

Modified: people/waldi/linux-2.6/debian/patches/arm-fix-dc21285.patch
==============================================================================
--- people/waldi/linux-2.6/debian/patches/arm-fix-dc21285.patch	(original)
+++ people/waldi/linux-2.6/debian/patches/arm-fix-dc21285.patch	Sat Feb 11 18:21:10 2006
@@ -1,6 +1,7 @@
 ## DP: Fix compilation errors in dc21285.c
 ## DP: Patch author: Martin Michlmayr <tbm at cyrius.com>
-## DP: Upstream status: Submitted
+## DP: Upstream status: Submitted, see
+##     http://lists.infradead.org/pipermail/linux-mtd/2006-January/014709.html
 #
 
 --- old/drivers/mtd/maps/dc21285.c~	2006-01-10 19:40:53.000000000 +0000

Modified: people/waldi/linux-2.6/debian/patches/arm-memory-h-page-shift.patch
==============================================================================
--- people/waldi/linux-2.6/debian/patches/arm-memory-h-page-shift.patch	(original)
+++ people/waldi/linux-2.6/debian/patches/arm-memory-h-page-shift.patch	Sat Feb 11 18:21:10 2006
@@ -1,6 +1,11 @@
 ## DP: Fix error "PAGE_SHIFT undeclared"
 ## DP: Patch author: Rod Whitby <rod at whitby.id.au>
-## DP: Upstream status: in ARM tree
+## DP: Upstream status: in ARM tree, in 2.6.16rc1
+# commit 313cbb5519405966e3e65fca86c0305ab24f2a3b
+# tree 949bb8daf7a32d5921cabe9d129df1d6342d40da
+# parent 8d27e6992bc6a7ca7eaa1d29fb1a8d6cb6022c45
+# author Rod Whitby <rod at whitby.id.au> Wed, 04 Jan 2006 17:17:13 +0000
+# committer Russell King <rmk+kernel at arm.linux.org.uk> Wed, 04 Jan 2006 17:17:13 +0000
 #
 
 http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=3218/1

Modified: people/waldi/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- people/waldi/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ people/waldi/linux-2.6/debian/patches/series/0experimental.1	Sat Feb 11 18:21:10 2006
@@ -8,15 +8,12 @@
 + arm-fix-dc21285.patch
 + mtdpart-redboot-fis-byteswap.patch
 + ia64-irq-affinity-upfix.patch
-+ m68k-bvme.patch
-+ m68k-mvme147.patch
-+ m68k-mvme16x.patch
-+ m68k-spinlock.patch
 + powerpc-mkvmlinuz-support.patch
 + powerpc-build-links.patch
-+ powerpc-mv643xx-spinlock-fix-support.patch
+#FIXME + powerpc-mv643xx-spinlock-fix-support.patch
 + powerpc-prep-utah-ide-interrupt.patch
 + powerpc-mv643xx-hotplug-support.patch
 #FIXME + powerpc-serial.patch 
 #FIXME + powerpc-apus.patch
 + sparc64-hme-lockup.patch
++ sparc64-atyfb-xl-gr.patch

Modified: people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra
==============================================================================
--- people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra	(original)
+++ people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra	Sat Feb 11 18:21:10 2006
@@ -1,4 +1,3 @@
 #+ hppa-incompatible.patch hppa
-#+ m68k-incompatible.patch m68k
 #+ maclist.patch arm
 #+ arm-nslu2-maclist.patch arm

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Sat Feb 11 18:21:10 2006
@@ -42,7 +42,7 @@
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
   kpkg_image += --cross-compile='$(DEB_HOST_GNU_TYPE)'
 endif
-setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION
+setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION -u LOCALVERSION
 setup_env += DEBIAN_LOCALVERSION='-$(ABINAME)$(LOCALVERSION)'
 setup_env += DEBIAN_LOCALVERSION_HEADERS='-$(ABINAME)$(LOCALVERSION_HEADERS)'
 setup_env += DEBIAN_VERSION='$(VERSION)'
@@ -128,9 +128,6 @@
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 	ln -fs "$$(command -v touch)" debian/build/touch.orig
 	cd '$(DIR)'; $(setup_env) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
-ifdef image_postproc
-	cd '$(DIR)'; $(image_postproc)
-endif
 	touch '$@'
 
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
@@ -165,6 +162,9 @@
 	cd '$(DIR)' && $(setup_env) make-kpkg --stem linux 		\
 		--config defconfig kernel-manual
 	cat '$(DIR)/debian/files' >> debian/files
+ifdef IMAGE_POSTPROC
+	cd '$(DIR)'; $(IMAGE_POSTPROC)
+endif
 	@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do	\
 	  echo "mv \"$(BUILD_DIR)/$$i\" ..";				\
 	  mv "$(BUILD_DIR)/$$i" ..;					\
@@ -187,6 +187,9 @@
 	install debian/bin/install-image '$(DIR)/debian/post-install'
 	cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
 	cat '$(DIR)/debian/files' >> debian/files
+ifdef IMAGE_POSTPROC
+	cd '$(DIR)'; $(IMAGE_POSTPROC)
+endif
 	@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do	\
 	  echo "mv \"$(BUILD_DIR)/$$i\" ..";				\
 	  mv "$(BUILD_DIR)/$$i" ..;					\

More information about the Kernel-svn-changes mailing list