r3966 - in tags/kernel-2.4/mips: . 2.4.27-11.040815-1/debian 2.4.27-11.040815-1/debian/patches

Thiemo Seufer ths-guest at costa.debian.org
Wed Aug 17 19:46:16 UTC 2005


Author: ths-guest
Date: 2005-08-17 19:46:15 +0000 (Wed, 17 Aug 2005)
New Revision: 3966

Added:
   tags/kernel-2.4/mips/2.4.27-11.040815-1/
   tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/changelog
   tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/control
   tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/patches/10_cobalt-patch.dpatch
   tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/rules
Removed:
   tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/changelog
   tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/control
   tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/patches/10_cobalt-patch.dpatch
   tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/rules
Log:
Tag 2.4.27-11.040815-1.


Copied: tags/kernel-2.4/mips/2.4.27-11.040815-1 (from rev 3963, trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27)

Deleted: tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/changelog
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog	2005-08-17 16:06:19 UTC (rev 3963)
+++ tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/changelog	2005-08-17 19:46:15 UTC (rev 3966)
@@ -1,531 +0,0 @@
-kernel-patch-2.4.27-mips (2.4.27-10.040815-2) UNRELEASED; urgency=low
-
-  * Added build debpends on gcc-3.3 as the default gcc
-    is being changed from 3.3 to 4.0.
-
- -- Simon Horman <horms at debian.org>  Mon,  4 Jul 2005 12:12:20 +0900
-
-kernel-patch-2.4.27-mips (2.4.27-10.040815-1) unstable; urgency=high
-
-  * Update to debian kernel source 2.4.27-10 for security fixes.
-    See kernel source changelog for details.
-  * Tighten build dependency to match the exact source version.
-  * Fix crash for serial-less Cobalt Qube1, 12_cobalt-qube1-serial.dpatch.
-  * Fix Cobalt PCI initialization.
-  * Disable CONFIG_IDEDMA_PCI_AUTO, CONFIG_IDEDMA_AUTO again for Cobalt
-    because of crashes under I/O load.
-
- -- Thiemo Seufer <ths at debian.org>  Mon, 02 May 2005 20:44:40 +0200
-
-kernel-patch-2.4.27-mips (2.4.27-9.040815-1) unstable; urgency=low
-
-  * Update to debian kernel source 2.4.27-9 for security fixes.
-    See kernel source changelog for details.
-  * Relicense the elf2ecoff manpage to GPL 2.
-  * Fix broken ptrace patch (Closes: #299204).
-
- -- Thiemo Seufer <ths at debian.org>  Wed, 26 Jan 2005 17:23:37 +0100
-
-kernel-patch-2.4.27-mips (2.4.27-8.040815-1) unstable; urgency=high
-
-  * Update to debian kernel source 2.4.27-8 for security fixes.
-    See kernel source changelog for details.
-  * Enable CONFIG_USB_STORAGE for cobalt, and bring the storage modules
-    of other USB-using subarches in line with it (Closes: #290482).
-  * Fix detection of make failures.
-
- -- Thiemo Seufer <ths at debian.org>  Fri, 14 Jan 2005 19:46:13 +0100
-
-kernel-patch-2.4.27-mips (2.4.27-7.040815-1) unstable; urgency=low
-
-  * Update to debian kernel source 2.4.27-7, mainly for security fixes.
-    See kernel source changelog for details.
-  * Minor control file fixes.
-  * Enable CONFIG_IDEDMA_*AUTO for Cobalt (Closes: #281447).
-  * Add 11_cobalt-tulip.dpatch to support ethernet in some early
-    cobalt machines.
-  * Fix exploitable ptrace syscall handling.
-  * Fix TLB handling for MIPS32 CPUs, it may break under load.
-
- -- Thiemo Seufer <seufer at csv.ica.uni-stuttgart.de>  Mon, 15 Nov 2004 19:31:47 +0100
-
-kernel-patch-2.4.27-mips (2.4.27-5.040815-1) unstable; urgency=medium
-
-  * Update to debian kernel source 2.4.27-5.
-  * Update kernel configs.
-  * Improve package version handling in debian/rules.
-
- -- Thiemo Seufer <seufer at csv.ica.uni-stuttgart.de>  Thu, 09 Sep 2004 04:26:28 +0200
-
-kernel-patch-2.4.27-mips (2.4.27-2.040815) unstable; urgency=medium
-
-  * Update to kernel version 2.4.27, mips CVS 2004-08-15.
-  * Update control file descriptions, change Maintainership to
-    debian-kernel.
-  * Remove 01_export-objs.dpatch, 02_addinitrd-cleanup.dpatch,
-    20_swarm-TIOCGSERIAL.dpatch , 23_swarm-highmem-tlb.dpatch
-    and 41_ip22-ipv6.dpatch, they went in upstream.
-  * Update kernel configs.
-  * Add sound/usb/firewire modules for r5k-cobalt.  Closes: #266607
-  * Add patch for xxs1500 board_reset function, 50_xxs1500-boardreset.dpatch.
-  * Add patch for SWARM to enable MIPS_RTC again, 20_sb1-mipsrtc.dpatch.
-
- -- Thiemo Seufer <seufer at csv.ica.uni-stuttgart.de>  Wed, 18 Aug 2004 17:44:52 +0100
-
-kernel-patch-2.4.26-mips (2.4.26-4.040505) unstable; urgency=low
-
-  * Build against kernel-source-2.4.26 version 2.4.26-4, fixes stack
-    allocation in crypt().
-  * Update control file descriptions.
-
- -- Thiemo Seufer <seufer at csv.ica.uni-stuttgart.de>  Thu, 29 Jul 2004 00:30:02 +0200
-
-kernel-patch-2.4.26-mips (2.4.26-3.040505) unstable; urgency=low
-
-  * Build against kernel-source-2.4.26 version 2.4.26-3 in order to
-    get some security fixes.
-  * Use dpatch for patch handling.
-  * Don't create a kernel-patch-mips package any more.
-
- -- Thiemo Seufer <seufer at csv.ica.uni-stuttgart.de>  Wed, 14 Jul 2004 16:05:27 +0200
-
-kernel-patch-2.4.26-mips (2.4.26-0.040505.1) unstable; urgency=low
-
-  * Improve compiler optimization options.
-  * Add some more ide, usb and nic modules (Closes: #238428).
-  * Remove forcedeth module, it's not useful for SWARM.
-  * Enable Framebuffer support, makes USB HID useful (Closes: #244443).
-  * Build mips-tools for any arch.
-  * Don't build the kernel headers for non-MIPS arch (Closes: #249821).
-
- -- Thiemo Seufer <seufer at csv.ica.uni-stuttgart.de>  Sun, 30 May 2004 23:59:37 +0200
-
-kernel-patch-2.4.26-mips (2.4.26-0.040505) unstable; urgency=low
-
-  * Switched to kernel version 2.4.26, mips CVS 2004-05-05.
-  * Don't create separate ppp module packages for r3k-kn02, r4k-kn04,
-    r4k-ip22 anymore.
-  * Add xxs1500 images, thanks to Goswin Brederlow.
-  * Split the mips-patch in several items, keep them uncompressed,
-    adjust debian/rules accordingly.
-  * simplify debian/rules a bit.
-  * enable some more modules for sb1-swarm, especially scsi and usb,
-    and add highmem support. Export some symbols for this.
-  * Fix basic PCMCIA operations for sb1-swarm, thanks to
-    Peter 'p2' de Schrijver.
-
- -- Thiemo Seufer <seufer at csv.ica.uni-stuttgart.de>  Sun, 16 May 2004 22:36:13 +0200
-
-kernel-patch-2.4.25-mips (2.4.25-0.040415.1) unstable; urgency=low
-
-  * switched kernel version to 2.4.25, thanks to Thiemo Seufer.
-  * modified 2.4.19 PMAD-AA patch to work with 2.4.25 and applied it
-  * applied Cobalt patch from
-    http://www.colonel-panic.org/cobalt-mips/
-  * do not build drivers/tc/lk201-map.c on the fly anymore but instead
-    provide a pregenerated source file as current loadkeys produces code
-    which aims at kernel 2.5/2.6 and is incompatible with kernel 2.4
-  * used new initrd patch written by
-    Thiemo Seufer <seufer at csv.ica.uni-stuttgart.de>, and a fix for it
-    by Martin Michlmayr.
-  * added patch implementing TIOCGSERIAL for the SWARM, thanks to
-    Peter 'p2' De Schrijver.
-  * add Cobalt images, thanks Martin Michlmayr (Closes: #243626).
-  * enable sb1-swarm-bn images on little-endian mips.
-  * enable CONFIG_UNIX on sb1-swarm-bn (Closes: #243630).
-  * enable OSS mixer on ip22.
-  * built against kernel-source-2.4.25 version 2.4.25-3 in order to
-    get some security fixes.
-
- -- Karsten Merker <merker at debian.org>  Thu, 15 Apr 2004 15:05:58 +0100
-
-kernel-patch-2.4.22-mips (2.4.22-0.030928.5) unstable; urgency=low
-
-  * don't build udebs, they're handeld by d-i's build process now
-  * move mips and mipsel configs into separate subdirs since some
-    boards can run in both endianesses but need different configs
-  * compile in mips_rtc for swarm
-  * build more modules for swarm (Closes: #238428)
-  * enable initrd for swarm (Closes: #238447)
-  * add a little endian swarm config, will be autobuild once we reenable mipsel
-  * remove extra mips/ subdir in kernel-patch package 
-
- -- Guido Guenther <agx at debian.org>  Mon, 22 Mar 2004 23:35:27 +0100
-
-kernel-patch-2.4.22-mips (2.4.22-0.030928.4) unstable; urgency=low
-
-  * remove all mipsel builds. The DECStations were broken since ages, Karsten
-    and Thiemo are working on a fix. Until mipsel can switch to 2.4.22 they
-    use 2.4.19, this somewhat eases security update maintenance.
-  * some minor -march vs. -mtune updates to fix sb1250 build
-  * export __cpu_{logical,nr}_map to modules to make iptables/ipchains work on
-    SMP systems
-  * add build of sb1-swarm-bn images (BCM91250A)
-  * properly clean the build dir so we don't run into problems with SMP builds
-  * adjust build-dependency to (>= 2.4.22-5) to make sure we build with
-    a kernel-source that has the do_brk fix
-  * remove /u/s/d/kernel-patch-2.4.X from debian/dirs since this is handeld by
-    dh_installdocs
-  * slightly update README.Debian
-
- -- Guido Guenther <agx at debian.org>  Tue,  2 Mar 2004 14:35:22 +0100
-
-kernel-patch-2.4.22-mips (2.4.22-0.030928.3) unstable; urgency=high
-
-  * Applied patch extracted from Solar Designer's Owl patched kernel to
-    fix local privilege escalation discovered by Paul Starzetz
-    (CAN-2004-0077)
-  * remove Conflict libc6 (<=2.3.2-7) to ease upgrades.
-  * remove do_brk security fix, it's in the 2.4.22 kernel-source package
-    now
-
- -- Guido Guenther <agx at debian.org>  Mon,  9 Feb 2004 20:15:19 +0100
-
-kernel-patch-2.4.22-mips (2.4.22-0.030928.2) unstable; urgency=low
-
-  * apply do_mremap security fix (CAN-2003-0985)
-
- -- Guido Guenther <agx at debian.org>  Wed,  7 Jan 2004 14:10:14 +0100
-
-kernel-patch-2.4.22-mips (2.4.22-0.030928.1) unstable; urgency=low
-
-  * apply do_brk security fix, thanks Herbert Xu
-  * store the uncompressed linux-mips CVS patch in the source package
-
- -- Guido Guenther <agx at debian.org>  Mon,  1 Dec 2003 14:17:56 +0100
-
-kernel-patch-2.4.22-mips (2.4.22-0.030928) unstable; urgency=low
-
-  * update include/asm-mips/msgbuf.h to CVS version 1.1.4.3 to fix msqs. Add a
-    conflict on glibc <= 2.3.2-7 for mips, since this breaks binary
-    compatibility. Thanks to Ryan Murray for sorting this out.
-    (Closes: #215273)
-
- -- Guido Guenther <agx at debian.org>  Mon, 13 Oct 2003 10:49:17 +0200
-
-kernel-patch-2.4.22-mips (2.4.22-0.030927) unstable; urgency=low
-
-  * new upstream version
-  * use PHYSADDR in sgiwd93 (patch by Ladislav Michel)
-  * fix addinitrd on mipsel (patch by Thiemo Seufer)
-  * disable second level cache on IP22 (Thiemo Seufer), but only on R5Ks (me),
-    this finally allows R5k SC Indys to work
-  * remove mips kmap_types.h patch, it's fixed upstream now...
-  * ... but add kmap_types.h for mips64
-  * pull pmadaa until someone fixes the build
-  * DECStations serial driver options changed completely, updated configs
-
- -- Guido Guenther <agx at debian.org>  Mon, 29 Sep 2003 21:19:09 +0200
-
-kernel-patch-2.4.21-mips (2.4.21-0.030705) unstable; urgency=low
-
-  * new upstream version
-  * readd serial console support for IP22 which got accidentally disabled due
-    to changes in the CONFIG_IP22_* naming, thanks to Julian Blache for
-    spotting this.
-  * most of our patches are now in linux-mips.org's cvs
-  * add config for the Lasat subarch and build kernel images for it
-  * echo 4 > debian/compat
-  * bump Standars-Version to 3.6.1
-  * teach debian/rules about -preX and -rcX prereleases
-  * enable modversions (Closes: #211774)
-  * fixup kmap_softirq.h to make the crypto modules buildable
-
- -- Guido Guenther <agx at debian.org>  Sun, 21 Sep 2003 22:24:58 +0200
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911.8) unstable; urgency=low
-
-  * CONFIG_TMPFS=y (Closes: #189114)
-  * fix arch/mips/Makefile to work with gcc-3.3/binutils-2.14.90.0.5 and
-    gcc-2.95/binutils-2.13.X
-  * remove the ptrace fix, it's in kernel-source-2.4.19 now
-  * bump Standars-Version to 3.6.1
-
- -- Guido Guenther <agx at debian.org>  Thu, 18 Sep 2003 23:57:24 +0200
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911.7) unstable; urgency=low
-
-  * emulate ll/sc for R3000A CPUs too (Closes: #180619).
-  * remove dots at end of Description: in debian/rules
-  * Thiemo Seufer's dec_system_strings rework was already included in in the
-    last upload.
-
- -- Guido Guenther <agx at debian.org>  Mon,  7 Apr 2003 13:20:16 +0200
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911.6) unstable; urgency=low
-
-  * fix ptrace vulnerability
-  * fix crash on IP22 when eaddr is unset in the PROM
-  * first round of getting R3K to work with glibc 2.3.1
-  * enable devfs for debian-installer
-  * rediff against 2.4.19-5
-  * remove explicit gcc-3.2 dependency since it's the default for sarge
-  * Karsten:
-    - added fix/modified driver for the PMAD-AA TurboChannel ethernet
-      board and the DECstation 5000/200 onboard ethernet interface
-      (fixes non-working ethernet on DECstation 5000/200 and
-      on systems that have both onboard ethernet and a PMAD-AA card)
-    - enabled PMAD-AA support in config/r3k-kn02 and config/r4k-kn04
-    - enabled DZ serial support in config/r3k-kn02
-
- -- Guido Guenther <agx at debian.org>  Tue, 18 Mar 2003 18:22:38 +0100
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911.5) unstable; urgency=low
-
-  * readd modules/ directory - damnit. (Closes: #172766)
-  * 'set -e' when building the images
-
- -- Guido Guenther <agx at debian.org>  Thu, 12 Dec 2002 20:28:03 +0100
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911.4) unstable; urgency=low
-
-  * add dh_shlibdeps call. (Closes: #172623)
-  * rm copy-modules.old
-  * CVSify
-
- -- Guido Guenther <agx at debian.org>  Thu, 12 Dec 2002 02:52:27 +0100
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911.3) unstable; urgency=low
-
-  * add support for building per subarch udebs (skeleton stolen from ppc)
-  * modify copy-modules to cope with subarchitectures
-  * honor DEB_BUILD_OPTIONS for mips-tools package
-  * debian/rules cleanup, unpack the source tree only once
-  * work around problem for kernel's distclean removing all empty files
-    including APPLIED_* files which makes unpatching in the clean target
-    fail silently
-  * bump standards version to 3.5.8
-  * rediff against 2.4.19-4
-
- -- Guido Guenther <agx at debian.org>  Tue,  3 Dec 2002 22:41:42 +0100
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911.2) unstable; urgency=low
-
-  * allow sgiseeq to receive multicast frames, patch by Jochen Friedrich
-  * use gcc-3.2 
-  * the cvs repository moved from oss.sgi.com to ftp.linux-mips.org so
-    rename the patch and correct the descriptions.
-
- -- Guido Guenther <agx at debian.org>  Sat, 12 Oct 2002 02:23:02 +0200
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911.1) unstable; urgency=low
-
-  * diff against kernel-source 2.4.19-3
-  * Karsten: apply patch from Florian Lohoff to fix dec_esp
-  * Add Karsten as uploader to the control file
-
- -- Guido Guenther <agx at debian.org>  Wed,  9 Oct 2002 15:35:40 +0200
-
-kernel-patch-2.4.19-mips (2.4.19-0.020911) unstable; urgency=low
-
-  * new upstream version
-  * move /proc/gio to /proc/bus/gio and make it better parseable
-  * add patch by William Jhun to fix console selection on IP22
-  * disable I2 EISA support for now
-  * updated cvs location in the copyright file
-
- -- Guido Guenther <agx at debian.org>  Sat,  5 Oct 2002 00:53:43 +0200
-
-kernel-patch-2.4.18-mips (2.4.18-0.020622.1) unstable; urgency=low
-
-  * use fixed head.S
-  * remove addinitrd manpage
-  * cleanup README.Debian
-
- -- Guido Guenther <agx at debian.org>  Sun, 23 Jun 2002 21:00:16 +0200
-
-kernel-patch-2.4.18-mips (2.4.18-0.020622) unstable; urgency=low
-
-  * resync with oss cvs - most of the changes are merged upstream which
-    brings us down to a minimal patch only - horray.
-  * fix pgtable.h to make the assembler happy
-  * kernel-headers package provides kernel-headers-2.4
-
- -- Guido Guenther <agx at debian.org>  Sun, 23 Jun 2002 14:47:03 +0200
-
-kernel-patch-2.4.17-mips (2.4.17-0.020226.3) unstable; urgency=low
-
-  * add parsing for rd_start && rd_size commandline options. These
-    are used by the tip22 bootloader to pass the address and size
-    of an initrd to the kernel.
-  * don't include addinitrd in mips-tools anymore, we handle this
-    cleaner with tip22 now.
-
- -- Guido Guenther <agx at debian.org>  Thu,  9 May 2002 22:33:40 +0200
-
-kernel-patch-2.4.17-mips (2.4.17-0.020226.2) unstable; urgency=low
-
-  * On IP22 link in scsi-cdrom and iso9660 statically (Closes: #144412)
-  * this bloats the kernel so much that it will overwrite arcboot (<<0.3.1)
-    during boot, so I added a versioned conflict
-  * Corrupted pixmaps in X are now a thing of the past - fixed by a cache
-    aliasing patch from Steve Longerbeam & Jun Sun posted to linux-mips
-
- -- Guido Guenther <agx at debian.org>  Sun, 28 Apr 2002 15:55:35 +0200
-
-kernel-patch-2.4.17-mips (2.4.17-0.020226.1) unstable; urgency=low
-
-  * addinitrd fixups: open the source image O_RDONLY and make sure we don't
-    overwrite the kernel's data segment unintentionally.
-  * remove BKL and fix potential race on SMP systems in IP22 watchdog driver
-    (patch by Dave Hansen)
-  * Karsten: backport of the DECstation keyboard driver fixes from the current
-    cvs kernel, needed to make the kernel work on machines without keyboard
-    (previous version hung infinitely when no keyboard was attached)
-
- -- Guido Guenther <agx at debian.org>  Wed,  3 Apr 2002 15:25:03 +0200
-
-kernel-patch-2.4.17-mips (2.4.17-0.020226) unstable; urgency=low
-
-  * update to CVS 2002-02-26
-  * include r3k-swap-patch from linux-mips list (this should finally
-    make r3k decstations work)
-  * IP22 watchdog driver included upstream
-  * use make-kpkg --append-to-version instead of --arch_in_name to
-    make sure we can install kernel images of different subarches
-    at the same time.
-  * add updated decstation configs from Karsten Merker
-  * fix apply/0mips mipsel vs mips breakage (patch by Karsten Merker)
-
- -- Guido Guenther <agx at debian.org>  Mon, 11 Mar 2002 10:28:37 +0100
-
-kernel-patch-2.4.17-mips (2.4.17-0.020130.1) unstable; urgency=medium
-
-  * *** Important: ***
-    We now ship an ELF instead of an ECOFF image on mips since this is 
-    what arcboot expects. Old I2 proms will not boot this kernel unless 
-    you either use arcboot(recommended) or use elf2ecoff before putting 
-    the kernel into the vh.
-  * incorporate proper mipsel support so we can build mips and mipsel
-    images from this source packages(thanks to Karsten Merker
-    <merker at debian.org> for .configs and descriptions)
-  * mips images now suggest arcboot instead of dvhtool
-  * README.Debian and debian/control cleanup
-  * elf2ecoff/addinitrd changes applied upstream
-  * add IP22 watchdog driver
-  * fix depmod tumbling over non ELF files in toplevel makefile
-  * urgency=medium so this package makes it into the archive before
-    arcboot
-
- -- Guido Guenther <agx at debian.org>  Sat,  2 Feb 2002 16:32:36 +0100
-
-kernel-patch-2.4.17-mips (2.4.17-0.020130) unstable; urgency=low
-
-  * new upstream version
-  * build mips-tools package for mipsel too.
-  * machtype in /proc/cpuinfo is fixed upstream again, so remove
-    our patch.
-  * cleanup our "don't crash the I2 on boot" patch
-  * enable the HAL2 driver
-
- -- Guido Guenther <agx at debian.org>  Wed, 30 Jan 2002 23:35:28 +0100
-
-kernel-patch-2.4.16-mips (2.4.16-0.011212.1) unstable; urgency=low
-
-  * fix /proc/cpuinfo to make autoconf, XFree86 and boot-floppies
-    happy
-
- -- Guido Guenther <agx at debian.org>  Sun, 16 Dec 2001 14:50:26 +0100
-
-kernel-patch-2.4.16-mips (2.4.16-0.011212) unstable; urgency=low
-
-  * New upstream version
-  * rework newport_dont_crash patch since ip22 specific files
-    moved to arch/mips/sgi-ip22
-  * remove unnecessary kernel-{patch,images} targets from debian/rules
-  * small addinitrd/elf2ecoff cleanups
-  * build mips-tools package containing addinitrd and elf2ecoff
-
- -- Guido Guenther <agx at debian.org>  Mon,  3 Dec 2001 00:57:47 +0100
-
-kernel-patch-2.4.14-mips (2.4.14-0.011112.1) unstable; urgency=low
-
-  * add build-dependency on modutils(depmod) & console-tools(loadkeys)
-    since those are needed to build the kernel-images
-  * cleanup debian/rules a bit
-
- -- Guido Guenther <agx at debian.org>  Mon, 19 Nov 2001 20:25:50 +0100
-
-kernel-patch-2.4.14-mips (2.4.14-0.011112) unstable; urgency=medium
-
-  * New upstream version
-  * urgency=medium due to general kernel security fixes
-  * arch/mips/kernel/setup.c now includes the initrd updates but
-    arch/mips/kernel/boot/addinitrd.c doesn't, so keep that part for now
-
- -- Guido Guenther <agx at debian.org>  Mon, 12 Nov 2001 22:00:06 +0100
-
-kernel-patch-2.4.9-mips (2.4.9-0.010928.3) unstable; urgency=low
-
-  * pull in more fixes from oss cvs, mostly:
-     - copy_{to,from}_user
-     - lots of math-emu stuff
-     - sys_sysmips
-  * remove fast_sysmips patch, since this is fixed in cvs now
-  * don't include .#* cvs leftovers
-  * enable more modules on ip22
-
- -- Guido Guenther <agx at debian.org>  Thu, 11 Oct 2001 20:58:13 +0200
-
-kernel-patch-2.4.9-mips (2.4.9-0.010928.2) unstable; urgency=low
-
-  * make-kpkg now properly handles the mkcramfs/cramfsck nonsense, 
-    so rebuild the diff
-
- -- Guido Guenther <agx at debian.org>  Mon,  8 Oct 2001 23:56:35 +0200
-
-kernel-patch-2.4.9-mips (2.4.9-0.010928.1) unstable; urgency=low
-
-  * add addinitrd patch and enable initrd by default
-
- -- Guido Guenther <agx at debian.org>  Tue,  2 Oct 2001 20:30:04 +0200
-
-kernel-patch-2.4.9-mips (2.4.9-0.010927) unstable; urgency=low
-
-  * New upstream version
-  * build sound module for ip22 (no - sound still doesn't work)
-  * Added Flo's MIPS_ATOMIC_SET implementation (ll/sc CPUs only)
-  * Changed dependency on kernel-source-2.4.X to recommends
-    kernel-source-2.4.X
-
- -- Guido Guenther <agx at debian.org>  Fri, 28 Sep 2001 03:41:37 +0200
-
-kernel-patch-2.4.5-mips (2.4.5-0.20010728.2) unstable; urgency=low
-
-  * add 'provides kernel-image-2.4' to debian/control
-  * ip22 kernel-images recommend dvhtool
-  * compile in the loopdevice statically (needed for bootdisks)
-
- -- Guido Guenther <agx at debian.org>  Tue, 31 Jul 2001 21:20:39 +0200
-
-kernel-patch-2.4.5-mips (2.4.5-0.20010728.1) unstable; urgency=low
-
-  * update to latest cvs head
-  * add some comments about crosscompiling
-
- -- Guido Guenther <agx at debian.org>  Thu, 26 Jul 2001 21:51:20 +0200
-
-kernel-patch-2.4.5-mips (2.4.5-0.20010721.2) unstable; urgency=low
-
-  * build at least some modules for ip22
-  * add r4k-decstation config by Karsten Merker
-
- -- Guido Guenther <agx at debian.org>  Mon, 23 Jul 2001 02:24:08 +0200
-
-kernel-patch-2.4.5-mips (2.4.5-0.20010721.1) unstable; urgency=low
-
-  * fix wrong 2.4.4 reference in dirs
-  * weed out last powerpc references
-  * add build dependency on debhelper
-
- -- Guido Guenther <agx at debian.org>  Sun, 22 Jul 2001 21:42:22 +0200
-
-kernel-patch-2.4.5-mips (2.4.5-0.20010721) unstable; urgency=low
-
-  * first shot at a kernel package for mips based on the powerpc
-    kernel-patch package
-  * added patch to stop i2 from crashing with newport driver
-  * added Flo's first sysmips patch
-
- -- Guido Guenther <agx at debian.org>  Sat, 21 Jul 2001 19:36:40 +0200
-

Copied: tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/changelog (from rev 3965, trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog)

Deleted: tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/control
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control	2005-08-17 16:06:19 UTC (rev 3963)
+++ tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/control	2005-08-17 19:46:15 UTC (rev 3966)
@@ -1,119 +0,0 @@
-Source: kernel-patch-2.4.27-mips
-Section: devel
-Priority: optional
-Maintainer: Debian kernel team <debian-kernel at lists.debian.org>
-Uploaders: Guido Guenther <agx at debian.org>, Karsten Merker <merker at debian.org>, Thiemo Seufer <ths at debian.org>
-Build-Depends: kernel-source-2.4.27 (=2.4.27-10), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch, bzip2, gcc-3.3
-Standards-Version: 3.6.1
-
-Package: kernel-headers-2.4.27
-Architecture: mips mipsel
-Provides: kernel-headers, kernel-headers-2.4
-Description: Header files related to a specific Linux kernel
- This package provides kernel header files, for sites that want the latest
- kernel headers.  Read /usr/share/doc/kernel-headers-2.4.27/debian.README.gz
- for details.
-
-Package: mips-tools
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: mips specific kernel tools
- This package provides tools used on the mips architecture to convert the
- kernel into an ECOFF image.
-
-Package: kernel-image-2.4.27-r4k-ip22
-Section: base
-Architecture: mips
-Suggests: kernel-doc-2.4.27, arcboot (>=0.3.1)
-Conflicts: arcboot (<<0.3.1)
-Provides: kernel-image, kernel-image-2.4
-Description: Linux kernel binary image
- This package contains the Linux/MIPS kernel image, the
- System.map file, and the modules built by the package.
- .
- This version is for R4XX0 processors and the SGI IP22 subarchitecture
- like the Indy and Indigo2.
-
-Package: kernel-image-2.4.27-r5k-ip22
-Section: base
-Architecture: mips
-Suggests: kernel-doc-2.4.27, arcboot (>=0.3.1)
-Conflicts: arcboot (<<0.3.1)
-Provides: kernel-image, kernel-image-2.4
-Description: Linux kernel binary image
- This package contains the Linux/MIPS kernel image, the
- System.map file, and the modules built by the package.
- .
- This version is for R5000 processors and the SGI IP22 subarchitecture
- like the Indy and Indigo2.
-
-Package: kernel-image-2.4.27-sb1-swarm-bn
-Section: base
-Architecture: mips mipsel
-Suggests: kernel-doc-2.4.27
-Provides: kernel-image, kernel-image-2.4
-Description: Linux kernel binary image
- This package contains the Linux/MIPS kernel image, the
- System.map file, and the modules built by the package.
- .
- This version is for the Broadcom BCM91250A (aka SWARM) pass 2.2.
-
-Package: kernel-image-2.4.27-r4k-kn04
-Section: base
-Architecture: mipsel
-Suggests: kernel-doc-2.4.27, delo
-Provides: kernel-image, kernel-image-2.4
-Description: Linux kernel binary image
- This package contains the Linux/MIPS kernel image, the
- System.map file, and the modules built by the package.
- .
- This is the kernel required for R4X00 based DECstations with KN04
- (or compatible) mainboard, such as the DECstation 5000/150, the
- Personal DECstation 5000/50 and the DECstation 5000/260.
-
-Package: kernel-image-2.4.27-r3k-kn02
-Section: base
-Architecture: mipsel
-Suggests: kernel-doc-2.4.27, delo
-Provides: kernel-image, kernel-image-2.4
-Description: Linux kernel binary image
- This package contains the Linux/MIPS kernel image, the
- System.map file, and the modules built by the package.
- .
- This is the kernel required for R3000 based DECstations with KN02
- (or compatible) mainboard, such as the DECstation 5000/1xx series
- with xx=20,25,33 and the DECstation 5000/240.
-
-Package: kernel-image-2.4.27-r5k-lasat
-Section: base
-Architecture: mipsel
-Suggests: kernel-doc-2.4.27
-Provides: kernel-image, kernel-image-2.4
-Description: Linux kernel binary image
- This package contains the Linux/MIPS kernel image, the
- System.map file, and the modules built by the package.
- .
- This version is for R5000 processors on the Lasat Masquerade Pro.
-
-Package: kernel-image-2.4.27-r5k-cobalt
-Section: base
-Architecture: mipsel
-Suggests: kernel-doc-2.4.27
-Provides: kernel-image, kernel-image-2.4
-Description: Linux kernel binary image
- This package contains the Linux/MIPS kernel image, the
- System.map file, and the modules built by the package.
- .
- This version is for MIPS based Cobalt machines (such as the Qube,
- RaQ, Qube2 and RaQ2).
-
-Package: kernel-image-2.4.27-xxs1500
-Section: base
-Architecture: mipsel
-Suggests: kernel-doc-2.4.27
-Provides: kernel-image, kernel-image-2.4
-Description: Linux kernel binary image
- This package contains the Linux/MIPS kernel image, the
- System.map file, and the modules built by the package.
- .
- This version is for the Au1500 based XXS1500 board.

Copied: tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/control (from rev 3965, trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control)

Deleted: tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/patches/10_cobalt-patch.dpatch
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/10_cobalt-patch.dpatch	2005-08-17 16:06:19 UTC (rev 3963)
+++ tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/patches/10_cobalt-patch.dpatch	2005-08-17 19:46:15 UTC (rev 3966)
@@ -1,486 +0,0 @@
-#! /bin/sh -e
-## 10_cobalt-patch.dpatch by Karsten Merker <karsten at excalibur.cologne.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Cobalt fixes for 2.4 from http://www.colonel-panic.org/cobalt-mips/
-## DP: cobalt-patch-2.4.x-20040411
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-diff -urN linux.cvs/arch/mips/cobalt/pci.c linux.pdh/arch/mips/cobalt/pci.c
---- linux.cvs/arch/mips/cobalt/pci.c	2003-07-05 14:17:03.000000000 +0100
-+++ linux.pdh/arch/mips/cobalt/pci.c	2004-04-11 16:27:59.000000000 +0100
-@@ -220,7 +227,14 @@
- 		/* XXX WE MUST DO THIS ELSE GALILEO LOCKS UP! -DaveM */
- 		timeo = GALILEO_INL(GT_PCI0_TOR_OFS);
- 		/* Old Galileo, assumes PCI STOP line to VIA is disconnected. */
--		GALILEO_OUTL(0xffff, GT_PCI0_TOR_OFS);
-+		GALILEO_OUTL(
-+			     (0xff << 16) |          /* retry count */
-+			     (0xff << 8) |           /* timeout 1   */
-+			     0xff,                   /* timeout 0   */
-+			     GT_PCI0_TOR_OFS);
-+
-+		/* enable PCI retry exceeded interrupt */
-+		GALILEO_OUTL(GALILEO_INTR_RETRY_CTR | GALILEO_INL(GT_INTRMASK_OFS), GT_INTRMASK_OFS);
- 	}
- }
- 
-Index: linux/include/asm-mips/cobalt/cobalt.h
-===================================================================
---- linux.orig/include/asm-mips/cobalt/cobalt.h 2005-04-10 13:16:12.000000000 +0100
-+++ linux/include/asm-mips/cobalt/cobalt.h      2005-04-10 13:16:12.000000000 +0100
-@@ -89,6 +89,7 @@
- #define GALILEO_OUTL(val, port)	outl(val, GALILEO_REG(port))
- 
- #define GALILEO_T0EXP		0x0100
-+#define GALILEO_INTR_RETRY_CTR (1 << 20)
- #define GALILEO_ENTC0		0x01
- #define GALILEO_SELTC0		0x02
- 
-diff -urN linux.cvs/arch/mips/cobalt/setup.c linux.pdh/arch/mips/cobalt/setup.c
---- linux.cvs/arch/mips/cobalt/setup.c	2003-07-05 14:17:03.000000000 +0100
-+++ linux.pdh/arch/mips/cobalt/setup.c	2004-04-11 17:50:11.000000000 +0100
-@@ -34,6 +34,8 @@
- extern struct rtc_ops std_rtc_ops;
- extern struct ide_ops std_ide_ops;
- 
-+extern int cobalt_board_id;
-+
- 
- char arcs_cmdline[CL_SIZE] = {
-  "console=ttyS0,115200 "
-@@ -49,6 +51,16 @@
- 
- const char *get_system_type(void)
- {
-+	switch (cobalt_board_id) {
-+		case COBALT_BRD_ID_QUBE1:
-+			return "Cobalt Qube";
-+		case COBALT_BRD_ID_RAQ1:
-+			return "Cobalt RaQ";
-+		case COBALT_BRD_ID_QUBE2:
-+			return "Cobalt Qube2";
-+		case COBALT_BRD_ID_RAQ2:
-+			return "Cobalt RaQ2";
-+	}
- 	return "MIPS Cobalt";
- }
- 
-@@ -98,13 +110,96 @@
- 	/*ns16550_setup_console();*/
- }
- 
-+#ifdef CONFIG_BLK_DEV_INITRD
-+
-+static int __init initrd_setup(unsigned long memsz)
-+{
-+	extern unsigned long initrd_start, initrd_end;
-+	extern char __rd_start, __rd_end;
-+
-+	unsigned long start, size, phys;
-+	char *ptr;
-+
-+	if (!memcmp(arcs_cmdline, "initrd=", 7))
-+		ptr = arcs_cmdline;
-+	else {
-+		ptr = strstr(arcs_cmdline, " initrd=");
-+		if (!ptr)
-+			return 0;
-+		++ptr;
-+	}
-+
-+	size = simple_strtoul(ptr + 7, &ptr, 16);
-+	if (*ptr != '@')
-+		goto invalid;
-+
-+	start = simple_strtoul(ptr + 1, &ptr, 16);
-+	if (*ptr && *ptr != ' ')
-+		goto invalid;
-+
-+	phys = CPHYSADDR(start);
-+	if (phys + size > memsz) {
-+invalid:
-+		printk(KERN_WARNING "initrd: command line parameter invalid\n");
-+		return 0;
-+	}
-+
-+	if (!size)
-+		return 0;
-+
-+	/* an embedded ramdisk overrides us (arch/mips/kernel/setup.c) */
-+
-+	if (&__rd_start != &__rd_end) {
-+		printk(KERN_WARNING "initrd: overridden by embedded ramdisk\n");
-+		return 0;
-+	}
-+
-+	initrd_start = start;
-+	initrd_end = start + size;
-+
-+	add_memory_region(0x0, phys, BOOT_MEM_RAM);
-+	add_memory_region(phys, size, BOOT_MEM_RESERVED);
-+	phys += size;
-+	add_memory_region(phys, memsz - phys, BOOT_MEM_RAM);
-+
-+	return 1;
-+}
-+
-+#endif /* CONFIG_BLK_DEV_INITRD */
-+
- /* Prom init. We read our one and only communication with the
--    firmware. Grab the amount of installed memory */
--void __init prom_init(int argc)
-+    firmware. Grab the amount of installed memory.
-+    Better boot loaders pass a command line too :-) */
-+void __init prom_init(int argc, char *argv[])
- {
-+	int indx, posn, nchr;
-+	unsigned long memsz;
-+
- 	mips_machgroup = MACH_GROUP_COBALT;
- 
--	add_memory_region(0x0, argc & 0x7fffffff, BOOT_MEM_RAM);
-+	memsz = argc & 0x7fff0000;
-+	argc &= 0xffff;
-+
-+	if (argc) {
-+		arcs_cmdline[0] = '\0';
-+		posn = 0;
-+		for (indx = 1; indx < argc; ++indx) {
-+			nchr = strlen(argv[indx]);
-+			if (posn + 1 + nchr + 1 > sizeof(arcs_cmdline))
-+				break;
-+			if (posn)
-+				arcs_cmdline[posn++] = ' ';
-+			strcpy(arcs_cmdline + posn, argv[indx]);
-+			posn += nchr;
-+		}
-+	}
-+
-+#ifdef CONFIG_BLK_DEV_INITRD
-+	if (!initrd_setup(memsz))
-+#endif
-+	{
-+		add_memory_region(0x0, memsz, BOOT_MEM_RAM);
-+	}
- }
- 
- void __init prom_free_prom_memory(void)
-diff -urN linux.cvs/arch/mips/defconfig-cobalt linux.pdh/arch/mips/defconfig-cobalt
---- linux.cvs/arch/mips/defconfig-cobalt	2004-03-15 20:50:55.000000000 +0000
-+++ linux.pdh/arch/mips/defconfig-cobalt	2004-04-11 16:27:59.000000000 +0100
-@@ -13,7 +13,9 @@
- #
- # Loadable module support
- #
--# CONFIG_MODULES is not set
-+CONFIG_MODULES=y
-+# CONFIG_MODVERSIONS is not set
-+CONFIG_KMOD=y
- 
- #
- # Machine selection
-@@ -168,7 +170,7 @@
- # CONFIG_BLK_DEV_DAC960 is not set
- # CONFIG_BLK_DEV_UMEM is not set
- # CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_LOOP is not set
- # CONFIG_BLK_DEV_NBD is not set
- # CONFIG_BLK_DEV_RAM is not set
- # CONFIG_BLK_DEV_INITRD is not set
-@@ -624,15 +626,15 @@
- #
- # CONFIG_CODA_FS is not set
- # CONFIG_INTERMEZZO_FS is not set
--CONFIG_NFS_FS=y
-+# CONFIG_NFS_FS is not set
- # CONFIG_NFS_V3 is not set
- # CONFIG_NFS_DIRECTIO is not set
- # CONFIG_ROOT_NFS is not set
- # CONFIG_NFSD is not set
- # CONFIG_NFSD_V3 is not set
- # CONFIG_NFSD_TCP is not set
--CONFIG_SUNRPC=y
--CONFIG_LOCKD=y
-+# CONFIG_SUNRPC is not set
-+# CONFIG_LOCKD is not set
- # CONFIG_SMB_FS is not set
- # CONFIG_NCP_FS is not set
- # CONFIG_NCPFS_PACKET_SIGNING is not set
-@@ -648,22 +650,8 @@
- #
- # Partition Types
- #
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
-+# CONFIG_PARTITION_ADVANCED is not set
- CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--CONFIG_SGI_PARTITION=y
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
- # CONFIG_SMB_NLS is not set
- # CONFIG_NLS is not set
- 
-@@ -695,7 +683,7 @@
- #
- # Kernel hacking
- #
--CONFIG_CROSSCOMPILE=y
-+# CONFIG_CROSSCOMPILE is not set
- # CONFIG_RUNTIME_DEBUG is not set
- # CONFIG_KGDB is not set
- # CONFIG_GDB_CONSOLE is not set
-diff -urN linux.cvs/arch/mips/ld.script.in linux.pdh/arch/mips/ld.script.in
---- linux.cvs/arch/mips/ld.script.in	2004-02-06 15:14:07.000000000 +0000
-+++ linux.pdh/arch/mips/ld.script.in	2004-04-11 16:27:59.000000000 +0100
-@@ -30,6 +30,10 @@
-   __ksymtab : { *(__ksymtab) }
-   __stop___ksymtab = .;
- 
-+  __start___kallsyms = .;	/* All kernel symbols */
-+  __kallsyms : { *(__kallsyms) }
-+  __stop___kallsyms = .;
-+
-   _etext = .;
- 
-   . = ALIGN(8192);
-diff -urN linux.cvs/arch/mips/lib/dump_tlb.c linux.pdh/arch/mips/lib/dump_tlb.c
---- linux.cvs/arch/mips/lib/dump_tlb.c	2004-02-11 15:05:10.000000000 +0000
-+++ linux.pdh/arch/mips/lib/dump_tlb.c	2004-04-11 16:27:59.000000000 +0100
-@@ -32,6 +32,7 @@
- 	case PM_256M:	return "256Mb";
- #endif
- 	}
-+	return "???";
- }
- 
- void dump_tlb(int first, int last)
-diff -urN linux.cvs/arch/mips/lib/rtc-no.c linux.pdh/arch/mips/lib/rtc-no.c
---- linux.cvs/arch/mips/lib/rtc-no.c	2004-01-08 18:31:49.000000000 +0000
-+++ linux.pdh/arch/mips/lib/rtc-no.c	2004-04-11 16:27:59.000000000 +0100
-@@ -29,5 +29,3 @@
-     .rtc_write_data = (void *) &shouldnt_happen,
-     .rtc_bcd_mode   = (void *) &shouldnt_happen
- };
--
--EXPORT_SYMBOL(rtc_ops);
-diff -urN linux.cvs/drivers/net/tulip/eeprom.c linux.pdh/drivers/net/tulip/eeprom.c
---- linux.cvs/drivers/net/tulip/eeprom.c	2003-02-25 22:03:08.000000000 +0000
-+++ linux.pdh/drivers/net/tulip/eeprom.c	2004-04-11 16:27:59.000000000 +0100
-@@ -62,6 +62,22 @@
- 	 */
- 	{ 0x1e00, 0x0000, 0x000b, 0x8f01, 0x0103, 0x0300, 0x0821, 0x000, 0x0001, 0x0000, 0x01e1 }
-   },
-+  {"Cobalt Microserver", 0, 0x10, 0xE0, {0x1e00, /* 0 == controller #, 1e == offset	*/
-+					 0x0000, /* 0 == high offset, 0 == gap		*/
-+					 0x0800, /* Default Autoselect			*/
-+					 0x8001, /* 1 leaf, extended type, bogus len	*/
-+					 0x0003, /* Type 3 (MII), PHY #0		*/
-+					 0x0400, /* 0 init instr, 4 reset instr		*/
-+					 0x0801, /* Set control mode, GP0 output	*/
-+					 0x0000, /* Drive GP0 Low (RST is active low)	*/
-+					 0x0800, /* control mode, GP0 input (undriven)	*/
-+					 0x0000, /* clear control mode			*/
-+					 0x7800, /* 100TX FDX + HDX, 10bT FDX + HDX	*/
-+					 0x01e0, /* Advertise all above			*/
-+					 0x5000, /* FDX all above			*/
-+					 0x1800, /* Set fast TTM in 100bt modes		*/
-+					 0x0000, /* PHY cannot be unplugged		*/
-+  }},
-   {0, 0, 0, 0, {}}};
- 
- 
-diff -urN linux.cvs/drivers/net/tulip/media.c linux.pdh/drivers/net/tulip/media.c
---- linux.cvs/drivers/net/tulip/media.c	2003-02-25 22:03:08.000000000 +0000
-+++ linux.pdh/drivers/net/tulip/media.c	2004-04-11 16:27:59.000000000 +0100
-@@ -400,6 +400,9 @@
- 	}
- 
- 	tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
-+
-+	udelay(1000);
-+
- 	return;
- }
- 
-diff -urN linux.cvs/drivers/net/tulip/tulip_core.c linux.pdh/drivers/net/tulip/tulip_core.c
---- linux.cvs/drivers/net/tulip/tulip_core.c	2003-11-19 18:49:50.000000000 +0000
-+++ linux.pdh/drivers/net/tulip/tulip_core.c	2004-04-11 16:27:59.000000000 +0100
-@@ -1595,8 +1595,8 @@
-                     (PCI_SLOT(pdev->devfn) == 12))) {
-                        /* Cobalt MAC address in first EEPROM locations. */
-                        sa_offset = 0;
--                       /* No media table either */
--                       tp->flags &= ~HAS_MEDIA_TABLE;
-+		       /* Ensure our media table fixup get's applied */
-+		       memcpy(ee_data + 16, ee_data, 8);
-                }
- #endif
- #ifdef __hppa__
-diff -urN linux.cvs/include/asm-mips/cobalt/ide.h linux.pdh/include/asm-mips/cobalt/ide.h
---- linux.cvs/include/asm-mips/cobalt/ide.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.pdh/include/asm-mips/cobalt/ide.h	2004-04-11 16:27:59.000000000 +0100
-@@ -0,0 +1,71 @@
-+/*
-+ * PIO "in" transfers can cause D-cache lines to be allocated
-+ * to the data being read. If the target is the page cache then
-+ * the kernel can create a user space mapping of the same page
-+ * without flushing it from the D-cache. This has large potential
-+ * to create cache aliases. The Cobalts seem to trigger this
-+ * problem easily.
-+ *
-+ * MIPs doesn't have a flush_dcache_range() so we roll
-+ * our own.
-+ *
-+ * -- pdh
-+ */
-+
-+#include <asm/r4kcache.h>
-+
-+static inline void __flush_dcache(void)
-+{
-+	unsigned long dc_size, dc_line, addr, end;
-+
-+	dc_size = current_cpu_data.dcache.ways << current_cpu_data.dcache.waybit;
-+	dc_line = current_cpu_data.dcache.linesz;
-+
-+	addr = KSEG0;
-+	end = addr + dc_size;
-+
-+	for (; addr < end; addr += dc_line)
-+		flush_dcache_line_indexed(addr);
-+}
-+
-+static inline void __flush_dcache_range(unsigned long start, unsigned long end)
-+{
-+	unsigned long dc_size, dc_line, addr;
-+
-+	dc_size = current_cpu_data.dcache.ways << current_cpu_data.dcache.waybit;
-+	dc_line = current_cpu_data.dcache.linesz;
-+
-+	addr = start & ~(dc_line - 1);
-+	end += dc_line - 1;
-+
-+	if (end - addr < dc_size)
-+		for (; addr < end; addr += dc_line)
-+			flush_dcache_line(addr);
-+	else
-+		__flush_dcache();
-+}
-+
-+static inline void __ide_insw(unsigned long port, void *addr, unsigned int count)
-+{
-+	__insw(port, addr, count);
-+
-+	__flush_dcache_range((unsigned long) addr, (unsigned long) addr + count * 2);
-+}
-+
-+static inline void __ide_insl(unsigned long port, void *addr, unsigned int count)
-+{
-+	__insl(port, addr, count);
-+
-+	__flush_dcache_range((unsigned long) addr, (unsigned long) addr + count * 4);
-+}
-+
-+#undef insw
-+#undef insl
-+
-+#define insw(p,a,n)		__ide_insw((p),(a),(n))
-+#define insl(p,a,n)		__ide_insl((p),(a),(n))
-+
-+#define __ide_mm_insw(p,a,n)	do{BUG();}while(0)
-+#define __ide_mm_insl(p,a,n)	do{BUG();}while(0)
-+#define __ide_mm_outsw(p,a,n)	do{BUG();}while(0)
-+#define __ide_mm_outsl(p,a,n)	do{BUG();}while(0)
-diff -urN linux.cvs/include/asm-mips/ide.h linux.pdh/include/asm-mips/ide.h
---- linux.cvs/include/asm-mips/ide.h	2003-07-15 16:08:33.000000000 +0100
-+++ linux.pdh/include/asm-mips/ide.h	2004-04-11 17:21:40.000000000 +0100
-@@ -68,7 +68,11 @@
- #define ide_ack_intr(hwif)	((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1)
- #endif
- 
-+#ifdef CONFIG_MIPS_COBALT
-+#include <asm/cobalt/ide.h>
-+#else
- #include <asm-generic/ide_iops.h>
-+#endif
- 
- #endif /* __KERNEL__ */
- 
-diff -urN linux.cvs/include/linux/udf_fs_sb.h linux.pdh/include/linux/udf_fs_sb.h
---- linux.cvs/include/linux/udf_fs_sb.h	2002-06-26 23:36:46.000000000 +0100
-+++ linux.pdh/include/linux/udf_fs_sb.h	2004-04-11 16:27:59.000000000 +0100
-@@ -18,7 +18,7 @@
- #ifndef _UDF_FS_SB_H
- #define _UDF_FS_SB_H 1
- 
--#pragma pack(1)
-+//#pragma pack(1)
- 
- #define UDF_MAX_BLOCK_LOADED	8
- 
-@@ -31,13 +31,13 @@
- {
- 	__u16	s_packet_len;
- 	struct buffer_head *s_spar_map[4];
--};
-+} __attribute__((packed));
- 
- struct udf_virtual_data
- {
- 	__u32	s_num_entries;
- 	__u16	s_start_offset;
--};
-+} __attribute__((packed));
- 
- struct udf_bitmap
- {
-@@ -45,7 +45,7 @@
- 	__u32			s_extPosition;
- 	__u16			s_nr_groups;
- 	struct buffer_head 	**s_block_bitmap;
--};
-+} __attribute__((packed));
- 
- struct udf_part_map
- {
-@@ -71,9 +71,9 @@
- 	__u32	(*s_partition_func)(struct super_block *, __u32, __u16, __u32);
- 	__u16	s_volumeseqnum;
- 	__u16	s_partition_flags;
--};
-+} __attribute__((packed));
- 
--#pragma pack()
-+//#pragma pack()
- 
- struct udf_sb_info
- {

Copied: tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/patches/10_cobalt-patch.dpatch (from rev 3965, trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/10_cobalt-patch.dpatch)

Deleted: tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/rules
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules	2005-08-17 16:06:19 UTC (rev 3963)
+++ tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/rules	2005-08-17 19:46:15 UTC (rev 3966)
@@ -1,154 +0,0 @@
-#! /usr/bin/make -f
-
-# User configurable piece.
-epoch := 0
-
-arch := $(shell dpkg --print-architecture)
-
-# The package version should be UPSTREAM-MINOR
-# For instance:
-#  2.4.27-5.040815-1
-# where UPSTREAM is 2.4.27-5.040815 and MINOR is 1
-realver := $(shell dpkg-parsechangelog |grep '^Version: ' |sed -e 's/^Version: //' -e 's/-[^-]*$$//')
-minorver := $(shell dpkg-parsechangelog |grep '^Version: ' |sed -e 's/^Version: //' -e 's/.*-//g')
-
-# The hypothetical kernel version - the unpatched source tree in use.
-# The changelog should refer to kernel-patch-$(basever)-mips
-basever := $(shell dpkg-parsechangelog | awk -F- '/^Source:/ { if (match($$4,"^pre") || match($$4,"^rc")) print $$3"-"$$4; else print $$3}')
-
-# The debian revision of the image packages.
-debver := $(realver)-$(minorver)
-
-ifneq ($(epoch),0)
-  packver := $(epoch):$(debver)
-else
-  packver := $(debver)
-endif
-
-p_tools := mips-tools
-
-kdir := build-tmp/kernel-source-$(basever)
-
-ifeq ($(arch),mips)
-  subarches := sb1-swarm-bn r4k-ip22 r5k-ip22
-endif
-ifeq ($(arch),mipsel)
-  subarches := r5k-cobalt sb1-swarm-bn r3k-kn02 r4k-kn04 r5k-lasat xxs1500
-endif
-
-# handle DEB_BUILD_OPTIONS for mips-tools package
-MT_CFLAGS = -W -Wall -g -pipe
-MT_INSTALL = install
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  MT_CFLAGS += -O0
-else
-  MT_CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-  MT_INSTALL += -s
-endif
-
-NUM_CPUS=`cat /proc/cpuinfo | grep '^processor[:space:]*' | wc -l`
-
-source-unpack-stamp:
-	rm -rf build-tmp
-	mkdir build-tmp
-	tar -C build-tmp --bzip2 -xf /usr/src/kernel-source-$(basever).tar.bz2
-	ln -sf asm-mips $(kdir)/include/asm
-	touch $@
-
-patch: source-patch-stamp
-source-patch-stamp: source-unpack-stamp
-	dpatch -d $(kdir) apply-all
-	dpatch cat-all > $@
-
-unpatch:
-ifneq (,$(wildcard source-patch-stamp))
-	dpatch -d $(kdir) deapply-all
-	rm -f source-patch-stamp
-endif
-
-clean:
-	dh_testdir
-	rm -f source-unpack-stamp
-	rm -f source-patch-stamp
-	rm -rf build-tmp
-	dh_clean
-
-build: source-patch-stamp
-	dh_testdir
-
-	# build the mips-tools
-	cd $(kdir) && make-kpkg clean && make-kpkg debian
-	cd $(kdir)/arch/mips/boot \
-		&& gcc $(MT_CFLAGS) -o elf2ecoff elf2ecoff.c
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -p$(p_tools)
-
-	# install files for mips-tools package
-	$(MT_INSTALL) $(kdir)/arch/mips/boot/elf2ecoff debian/$(p_tools)/usr/bin
-
-binary-headers: source-patch-stamp
-	dh_testdir
-	dh_testroot
-ifneq ($(subarches),)
-	cd $(kdir) && make-kpkg clean && make-kpkg debian
-	cp debian/changelog debian/control $(kdir)/debian/
-	echo official > $(kdir)/debian/official
-	cd $(kdir) && make-kpkg kernel_headers
-	cp build-tmp/kernel-headers-$(basever)_$(debver)_$(arch).deb ..
-endif
-
-binary-images: install
-	dh_testdir
-	dh_testroot
-ifneq ($(subarches),)
-	chmod a+x ./scripts/copy-modules
-
-	# Messes up version detection with kernel-package - but that's good
-	$(foreach sub,$(subarches), \
-		echo "Building subarch $(sub)" && \
-		( cd $(kdir) && make-kpkg clean && make-kpkg debian ) && \
-		cp debian/changelog debian/control $(kdir)/debian/ && \
-		echo official > $(kdir)/debian/official && \
-		cp config/$(arch)/$(sub) $(kdir)/.config && \
-		( cd $(kdir) && CONCURRENCY_LEVEL=$(NUM_CPUS) make-kpkg \
-		  --subarch $(sub) --append-to-version=-$(sub) kernel_image ) && \
-		cp build-tmp/kernel-image-$(basever)-$(sub)_$(debver)_$(arch).deb .. && ) :
-endif
-
-binary-arch: binary-images binary-headers
-	dh_testdir
-	dh_testroot
-	dh_installdocs -p$(p_tools)
-	dh_installchangelogs -p$(p_tools)
-	dh_installman -p$(p_tools)
-
-	dh_compress -p$(p_tools)
-	dh_installdeb -p$(p_tools)
-	dh_fixperms -p$(p_tools)
-	dh_shlibdeps -p$(p_tools)
-	dh_gencontrol -p$(p_tools)
-	dh_md5sums -p$(p_tools)
-	dh_builddeb -p$(p_tools)
-ifneq ($(subarches),)
-	# finally add the kernel images and headers
-	$(foreach sub,$(subarches), \
-		dpkg-distaddfile kernel-image-$(basever)-$(sub)_$(debver)_$(arch).deb base optional && ) :
-	dpkg-distaddfile kernel-headers-$(basever)_$(debver)_$(arch).deb devel optional
-endif
-
-binary-indep:
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep binary-images binary-headers build \
-	clean install patch unpatch
-
-# Local Variables:
-# mode:Makefile
-# End:

Copied: tags/kernel-2.4/mips/2.4.27-11.040815-1/debian/rules (from rev 3965, trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules)




More information about the Kernel-svn-changes mailing list