[kernel] r6356 - in dists/trunk/linux-2.6: . debian debian/arch/alpha debian/arch/amd64 debian/arch/arm debian/arch/i386 debian/arch/ia64 debian/bin debian/lib/python/debian_linux debian/modules debian/patches debian/patches/series

Bastian Blank waldi at costa.debian.org
Fri Mar 31 17:13:38 UTC 2006 

Author: waldi
Date: Fri Mar 31 17:13:35 2006
New Revision: 6356

Added:
   dists/trunk/linux-2.6/debian/bin/check-patches.sh   (contents, props changed)
   dists/trunk/linux-2.6/debian/modules/rules.real.include
Removed:
   dists/trunk/linux-2.6/debian/patches/TODO
   dists/trunk/linux-2.6/debian/patches/hppa-incompatible.patch
   dists/trunk/linux-2.6/debian/patches/powerpc-mv643xx-spinlock-fix-support.patch
   dists/trunk/linux-2.6/debian/patches/vserver-powerpc-fix01.patch
Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/ia64/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   dists/trunk/linux-2.6/debian/modules/gencontrol.py
   dists/trunk/linux-2.6/debian/modules/rules.include
   dists/trunk/linux-2.6/debian/patches/series/1
Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	Fri Mar 31 17:13:35 2006
@@ -1552,7 +1552,7 @@
 CONFIG_AFS_FS=m
 CONFIG_RXRPC=m
 CONFIG_ACORN_PARTITION=y
-CONFIG_ACORN_PARTITION_CUMANA=y
+# CONFIG_ACORN_PARTITION_CUMANA is not set
 # CONFIG_ACORN_PARTITION_EESOX is not set
 CONFIG_ACORN_PARTITION_ICS=y
 # CONFIG_ACORN_PARTITION_ADFS is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Fri Mar 31 17:13:35 2006
@@ -1459,7 +1459,7 @@
 CONFIG_AFS_FS=m
 CONFIG_RXRPC=m
 CONFIG_ACORN_PARTITION=y
-CONFIG_ACORN_PARTITION_CUMANA=y
+# CONFIG_ACORN_PARTITION_CUMANA is not set
 # CONFIG_ACORN_PARTITION_EESOX is not set
 CONFIG_ACORN_PARTITION_ICS=y
 # CONFIG_ACORN_PARTITION_ADFS is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	Fri Mar 31 17:13:35 2006
@@ -1131,7 +1131,7 @@
 # CONFIG_USB_GADGET_NET2280 is not set
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_PARPORT_NOT_PC=y
-CONFIG_ACORN_PARTITION_CUMANA=y
+# CONFIG_ACORN_PARTITION_CUMANA is not set
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_AIPTEK=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Fri Mar 31 17:13:35 2006
@@ -1709,7 +1709,7 @@
 CONFIG_AFS_FS=m
 CONFIG_RXRPC=m
 CONFIG_ACORN_PARTITION=y
-CONFIG_ACORN_PARTITION_CUMANA=y
+# CONFIG_ACORN_PARTITION_CUMANA is not set
 # CONFIG_ACORN_PARTITION_EESOX is not set
 CONFIG_ACORN_PARTITION_ICS=y
 # CONFIG_ACORN_PARTITION_ADFS is not set

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Fri Mar 31 17:13:35 2006
@@ -1228,7 +1228,7 @@
 CONFIG_AFS_FS=m
 CONFIG_RXRPC=m
 CONFIG_ACORN_PARTITION=y
-CONFIG_ACORN_PARTITION_CUMANA=y
+# CONFIG_ACORN_PARTITION_CUMANA is not set
 CONFIG_ACORN_PARTITION_EESOX=y
 CONFIG_ACORN_PARTITION_ICS=y
 CONFIG_ACORN_PARTITION_ADFS=y

Modified: dists/trunk/linux-2.6/debian/arch/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/defines	Fri Mar 31 17:13:35 2006
@@ -8,7 +8,6 @@
 kernel-header-dirs: ia64
 
 [image]
-initramfs-generators: yaird
 suggests: elilo, fdutils
 
 [itanium]

