r1960 - in trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27: config/mipsel debian debian/patches
Thiemo Seufer
ths-guest@haydn.debian.org
Thu, 02 Dec 2004 02:30:16 -0700
Author: ths-guest
Date: 2004-12-02 02:29:43 -0700 (Thu, 02 Dec 2004)
New Revision: 1960
Modified:
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00list
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
Log:
* Update to debian kernel source 2.4.27-6, 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.
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt 2004-12-02 07:41:23 UTC (rev 1959)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt 2004-12-02 09:29:43 UTC (rev 1960)
@@ -412,7 +412,7 @@
CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_PCI_AUTO is not set
+CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_ONLYDISK is not set
CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_IDEDMA_PCI_WIP is not set
@@ -445,7 +445,7 @@
# CONFIG_BLK_DEV_TRM290 is not set
CONFIG_BLK_DEV_VIA82CXXX=y
# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_AUTO is not set
+CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
# CONFIG_BLK_DEV_ATARAID is not set
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog 2004-12-02 07:41:23 UTC (rev 1959)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog 2004-12-02 09:29:43 UTC (rev 1960)
@@ -1,3 +1,16 @@
+kernel-patch-2.4.27-mips (2.4.27-6.040815-1) UNRELEASED; urgency=low
+
+ * Update to debian kernel source 2.4.27-6, 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@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.
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control 2004-12-02 07:41:23 UTC (rev 1959)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control 2004-12-02 09:29:43 UTC (rev 1960)
@@ -1,9 +1,9 @@
Source: kernel-patch-2.4.27-mips
Section: devel
Priority: optional
-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
Uploaders: Guido Guenther <agx@debian.org>, Karsten Merker <merker@debian.org>, Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
-Build-Depends: kernel-source-2.4.27 (>=2.4.27-5), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch, bzip2
+Build-Depends: kernel-source-2.4.27 (>=2.4.27-6), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch, bzip2
Standards-Version: 3.6.1
Package: kernel-headers-2.4.27
@@ -19,7 +19,7 @@
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.
+ kernel into an ECOFF image.
Package: kernel-image-2.4.27-r4k-ip22
Section: base
@@ -69,7 +69,7 @@
.
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/240.
+ Personal DECstation 5000/50 and the DECstation 5000/260.
Package: kernel-image-2.4.27-r3k-kn02
Section: base
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00list
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00list 2004-12-02 07:41:23 UTC (rev 1959)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00list 2004-12-02 09:29:43 UTC (rev 1960)
@@ -2,7 +2,10 @@
03_byteorder-proc.dpatch
04_ramdisk-parameter.dpatch
05_linux-mips-makefile.dpatch
+06_ptrace-fix.dpatch
+07_mips32-tlb.dpatch
10_cobalt-patch.dpatch
+11_cobalt-tulip.dpatch
20_sb1-mipsrtc.dpatch
21_sb-duart.dpatch
22_swarm-pcmcia.dpatch
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules 2004-12-02 07:41:23 UTC (rev 1959)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules 2004-12-02 09:29:43 UTC (rev 1960)
@@ -70,22 +70,18 @@
clean:
dh_testdir
- rm -f build-stamp
rm -f source-unpack-stamp
rm -f source-patch-stamp
rm -rf build-tmp
dh_clean
-build: build-stamp
-build-stamp: source-patch-stamp
+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 addinitrd addinitrd.c \
&& gcc $(MT_CFLAGS) -o elf2ecoff elf2ecoff.c
- touch $@
install: build
dh_testdir
@@ -99,7 +95,6 @@
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/
@@ -111,6 +106,7 @@
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
@@ -124,6 +120,7 @@
( 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
@@ -139,10 +136,10 @@
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;)
-ifneq ($(subarches),)
dpkg-distaddfile kernel-headers-$(basever)_$(debver)_$(arch).deb devel optional
endif