debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge /dists/sid/linux-2.6. 

svn path=/dists/trunk/linux-2.6/; revision=6356
This commit is contained in:
Bastian Blank 2006-03-31 17:13:35 +00:00
parent b55427f44a
commit a27da8be62
17 changed files with 44 additions and 9981 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/arch/alpha/config vendored
View File

@ -1552,7 +1552,7 @@ CONFIG_CODA_FS=m
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

2
debian/arch/amd64/config vendored
View File

@ -1459,7 +1459,7 @@ CONFIG_CODA_FS=m
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

2
debian/arch/arm/config.s3c2410 vendored
View File

@ -1131,7 +1131,7 @@ CONFIG_PPP_MULTILINK=y
# 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

2
debian/arch/i386/config vendored
View File

@ -1709,7 +1709,7 @@ CONFIG_CODA_FS=m
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

2
debian/arch/ia64/config vendored
View File

@ -1228,7 +1228,7 @@ CONFIG_CODA_FS_OLD_API=y
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

1
debian/arch/ia64/defines vendored
View File

@ -8,7 +8,6 @@ kernel-arch: ia64
kernel-header-dirs: ia64
[image]
initramfs-generators: yaird
suggests: elilo, fdutils
[itanium]

13
debian/bin/check-patches.sh vendored Executable file
View File

@ -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

6
debian/changelog vendored
View File

@ -10,8 +10,12 @@ linux-2.6 (2.6.16-5) UNRELEASED; urgency=low
* 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@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@debian.org> Thu, 30 Mar 2006 15:45:35 -0700
linux-2.6 (2.6.16-4) unstable; urgency=medium

1
debian/lib/python/debian_linux/gencontrol.py vendored
View File

@ -37,6 +37,7 @@ class gencontrol(object):
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'],

1
debian/modules/gencontrol.py vendored
View File

@ -11,7 +11,6 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
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)

8
debian/modules/rules.include vendored
View File