Added: dists/trunk/linux-2.6/debian/bin/check-patches.sh
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/bin/check-patches.sh	Fri Mar 31 17:13:35 2006
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+TMPDIR=$(mktemp -d)
+trap "rm -rf $TMPDIR" EXIT
+awk '{if (NF >= 2) print $2}' debian/patches/series/* | sort -u > $TMPDIR/used
+find debian/patches -maxdepth 1 -type f -printf "%f\n" | sort > $TMPDIR/avail
+echo "Used patches"
+echo "=============="
+cat $TMPDIR/used
+echo
+echo "Unused patches"
+echo "=============="
+fgrep -v -f $TMPDIR/used $TMPDIR/avail

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Mar 31 17:13:35 2006
@@ -10,8 +10,12 @@
   * Provide real dependency packages for module building.
   * Fix module package output.
   * Include .kernelrelease in headers packages. (closes: #359813)
+  * Disable Cumana partition support completely. (closes: #359207)
 
- -- Bastian Blank <waldi at debian.org>  Thu, 30 Mar 2006 00:08:39 +0200
+  [ dann frazier ]
+  * [ia64] initramfs-tools works now, no longer restrict initramfs-generators
+
+ -- dann frazier <dannf at debian.org>  Thu, 30 Mar 2006 15:45:35 -0700
 
 linux-2.6 (2.6.16-4) unstable; urgency=medium
 

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Fri Mar 31 17:13:35 2006
@@ -37,6 +37,7 @@
 
     def do_main(self, packages, makefile):
         makeflags = {
+            'MAJOR': self.version['major'],
             'VERSION': self.version['version'],
             'SOURCE_UPSTREAM': self.version['source_upstream'],
             'SOURCEVERSION': self.version['source'],

Modified: dists/trunk/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/modules/gencontrol.py	Fri Mar 31 17:13:35 2006
@@ -11,7 +11,6 @@
         main = self.templates["control.main"]
         packages.extend(self.process_packages(main, vars))
 
-    def do_main_packages(self, packages):
         l = ['linux-headers-%s%s-all-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch) for arch in self.config['base',]['arches']]
         packages['source']['Build-Depends'].extend(l)
 

Modified: dists/trunk/linux-2.6/debian/modules/rules.include
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/rules.include	(original)
+++ dists/trunk/linux-2.6/debian/modules/rules.include	Fri Mar 31 17:13:35 2006
@@ -30,8 +30,8 @@
 binary:	binary-indep binary-arch
 
 CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*) 
-CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
-debian/control debian/rules.gen: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES)
+CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
+debian/control debian/rules.gen: $(CONTROL_FILES)
 	if [ -f debian/control.md5sum ]; then \
 		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
 			$(MAKE) -f debian/rules debian/control-real; \
@@ -40,8 +40,8 @@
 		$(MAKE) -f debian/rules debian/control-real; \
 	fi
 
-debian/control-real: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES)
-	$<
+debian/control-real: $(CONTROL_FILES)
+	$(__MODULES_DIR)gencontrol.py
 	md5sum $^ > debian/control.md5sum
 	@echo
 	@echo This target is made to fail intentionally, to make sure

Added: dists/trunk/linux-2.6/debian/modules/rules.real.include
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/modules/rules.real.include	Fri Mar 31 17:13:35 2006
@@ -0,0 +1,16 @@
+__MODULES_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+
+DEB_HOST_ARCH     := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH    := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
+
+export DH_OPTIONS
+
+HEADERS_DIR = /usr/src/linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
+
+include $(__MODULES_DIR)rules.defs
+
+ifdef DEBIAN_KERNEL_JOBS
+  JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
+endif
+

Modified: dists/trunk/linux-2.6/debian/patches/series/1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1	Fri Mar 31 17:13:35 2006
@@ -7,11 +7,8 @@
 + ia64-irq-affinity-upfix.patch
 + powerpc-mkvmlinuz-support.patch
 + powerpc-build-links.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
 + mips-makefile.patch

More information about the Kernel-svn-changes mailing list