[kernel] r6357 - in people/waldi/linux-2.6: . debian
debian/arch/alpha debian/arch/amd64 debian/arch/arm
debian/arch/armeb debian/arch/i386 debian/arch/ia64
debian/arch/s390 debian/bin debian/lib/python/debian_linux
debian/modules debian/patches debian/patches/series debian/templates
Bastian Blank
waldi at costa.debian.org
Fri Mar 31 17:14:50 UTC 2006
Author: waldi
Date: Fri Mar 31 17:14:41 2006
New Revision: 6357
Added:
people/waldi/linux-2.6/debian/bin/check-patches.sh (contents, props changed)
people/waldi/linux-2.6/debian/modules/rules.real.include
people/waldi/linux-2.6/debian/patches/2.6.16.1
people/waldi/linux-2.6/debian/patches/mips-sb1-duart-tts.patch
people/waldi/linux-2.6/debian/patches/series/4
people/waldi/linux-2.6/debian/templates/control.image.type-modulesextra.in
people/waldi/linux-2.6/debian/templates/control.image.type-modulesinline.in
people/waldi/linux-2.6/debian/templates/control.image.type-standalone.in
Removed:
people/waldi/linux-2.6/debian/patches/TODO
people/waldi/linux-2.6/debian/patches/hppa-incompatible.patch
people/waldi/linux-2.6/debian/patches/powerpc-mv643xx-spinlock-fix-support.patch
people/waldi/linux-2.6/debian/patches/vserver-powerpc-fix01.patch
people/waldi/linux-2.6/debian/templates/control.image.in
people/waldi/linux-2.6/debian/templates/control.modules.in
Modified:
people/waldi/linux-2.6/ (props changed)
people/waldi/linux-2.6/debian/arch/alpha/config
people/waldi/linux-2.6/debian/arch/amd64/config
people/waldi/linux-2.6/debian/arch/arm/config.footbridge
people/waldi/linux-2.6/debian/arch/arm/config.nslu2
people/waldi/linux-2.6/debian/arch/arm/config.s3c2410
people/waldi/linux-2.6/debian/arch/armeb/config.nslu2
people/waldi/linux-2.6/debian/arch/i386/config
people/waldi/linux-2.6/debian/arch/ia64/config
people/waldi/linux-2.6/debian/arch/ia64/defines
people/waldi/linux-2.6/debian/arch/s390/defines
people/waldi/linux-2.6/debian/bin/gencontrol.py
people/waldi/linux-2.6/debian/changelog
people/waldi/linux-2.6/debian/lib/python/debian_linux/debian.py
people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
people/waldi/linux-2.6/debian/modules/gencontrol.py
people/waldi/linux-2.6/debian/modules/rules.include
people/waldi/linux-2.6/debian/patches/series/1
people/waldi/linux-2.6/debian/patches/vserver-vs2.0.2-rc13.patch
people/waldi/linux-2.6/debian/rules.real
people/waldi/linux-2.6/debian/templates/control.headers.arch.in
people/waldi/linux-2.6/debian/templates/control.headers.in
Log:
Merge /dists/trunk/linux-2.6.
Modified: people/waldi/linux-2.6/debian/arch/alpha/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/config (original)
+++ people/waldi/linux-2.6/debian/arch/alpha/config Fri Mar 31 17:14:41 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: 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 Fri Mar 31 17:14:41 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: people/waldi/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.footbridge Fri Mar 31 17:14:41 2006
@@ -439,7 +439,7 @@
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=y
CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_BLK_DEV_IDECD is not set
+CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
# CONFIG_BLK_DEV_IDESCSI is not set
Modified: people/waldi/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.nslu2 (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.nslu2 Fri Mar 31 17:14:41 2006
@@ -1387,6 +1387,7 @@
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CIFS is not set
Modified: people/waldi/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.s3c2410 (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.s3c2410 Fri Mar 31 17:14:41 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: people/waldi/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- people/waldi/linux-2.6/debian/arch/armeb/config.nslu2 (original)
+++ people/waldi/linux-2.6/debian/arch/armeb/config.nslu2 Fri Mar 31 17:14:41 2006
@@ -1387,6 +1387,7 @@
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CIFS 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 Fri Mar 31 17:14:41 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: people/waldi/linux-2.6/debian/arch/ia64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/config (original)
+++ people/waldi/linux-2.6/debian/arch/ia64/config Fri Mar 31 17:14:41 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: people/waldi/linux-2.6/debian/arch/ia64/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/defines (original)
+++ people/waldi/linux-2.6/debian/arch/ia64/defines Fri Mar 31 17:14:41 2006
@@ -8,7 +8,6 @@
kernel-header-dirs: ia64
[image]
-initramfs-generators: yaird
suggests: elilo, fdutils
[itanium]
Modified: people/waldi/linux-2.6/debian/arch/s390/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/s390/defines (original)
+++ people/waldi/linux-2.6/debian/arch/s390/defines Fri Mar 31 17:14:41 2006
@@ -1,5 +1,8 @@
[base]
-flavours: s390 s390x
+flavours:
+ s390
+ s390-tape
+ s390x
kernel-arch: s390
kernel-header-dirs: s390
@@ -13,6 +16,14 @@
[s390]
class: IBM S/390
+[s390-tape]
+class: IBM S/390 tape
+
+[s390-tape_image]
+desc: This kernel has support to IPL (boot) from a tape.
+initramfs: false
+type: plain-s390-tape
+
[s390x]
class: IBM zSeries
Added: people/waldi/linux-2.6/debian/bin/check-patches.sh
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/bin/check-patches.sh Fri Mar 31 17:14:41 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: 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 Fri Mar 31 17:14:41 2006
@@ -22,32 +22,29 @@
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
headers_arch = self.templates["control.headers.arch"]
- package_headers_arch = self.process_package(headers_arch[0], vars)
- extra['headers_arch_depends'] = []
+ packages_headers_arch = self.process_packages(headers_arch, vars)
+ extra['headers_arch_depends'] = packages_headers_arch[2]['Depends']
- name = package_headers_arch['Package']
- if packages.has_key(name):
- package_headers_arch = packages.get(name)
- package_headers_arch['Architecture'].append(arch)
- else:
- package_headers_arch['Architecture'] = [arch]
- packages.append(package_headers_arch)
+ for package in packages_headers_arch:
+ name = package['Package']
+ if packages.has_key(name):
+ package = packages.get(name)
+ package['Architecture'].append(arch)
+ else:
+ package['Architecture'] = [arch]
+ packages.append(package)
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+ cmds_binary_arch = []
+ cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags_string))
cmds_source = []
cmds_source.append(("$(MAKE) -f debian/rules.real source-arch %s" % makeflags_string,))
+ makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
makefile.append(("build-%s-real:" % arch))
makefile.append(("setup-%s-real:" % arch))
makefile.append(("source-%s-real:" % arch, cmds_source))
- def do_arch_packages_post(self, packages, makefile, arch, vars, makeflags, extra):
- makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
-
- cmds_binary_arch = []
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(["%s (= %s)" % (i, self.version['source']) for i in extra['headers_arch_depends']]), makeflags_string),))
- makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
-
def do_subarch_setup(self, vars, makeflags, arch, subarch):
vars.update(self.config.get(('image', arch, subarch), {}))
vars['localversion_headers'] = vars['localversion']
@@ -98,9 +95,10 @@
makeflags[i[1]] = vars[i[0]]
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
- image = self.templates["control.image"]
+ image_type_modulesextra = self.templates["control.image.type-modulesextra"]
+ image_type_modulesinline = self.templates["control.image.type-modulesinline"]
+ image_type_standalone = self.templates["control.image.type-standalone"]
headers = self.templates["control.headers"]
- modules = self.templates["control.modules"]
image_latest = self.templates["control.image.latest"]
headers_latest = self.templates["control.headers.latest"]
@@ -119,16 +117,22 @@
packages_own = []
packages_dummy = []
- if vars['type'] == 'plain-xen':
- p = self.process_package(modules[0], vars)
- image_depends.extend(p['Reverse-Depends'])
- del p['Reverse-Depends']
- packages_own.append(p)
+ if vars['type'] == 'plain-s390-tape':
+ image = image_type_standalone
+ elif vars['type'] == 'plain-xen':
+ image = image_type_modulesextra
+ else:
+ image = image_type_modulesinline
packages_own.append(self.process_real_image(image[0], image_depends, vars))
- packages_own.append(self.process_package(headers[0], vars))
+ packages_own.extend(self.process_packages(image[1:], vars))
packages_dummy.extend(self.process_packages(image_latest, vars))
- packages_dummy.append(self.process_package(headers_latest[0], vars))
+
+ if image in (image_type_modulesextra, image_type_modulesinline):
+ makeflags['MODULES'] = True
+ packages_own.append(self.process_package(headers[0], vars))
+ packages_dummy.append(self.process_package(headers_latest[0], vars))
+ extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[-1]['Package'])
for package in packages_own + packages_dummy:
name = package['Package']
@@ -139,13 +143,11 @@
package['Architecture'] = [arch]
packages.append(package)
- extra['headers_arch_depends'].append(packages_own[1]['Package'])
-
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
cmds_binary_arch = []
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in packages_dummy]),))
+ cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags_string),))
cmds_build = []
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
cmds_setup = []
Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog (original)
+++ people/waldi/linux-2.6/debian/changelog Fri Mar 31 17:14:41 2006
@@ -4,7 +4,49 @@
-- Bastian Blank <waldi at debian.org> Thu, 23 Mar 2006 21:40:17 +0100
-linux-2.6 (2.6.16-3) UNRELEASED; urgency=low
+linux-2.6 (2.6.16-5) UNRELEASED; urgency=low
+
+ [ Bastian Blank ]
+ * 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)
+
+ [ 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
+
+ [ Martin Michlmayr ]
+ * [arm/armeb] Update nslu2 config.
+ * Add stable release 2.6.16.1:
+ - Fix speedstep-smi assembly bug in speedstep_smi_ownership
+ - DMI: fix DMI onboard device discovery
+ - cciss: fix use-after-free in cciss_init_one
+ - DM: Fix bug: BIO_RW_BARRIER requests to md/raid1 hang.
+ - fix scheduler deadlock
+ - proc: fix duplicate line in /proc/devices
+ - rtc.h broke strace(1) builds
+ - dm: bio split bvec fix
+ - v9fs: assign dentry ops to negative dentries
+ - i810fb_cursor(): use GFP_ATOMIC
+ - NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated.
+ - XFS writeout fix
+ - sysfs: fix a kobject leak in sysfs_add_link on the error path
+ - get_cpu_sysdev() signedness fix
+ - firmware: fix BUG: in fw_realloc_buffer
+ - sysfs: sysfs_remove_dir() needs to invalidate the dentry
+ - TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242)
+ - 2.6.xx: sata_mv: another critical fix
+ - Kconfig: VIDEO_DECODER must select FW_LOADER
+ - V4L/DVB (3324): Fix Samsung tuner frequency ranges
+ - sata_mv: fix irq port status usage
+
+ -- Bastian Blank <waldi at debian.org> Tue, 28 Mar 2006 17:19:10 +0200
+
+linux-2.6 (2.6.16-3) unstable; urgency=low
[ Frederik Schüler ]
* [amd64] Add asm-i386 to the linux-headers packages.
@@ -17,12 +59,16 @@
[ Martin Michlmayr ]
* [arm/armeb] Enable CONFIG_NFSD on NSLU2 again. Closes: #358709.
* [arm/footbridge] CONFIG_NE2K_PCI should be a module, not built-in.
+ * [arm/footbridge] Enable CONFIG_BLK_DEV_IDECD=m since the CATS can
+ have a CD-ROM drive.
+ * [mips/sb1*] Use ttyS rather than duart as the name for the serial
+ console since the latter causes problems with debian-installer.
[ Bastian Blank ]
* Update vserver patch to 2.0.2-rc14.
- Fix sendfile. (closes: #358391, #358752)
- -- Bastian Blank <waldi at debian.org> Fri, 24 Mar 2006 12:49:46 +0100
+ -- Bastian Blank <waldi at debian.org> Mon, 27 Mar 2006 16:08:20 +0200
linux-2.6 (2.6.16-2) unstable; urgency=low
Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/debian.py (original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/debian.py Fri Mar 31 17:14:41 2006
@@ -202,7 +202,6 @@
('Suggests', package_relation_list),
('Replaces', package_relation_list),
('Conflicts', package_relation_list),
- ('Reverse-Depends', package_relation_list), # Some sort of hack
('Description', package_description),
))
Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Fri Mar 31 17:14:41 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'],
@@ -96,6 +97,7 @@
def do_arch(self, packages, makefile, arch, vars, makeflags):
config_entry = self.config['base', arch]
vars.update(config_entry)
+ vars['arch'] = arch
if not config_entry.get('available', True):
for i in self.makefile_targets:
Modified: people/waldi/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/modules/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/modules/gencontrol.py Fri Mar 31 17:14:41 2006
@@ -11,10 +11,8 @@
main = self.templates["control.main"]
packages.extend(self.process_packages(main, vars))
- def do_main_packages(self, packages):
- l = package_relation_group()
- l.extend([package_relation('linux-headers-%s%s-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch)) for arch in self.config['base',]['arches']])
- packages['source']['Build-Depends'].append(l)
+ 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)
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
modules = self.templates["control.modules"]
Modified: people/waldi/linux-2.6/debian/modules/rules.include
==============================================================================
--- people/waldi/linux-2.6/debian/modules/rules.include (original)
+++ people/waldi/linux-2.6/debian/modules/rules.include Fri Mar 31 17:14:41 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: people/waldi/linux-2.6/debian/modules/rules.real.include
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/modules/rules.real.include Fri Mar 31 17:14:41 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
+
Added: people/waldi/linux-2.6/debian/patches/2.6.16.1
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/2.6.16.1 Fri Mar 31 17:14:41 2006
@@ -0,0 +1,449 @@
+diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+index 28cc5d5..cfc4276 100644
+--- a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
++++ b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+@@ -75,7 +75,9 @@ static int speedstep_smi_ownership (void
+ __asm__ __volatile__(
+ "out %%al, (%%dx)\n"
+ : "=D" (result)
+- : "a" (command), "b" (function), "c" (0), "d" (smi_port), "D" (0), "S" (magic)
++ : "a" (command), "b" (function), "c" (0), "d" (smi_port),
++ "D" (0), "S" (magic)
++ : "memory"
+ );
+
+ dprintk("result is %x\n", result);
+diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
+index 6a93d75..ca2a0cb 100644
+--- a/arch/i386/kernel/dmi_scan.c
++++ b/arch/i386/kernel/dmi_scan.c
+@@ -106,7 +106,7 @@ static void __init dmi_save_devices(stru
+ struct dmi_device *dev;
+
+ for (i = 0; i < count; i++) {
+- char *d = ((char *) dm) + (i * 2);
++ char *d = (char *)(dm + 1) + (i * 2);
+
+ /* Skip disabled device */
+ if ((*d & 0x80) == 0)
+diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
+index 07a7f97..29f3d75 100644
+--- a/drivers/base/cpu.c
++++ b/drivers/base/cpu.c
+@@ -141,7 +141,7 @@ int __devinit register_cpu(struct cpu *c
+ return error;
+ }
+
+-struct sys_device *get_cpu_sysdev(int cpu)
++struct sys_device *get_cpu_sysdev(unsigned cpu)
+ {
+ if (cpu < NR_CPUS)
+ return cpu_sys_devices[cpu];
+diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
+index e97e911..4723182 100644
+--- a/drivers/base/firmware_class.c
++++ b/drivers/base/firmware_class.c
+@@ -211,18 +211,20 @@ static int
+ fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
+ {
+ u8 *new_data;
++ int new_size = fw_priv->alloc_size;
+
+ if (min_size <= fw_priv->alloc_size)
+ return 0;
+
+- new_data = vmalloc(fw_priv->alloc_size + PAGE_SIZE);
++ new_size = ALIGN(min_size, PAGE_SIZE);
++ new_data = vmalloc(new_size);
+ if (!new_data) {
+ printk(KERN_ERR "%s: unable to alloc buffer\n", __FUNCTION__);
+ /* Make sure that we don't keep incomplete data */
+ fw_load_abort(fw_priv);
+ return -ENOMEM;
+ }
+- fw_priv->alloc_size += PAGE_SIZE;
++ fw_priv->alloc_size = new_size;
+ if (fw_priv->fw->data) {
+ memcpy(new_data, fw_priv->fw->data, fw_priv->fw->size);
+ vfree(fw_priv->fw->data);
+diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
+index 0d65394..c149d57 100644
+--- a/drivers/block/cciss.c
++++ b/drivers/block/cciss.c
+@@ -3269,8 +3269,8 @@ clean2:
+ unregister_blkdev(hba[i]->major, hba[i]->devname);
+ clean1:
+ release_io_mem(hba[i]);
+- free_hba(i);
+ hba[i]->busy_initializing = 0;
++ free_hba(i);
+ return(-1);
+ }
+
+diff --git a/drivers/md/dm.c b/drivers/md/dm.c
+index 745ca1f..d559569 100644
+--- a/drivers/md/dm.c
++++ b/drivers/md/dm.c
+@@ -533,30 +533,35 @@ static void __clone_and_map(struct clone
+
+ } else {
+ /*
+- * Create two copy bios to deal with io that has
+- * been split across a target.
++ * Handle a bvec that must be split between two or more targets.
+ */
+ struct bio_vec *bv = bio->bi_io_vec + ci->idx;
++ sector_t remaining = to_sector(bv->bv_len);
++ unsigned int offset = 0;
+
+- clone = split_bvec(bio, ci->sector, ci->idx,
+- bv->bv_offset, max);
+- __map_bio(ti, clone, tio);
+-
+- ci->sector += max;
+- ci->sector_count -= max;
+- ti = dm_table_find_target(ci->map, ci->sector);
+-
+- len = to_sector(bv->bv_len) - max;
+- clone = split_bvec(bio, ci->sector, ci->idx,
+- bv->bv_offset + to_bytes(max), len);
+- tio = alloc_tio(ci->md);
+- tio->io = ci->io;
+- tio->ti = ti;
+- memset(&tio->info, 0, sizeof(tio->info));
+- __map_bio(ti, clone, tio);
++ do {
++ if (offset) {
++ ti = dm_table_find_target(ci->map, ci->sector);
++ max = max_io_len(ci->md, ci->sector, ti);
++
++ tio = alloc_tio(ci->md);
++ tio->io = ci->io;
++ tio->ti = ti;
++ memset(&tio->info, 0, sizeof(tio->info));
++ }
++
++ len = min(remaining, max);
++
++ clone = split_bvec(bio, ci->sector, ci->idx,
++ bv->bv_offset + offset, len);
++
++ __map_bio(ti, clone, tio);
++
++ ci->sector += len;
++ ci->sector_count -= len;
++ offset += to_bytes(len);
++ } while (remaining -= len);
+
+- ci->sector += len;
+- ci->sector_count -= len;
+ ci->idx++;
+ }
+ }
+diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
+index d82c8a3..ef42a26 100644
+--- a/drivers/media/video/Kconfig
++++ b/drivers/media/video/Kconfig
+@@ -349,6 +349,7 @@ config VIDEO_AUDIO_DECODER
+ config VIDEO_DECODER
+ tristate "Add support for additional video chipsets"
+ depends on VIDEO_DEV && I2C && EXPERIMENTAL
++ select FW_LOADER
+ ---help---
+ Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
+ video decoders.
+diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
+index 6fe7817..5f3d46d 100644
+--- a/drivers/media/video/tuner-types.c
++++ b/drivers/media/video/tuner-types.c
+@@ -1087,8 +1087,8 @@ static struct tuner_params tuner_tnf_533
+ /* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */
+
+ static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = {
+- { 16 * 175.75 /*MHz*/, 0x01, },
+- { 16 * 410.25 /*MHz*/, 0x02, },
++ { 16 * 130.00 /*MHz*/, 0x01, },
++ { 16 * 364.50 /*MHz*/, 0x02, },
+ { 16 * 999.99 , 0x08, },
+ };
+
+diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
+index 2770005..b00af08 100644
+--- a/drivers/scsi/sata_mv.c
++++ b/drivers/scsi/sata_mv.c
+@@ -1102,6 +1102,7 @@ static u8 mv_get_crpb_status(struct ata_
+ void __iomem *port_mmio = mv_ap_base(ap);
+ struct mv_port_priv *pp = ap->private_data;
+ u32 out_ptr;
++ u8 ata_status;
+
+ out_ptr = readl(port_mmio + EDMA_RSP_Q_OUT_PTR_OFS);
+
+@@ -1109,6 +1110,8 @@ static u8 mv_get_crpb_status(struct ata_
+ assert(((out_ptr >> EDMA_RSP_Q_PTR_SHIFT) & MV_MAX_Q_DEPTH_MASK) ==
+ pp->rsp_consumer);
+
++ ata_status = pp->crpb[pp->rsp_consumer].flags >> CRPB_FLAG_STATUS_SHIFT;
++
+ /* increment our consumer index... */
+ pp->rsp_consumer = mv_inc_q_index(&pp->rsp_consumer);
+
+@@ -1123,7 +1126,7 @@ static u8 mv_get_crpb_status(struct ata_
+ writelfl(out_ptr, port_mmio + EDMA_RSP_Q_OUT_PTR_OFS);
+
+ /* Return ATA status register for completed CRPB */
+- return (pp->crpb[pp->rsp_consumer].flags >> CRPB_FLAG_STATUS_SHIFT);
++ return ata_status;
+ }
+
+ /**
+@@ -1192,7 +1195,6 @@ static void mv_host_intr(struct ata_host
+ u32 hc_irq_cause;
+ int shift, port, port0, hard_port, handled;
+ unsigned int err_mask;
+- u8 ata_status = 0;
+
+ if (hc == 0) {
+ port0 = 0;
+@@ -1210,6 +1212,7 @@ static void mv_host_intr(struct ata_host
+ hc,relevant,hc_irq_cause);
+
+ for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) {
++ u8 ata_status = 0;
+ ap = host_set->ports[port];
+ hard_port = port & MV_PORT_MASK; /* range 0-3 */
+ handled = 0; /* ensure ata_status is set if handled++ */
+diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
+index d8467c0..788297e 100644
+--- a/drivers/video/i810/i810_main.c
++++ b/drivers/video/i810/i810_main.c
+@@ -1508,7 +1508,7 @@ static int i810fb_cursor(struct fb_info
+ int size = ((cursor->image.width + 7) >> 3) *
+ cursor->image.height;
+ int i;
+- u8 *data = kmalloc(64 * 8, GFP_KERNEL);
++ u8 *data = kmalloc(64 * 8, GFP_ATOMIC);
+
+ if (data == NULL)
+ return -ENOMEM;
+diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
+index 3ad8455..651a9e1 100644
+--- a/fs/9p/vfs_inode.c
++++ b/fs/9p/vfs_inode.c
+@@ -614,6 +614,7 @@ static struct dentry *v9fs_vfs_lookup(st
+
+ sb = dir->i_sb;
+ v9ses = v9fs_inode2v9ses(dir);
++ dentry->d_op = &v9fs_dentry_operations;
+ dirfid = v9fs_fid_lookup(dentry->d_parent);
+
+ if (!dirfid) {
+@@ -681,8 +682,6 @@ static struct dentry *v9fs_vfs_lookup(st
+ goto FreeFcall;
+
+ fid->qid = fcall->params.rstat.stat.qid;
+-
+- dentry->d_op = &v9fs_dentry_operations;
+ v9fs_stat2inode(&fcall->params.rstat.stat, inode, inode->i_sb);
+
+ d_add(dentry, inode);
+diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
+index 1d24fea..826c131 100644
+--- a/fs/proc/proc_misc.c
++++ b/fs/proc/proc_misc.c
+@@ -312,7 +312,7 @@ static void *devinfo_next(struct seq_fil
+ case BLK_HDR:
+ info->state = BLK_LIST;
+ (*pos)++;
+- break;
++ /*fallthrough*/
+ case BLK_LIST:
+ if (get_blkdev_info(info->blkdev,&idummy,&ndummy)) {
+ /*
+diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
+index 49bd219..cfd290d 100644
+--- a/fs/sysfs/dir.c
++++ b/fs/sysfs/dir.c
+@@ -302,6 +302,7 @@ void sysfs_remove_dir(struct kobject * k
+ * Drop reference from dget() on entrance.
+ */
+ dput(dentry);
++ kobj->dentry = NULL;
+ }
+
+ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)
+diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
+index 689f7bc..6beee6f 100644
+--- a/fs/sysfs/inode.c
++++ b/fs/sysfs/inode.c
+@@ -227,12 +227,16 @@ void sysfs_drop_dentry(struct sysfs_dire
+ void sysfs_hash_and_remove(struct dentry * dir, const char * name)
+ {
+ struct sysfs_dirent * sd;
+- struct sysfs_dirent * parent_sd = dir->d_fsdata;
++ struct sysfs_dirent * parent_sd;
++
++ if (!dir)
++ return;
+
+ if (dir->d_inode == NULL)
+ /* no inode means this hasn't been made visible yet */
+ return;
+
++ parent_sd = dir->d_fsdata;
+ mutex_lock(&dir->d_inode->i_mutex);
+ list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
+ if (!sd->s_element)
+diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
+index e38d633..e5ce6e7 100644
+--- a/fs/sysfs/symlink.c
++++ b/fs/sysfs/symlink.c
+@@ -66,6 +66,7 @@ static int sysfs_add_link(struct dentry
+ if (!error)
+ return 0;
+
++ kobject_put(target);
+ kfree(sl->link_name);
+ exit2:
+ kfree(sl);
+diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
+index 74d8be8..a980736 100644
+--- a/fs/xfs/linux-2.6/xfs_aops.c
++++ b/fs/xfs/linux-2.6/xfs_aops.c
+@@ -616,7 +616,7 @@ xfs_is_delayed_page(
+ acceptable = (type == IOMAP_UNWRITTEN);
+ else if (buffer_delay(bh))
+ acceptable = (type == IOMAP_DELAY);
+- else if (buffer_mapped(bh))
++ else if (buffer_dirty(bh) && buffer_mapped(bh))
+ acceptable = (type == 0);
+ else
+ break;
+diff --git a/include/linux/cpu.h b/include/linux/cpu.h
+index 0ed1d48..d612b89 100644
+--- a/include/linux/cpu.h
++++ b/include/linux/cpu.h
+@@ -32,7 +32,7 @@ struct cpu {
+ };
+
+ extern int register_cpu(struct cpu *, int, struct node *);
+-extern struct sys_device *get_cpu_sysdev(int cpu);
++extern struct sys_device *get_cpu_sysdev(unsigned cpu);
+ #ifdef CONFIG_HOTPLUG_CPU
+ extern void unregister_cpu(struct cpu *, struct node *);
+ #endif
+diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
+index 9d5494a..3009c81 100644
+--- a/include/linux/raid/raid1.h
++++ b/include/linux/raid/raid1.h
+@@ -130,6 +130,6 @@ struct r1bio_s {
+ * with failure when last write completes (and all failed).
+ * Record that bi_end_io was called with this flag...
+ */
+-#define R1BIO_Returned 4
++#define R1BIO_Returned 6
+
+ #endif
+diff --git a/include/linux/rtc.h b/include/linux/rtc.h
+index 0b2ba67..b739ac1 100644
+--- a/include/linux/rtc.h
++++ b/include/linux/rtc.h
+@@ -11,8 +11,6 @@
+ #ifndef _LINUX_RTC_H_
+ #define _LINUX_RTC_H_
+
+-#include <linux/interrupt.h>
+-
+ /*
+ * The struct used to pass data via the following ioctl. Similar to the
+ * struct tm in <time.h>, but it needs to be here so that the kernel
+@@ -95,6 +93,8 @@ struct rtc_pll_info {
+
+ #ifdef __KERNEL__
+
++#include <linux/interrupt.h>
++
+ typedef struct rtc_task {
+ void (*func)(void *private_data);
+ void *private_data;
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 4d46e90..4e7efac 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -237,6 +237,7 @@ struct runqueue {
+
+ task_t *migration_thread;
+ struct list_head migration_queue;
++ int cpu;
+ #endif
+
+ #ifdef CONFIG_SCHEDSTATS
+@@ -1660,6 +1661,9 @@ unsigned long nr_iowait(void)
+ /*
+ * double_rq_lock - safely lock two runqueues
+ *
++ * We must take them in cpu order to match code in
++ * dependent_sleeper and wake_dependent_sleeper.
++ *
+ * Note this does not disable interrupts like task_rq_lock,
+ * you need to do so manually before calling.
+ */
+@@ -1671,7 +1675,7 @@ static void double_rq_lock(runqueue_t *r
+ spin_lock(&rq1->lock);
+ __acquire(rq2->lock); /* Fake it out ;) */
+ } else {
+- if (rq1 < rq2) {
++ if (rq1->cpu < rq2->cpu) {
+ spin_lock(&rq1->lock);
+ spin_lock(&rq2->lock);
+ } else {
+@@ -1707,7 +1711,7 @@ static void double_lock_balance(runqueue
+ __acquires(this_rq->lock)
+ {
+ if (unlikely(!spin_trylock(&busiest->lock))) {
+- if (busiest < this_rq) {
++ if (busiest->cpu < this_rq->cpu) {
+ spin_unlock(&this_rq->lock);
+ spin_lock(&busiest->lock);
+ spin_lock(&this_rq->lock);
+@@ -6035,6 +6039,7 @@ void __init sched_init(void)
+ rq->push_cpu = 0;
+ rq->migration_thread = NULL;
+ INIT_LIST_HEAD(&rq->migration_queue);
++ rq->cpu = i;
+ #endif
+ atomic_set(&rq->nr_iowait, 0);
+
+diff --git a/net/core/sock.c b/net/core/sock.c
+index 6e00811..5621198 100644
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -404,8 +404,9 @@ set_rcvbuf:
+ if (!valbool) {
+ sk->sk_bound_dev_if = 0;
+ } else {
+- if (optlen > IFNAMSIZ)
+- optlen = IFNAMSIZ;
++ if (optlen > IFNAMSIZ - 1)
++ optlen = IFNAMSIZ - 1;
++ memset(devname, 0, sizeof(devname));
+ if (copy_from_user(devname, optval, optlen)) {
+ ret = -EFAULT;
+ break;
+diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
+index 8ee4d01..f75ff1d 100644
+--- a/net/ipv4/ip_output.c
++++ b/net/ipv4/ip_output.c
+@@ -1249,11 +1249,7 @@ int ip_push_pending_frames(struct sock *
+ iph->tos = inet->tos;
+ iph->tot_len = htons(skb->len);
+ iph->frag_off = df;
+- if (!df) {
+- __ip_select_ident(iph, &rt->u.dst, 0);
+- } else {
+- iph->id = htons(inet->id++);
+- }
++ ip_select_ident(iph, &rt->u.dst, sk);
+ iph->ttl = ttl;
+ iph->protocol = sk->sk_protocol;
+ iph->saddr = rt->rt_src;
Added: people/waldi/linux-2.6/debian/patches/mips-sb1-duart-tts.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/mips-sb1-duart-tts.patch Fri Mar 31 17:14:41 2006
@@ -0,0 +1,20 @@
+Patch: change the name of the sb1250 DUART from duart to ttyS
+Needed for debian-installer
+Status: the sb1250_duart.c driver needs a completely re-write...
+
+diff --git a/drivers/char/sb1250_duart.c b/drivers/char/sb1250_duart.c
+index 7819acc..57a227c 100644
+--- a/drivers/char/sb1250_duart.c
++++ b/drivers/char/sb1250_duart.c
+@@ -762,8 +762,8 @@ static int __init sb1250_duart_init(void
+ return -ENOMEM;
+
+ sb1250_duart_driver->owner = THIS_MODULE;
+- sb1250_duart_driver->name = "duart";
+- sb1250_duart_driver->devfs_name = "duart/";
++ sb1250_duart_driver->name = "ttyS";
++ sb1250_duart_driver->devfs_name = "tts/";
+ sb1250_duart_driver->major = TTY_MAJOR;
+ sb1250_duart_driver->minor_start = SB1250_DUART_MINOR_BASE;
+ sb1250_duart_driver->type = TTY_DRIVER_TYPE_SERIAL;
+
Modified: people/waldi/linux-2.6/debian/patches/series/1
==============================================================================
--- people/waldi/linux-2.6/debian/patches/series/1 (original)
+++ people/waldi/linux-2.6/debian/patches/series/1 Fri Mar 31 17:14:41 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
Added: people/waldi/linux-2.6/debian/patches/series/4
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/series/4 Fri Mar 31 17:14:41 2006
@@ -0,0 +1,2 @@
++ 2.6.16.1
++ mips-sb1-duart-tts.patch
Modified: people/waldi/linux-2.6/debian/patches/vserver-vs2.0.2-rc13.patch
==============================================================================
--- people/waldi/linux-2.6/debian/patches/vserver-vs2.0.2-rc13.patch (original)
+++ people/waldi/linux-2.6/debian/patches/vserver-vs2.0.2-rc13.patch Fri Mar 31 17:14:41 2006
@@ -13019,9 +13019,9 @@
/*
* Convert user-nice values [ -20 ... 0 ... 19 ]
-@@ -238,6 +241,10 @@ struct runqueue {
- task_t *migration_thread;
+@@ -238,6 +241,10 @@
struct list_head migration_queue;
+ int cpu;
#endif
+#ifdef CONFIG_VSERVER_HARDCPU
+ struct list_head hold_queue;
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 Fri Mar 31 17:14:41 2006
@@ -65,8 +65,12 @@
#
# Targets
#
+binary-arch-arch: install-headers-all install-headers-$(ARCH)
binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
-binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
+ifeq ($(MODULES),True)
+ binary-arch-flavour: install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+endif
binary-indep: install-doc install-patch install-source install-tree
@@ -126,6 +130,7 @@
$(patch_cmd) -a $(ARCH) -s $(SUBARCH)
touch '$@'
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): CONFIG=$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR)
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
@@ -133,14 +138,22 @@
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
- cp '$<' '$(DIR)/.config'
+ cp '$(CONFIG)' '$(DIR)/.config'
cd '$(DIR)'; $(setup_env) $(kpkg_image) configure
touch '$@'
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
+ rm -rf '$(DIR)'
+ cp -al '$(SOURCE_DIR)' '$(DIR)'
+ cp '$(CONFIG)' '$(DIR)/.config'
+ echo '$(ABINAME)$(subst -tape,,$(LOCALVERSION))' > '$(DIR)/localversion'
+ cd '$(DIR)'; $(setup_env) make prepare ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
+ touch '$@'
+
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
- cp '$<' '$(DIR)/.config'
+ cp '$(CONFIG)' '$(DIR)/.config'
echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
cd '$(DIR)'; $(setup_env) make prepare ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
touch '$@'
@@ -152,6 +165,10 @@
cd '$(DIR)'; $(setup_env) $(setup_env_kpkg_jobs) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
touch '$@'
+$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
+ cd '$(DIR)'; $(setup_env) make ARCH=$(KERNEL_ARCH) $(JOBS_ARG) image
+ touch '$@'
+
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
cd '$(DIR)'; $(setup_env) make ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
touch '$@'
@@ -193,6 +210,13 @@
dh_clean -d -k
$(MAKE) -f debian/rules.real install-base
+install-headers-$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)
+install-headers-$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p))
+install-headers-$(ARCH):
+ dh_testdir
+ dh_testroot
+ $(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
+
install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
install-header-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
@@ -225,6 +249,7 @@
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -238,9 +263,7 @@
mkdir -p "${DIR}/arch/${KERNEL_ARCH}/kernel"
mkdir -p "${DIR}/include"
- cp -a ${SOURCE_DIR}/{.config,Module.symvers} "${DIR}"
- # TODO
- echo $(ABINAME)$(LOCALVERSION) > "${DIR}/localversion"
+ cp -a ${SOURCE_DIR}/{.config,.kernelrelease,Module.symvers} "${DIR}"
cd ${SOURCE_DIR}; \
find . -mindepth 1 -maxdepth 1 \
@@ -288,15 +311,9 @@
mkdir -p "${PACKAGE_DIR}/lib/modules/${REAL_VERSION}"
ln -s "/usr/src/${PACKAGE_NAME}" "${PACKAGE_DIR}/lib/modules/${REAL_VERSION}/build"
-
- # Populate the scripts directory. The strategy here is to specify what
- # *not* to copy, to make things a little bit more robust. We first create
- # a file with exclude patterns, then copy everything minus excluded files.
- #
- cd $(SOURCE_DIR); \
- tar $(foreach t, *.c *.cc *.h *.l *.o *.y *.cmd *.glade *.gperf *POTFILES.in .gitignore *lxdialog* *package* *_shipped, --exclude=$(t)) -chf - scripts | \
- (cd "${DIR}"; umask 000; tar -xvsf -)
-
+
+ ln -s "../${PACKAGE_NAME_KBUILD}/scripts" "${DIR}"
+
$(MAKE) -f debian/rules.real install-base
install-headers-all: PACKAGE_NAME = linux-headers-$(VERSION)
@@ -305,16 +322,17 @@
dh_testdir
dh_testroot
chmod a+x debian/modules/gencontrol.py
- dh_install $(DH_OPTIONS) debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
- dh_python $(DH_OPTIONS) -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
- $(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -Vkernel:Provides=linux-headers-$(UPSTREAMVERSION)$(ABINAME)-$(ARCH)'
+ dh_install debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
+ dh_python -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
+ $(MAKE) -f debian/rules.real install-base
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
ifdef IMAGE_POSTPROC
# Install the postproc script into the hook directory
install -d '$(DIR)/debian/image.d'
@@ -327,10 +345,19 @@
mv "$(BUILD_DIR)/$$i" ..; \
done
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
+ dh_testdir
+ dh_testroot
+ dh_clean -d -k
+ dh_installdirs 'boot'
+ cp '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
+ $(MAKE) -f debian/rules.real install-base
+
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION)
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_DIR = $(CURDIR)/debian/$(MODULES_PACKAGE_NAME)
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: DH_OPTIONS = -p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
dh_testdir
dh_testroot
dh_clean -d -k
Modified: people/waldi/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.arch.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.arch.in Fri Mar 31 17:14:41 2006
@@ -1,9 +1,29 @@
Package: linux-headers- at version@
Section: devel
Priority: optional
-Provides: linux-headers- at upstreamversion@@abiname at -all, linux-headers- at major@-all, ${kernel:Provides}
-Depends: ${kernel:Depends}
+Depends: python2.4-minimal
Description: All header files for Linux kernel @version@
This package depends against all architecture-specific kernel header files
for Linux kernel version @upstreamversion@, generally used for building out-of-tree
kernel modules.
+
+Package: linux-headers- at upstreamversion@@abiname at -all
+Section: devel
+Priority: optional
+Provides: linux-headers- at major@-all, linux-headers- at version@-all
+Depends: linux-headers- at upstreamversion@@abiname at -all-${kernel:Arch} (= ${Source-Version})
+Description: All header files for Linux kernel @version@
+ This package depends against all architecture-specific kernel header files
+ for Linux kernel version @upstreamversion@, generally used for building out-of-tree
+ kernel modules.
+
+Package: linux-headers- at upstreamversion@@abiname at -all-@arch@
+Section: devel
+Priority: optional
+Provides: linux-headers- at major@-all- at arch@, linux-headers- at version@-all- at arch@
+Depends: linux-headers- at version@ (= ${Source-Version})
+Description: All header files for Linux kernel @version@
+ This package depends against all architecture-specific kernel header files
+ for Linux kernel version @upstreamversion@, generally used for building out-of-tree
+ kernel modules.
+
Modified: people/waldi/linux-2.6/debian/templates/control.headers.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.in Fri Mar 31 17:14:41 2006
@@ -1,7 +1,7 @@
Package: linux-headers- at upstreamversion@@abiname@@localversion@
Section: devel
Priority: optional
-Depends: linux-headers- at upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version})
+Depends: linux-headers- at upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version}), linux-kbuild- at version@
Provides: linux-headers, linux-headers- at major@
Description: Header files for Linux kernel @upstreamversion@ on @class@ machines
This package provides the architecture-specific kernel header files
Added: people/waldi/linux-2.6/debian/templates/control.image.type-modulesextra.in
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/templates/control.image.type-modulesextra.in Fri Mar 31 17:14:41 2006
@@ -0,0 +1,20 @@
+Package: linux-image- at upstreamversion@@abiname@@localversion@
+Section: base
+Priority: optional
+Provides: linux-image, linux-image- at major@
+Depends: linux-modules- at upstreamversion@@abiname@@localversion@ (= ${Source-Version})
+Suggests: linux-doc- at version@ | linux-source- at version@
+Description: Linux kernel @upstreamversion@ image on @class@ machines
+ This package provides the binary image for
+ Linux kernel @upstreamversion@ on @longclass@ machines.
+ .
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-image packages
+
+Package: linux-modules- at upstreamversion@@abiname@@localversion@
+Section: base
+Priority: optional
+Depends: module-init-tools (>= 0.9.13)
+Description: Linux kernel modules @upstreamversion@ image on @class@ machines
+ This package provides pre-built loadable modules for
+ Linux kernel @version@ on @longclass@ machines.
Added: people/waldi/linux-2.6/debian/templates/control.image.type-modulesinline.in
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/templates/control.image.type-modulesinline.in Fri Mar 31 17:14:41 2006
@@ -0,0 +1,12 @@
+Package: linux-image- at upstreamversion@@abiname@@localversion@
+Section: base
+Priority: optional
+Provides: linux-image, linux-image- at major@
+Depends: module-init-tools (>= 0.9.13)
+Suggests: linux-doc- at version@ | linux-source- at version@
+Description: Linux kernel @upstreamversion@ image on @class@ machines
+ This package provides the binary image and pre-built loadable modules for
+ Linux kernel @upstreamversion@ on @longclass@ machines.
+ .
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-image packages
Added: people/waldi/linux-2.6/debian/templates/control.image.type-standalone.in
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/templates/control.image.type-standalone.in Fri Mar 31 17:14:41 2006
@@ -0,0 +1,11 @@
+Package: linux-image- at upstreamversion@@abiname@@localversion@
+Section: base
+Priority: optional
+Provides: linux-image, linux-image- at major@
+Suggests: linux-doc- at version@ | linux-source- at version@
+Description: Linux kernel @upstreamversion@ image on @class@ machines
+ This package provides the binary image for
+ Linux kernel @upstreamversion@ on @longclass@ machines.
+ .
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-image packages
More information about the Kernel-svn-changes
mailing list