@ -30,8 +30,8 @@ binary-arch:
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 @@ debian/control debian/rules.gen: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES)
$(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

16
debian/modules/rules.real.include vendored Normal file
View File

@ -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

115
debian/patches/TODO vendored
View File

@ -1,115 +0,0 @@
Disabled because not applying cleanly, need investigating :
drivers-scsi-megaraid_splitup.patch
FAILS: 1 hunk (drivers/scsi/megaraid/Kconfig.megaraid)
remove-references-to-removed-drivers.patch
FAILS 1 hunk (drivers/usb/misc/Makefile)
powerpc-g4-l2-flush-errata.patch
FAILS 1 hunk (arch/ppc/kernel/l2cr.S)
Complete list of Mark Hymers (not all of those where still in use).
Applied upstream
================
amd64-tlb-flush-sigsegv-fix.patch
Git commit: bc5e8fdfc622b03acf5ac974a1b8b26da6511c99
kernel-api-documentation-generation-fix.diff
Git commit: 9d01a82e46a8dd18233121a6bc140e5576649583
m68k-sonic.patch
Git commit: efcce839360fb3a7b6dedeacaec80f68b0f2d052
mempolicy-check-mode.patch
Git commit: ba17101b41977f124948e0a7797fdcbb59e19f3e
powerpc-pmac-sound-check.patch
Git commit: 4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678
powerpc-ppc64-biarch-override.patch
Git commit: 723e2b35e43dcbcfd737c40453caa7d198092d23
Not applied upstream
====================
amd64-int3-fix.patch
APPLIES Offset
drivers-scsi-megaraid_splitup.patch
FAILS: 1 hunk (drivers/scsi/megaraid/Kconfig.megaraid)
fbdev-radeon-noaccel.patch
APPLIES Offset
fs-asfs-2.patch
APPLIES Offset
ia64-irq-affinity-upfix.patch
APPLIES Offset
m68k-42_dma.patch
APPLIES Offset
modular-ide.patch
APPLIES Offset
modular-ide-pnp.patch
APPLIES Offset
powerpc-apus.patch
APPLIES Offset
powerpc-apus-todo.patch
FAILS 1 hunk (include/video/vga.h)
powerpc-calibrate-tau.patch
APPLIES Offset + fuzz
powerpc-fix-power3-ftbfs.patch
APPLIES
powerpc-g3-750cxe.patch
Claims to already be applied
Looks like patch is confused as a different but similar model was added
powerpc-g4-l2-flush-errata.patch
FAILS 1 hunk (arch/ppc/kernel/l2cr.S)
powerpc-mkvmlinuz-support.patch
APPLIES
powerpc-mv643xx-hotplug-support.patch
APPLIES
powerpc-pmac-cache-power34-fix.patch
APPLIES
powerpc-serial-of.patch
FAILS 1 hunk ignored (arch/ppc64/kernel/setup.c)
This hunk claims to already be applied
powerpc-serial.patch
APPLIES Offset
qla2xxx-removed.patch
APPLIES Offset
remove-references-to-removed-drivers.patch
FAILS 1 hunk (drivers/usb/misc/Makefile)
sparc64-hme-lockup.patch
APPLIES
tty-locking-fixes9.patch
APPLIES
version.patch
APPLIES OFFSET
==============

9775
debian/patches/hppa-incompatible.patch vendored
View File

File diff suppressed because it is too large Load Diff

66
debian/patches/powerpc-mv643xx-spinlock-fix-support.patch vendored
View File

@ -1,66 +0,0 @@
Date: Wed, 28 Dec 2005 15:40:01 -0700
To: netdev@vger.kernel.org
Subject: [PATCH 4/4] mv643xx: Don't call request_irq with a held lock
Message-ID: <20051228224001.GD5742@xyzzy.farnsworth.org>
References: <20051228223449.GA5742@xyzzy.farnsworth.org>
From: Dale Farnsworth <dale@farnsworth.org>
We can't call request_irq() while holding a spin lock.
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Index: linux-2.6-mv643xx_enet/drivers/net/mv643xx_eth.c
===================================================================
--- linux-2.6-mv643xx_enet.orig/drivers/net/mv643xx_eth.c
+++ linux-2.6-mv643xx_enet/drivers/net/mv643xx_eth.c
@@ -655,34 +655,24 @@ static int mv643xx_eth_open(struct net_d
unsigned int port_num = mp->port_num;
int err;
- spin_lock_irq(&mp->lock);
-
err = request_irq(dev->irq, mv643xx_eth_int_handler,
SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
-
if (err) {
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
port_num);
- err = -EAGAIN;
- goto out;
+ return -EAGAIN;
}
+ spin_lock_irq(&mp->lock);
+
if (mv643xx_eth_real_open(dev)) {
printk("%s: Error opening interface\n", dev->name);
+ free_irq(dev->irq, dev);
err = -EBUSY;
- goto out_free;
}
spin_unlock_irq(&mp->lock);
- return 0;
-
-out_free:
- free_irq(dev->irq, dev);
-
-out:
- spin_unlock_irq(&mp->lock);
-
return err;
}
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
---------------------------------------------------------------------------------------
Wanadoo vous informe que cet e-mail a ete controle par l'anti-virus mail.
Aucun virus connu a ce jour par nos services n'a ete detecte.

3
debian/patches/series/1 vendored
View File

@ -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

10
debian/patches/vserver-powerpc-fix01.patch vendored
View File

@ -1,10 +0,0 @@
--- a/arch/powerpc/kernel/asm-offsets.c 2006-02-21 03:41:53.000000000 -0500
+++ b/arch/powerpc/kernel/asm-offsets.c 2006-02-21 04:21:08.000000000 -0500
@@ -230,6 +230,7 @@ int main(void)
DEFINE(CLONE_VM, CLONE_VM);
DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
+ DEFINE(CLONE_KTHREAD, CLONE_KTHREAD);
#ifndef CONFIG_PPC64
DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));