r3965 - in trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian: . patches

[Thiemo Seufer]

Author: ths-guest
Date: 2005-08-17 19:39:29 +0000 (Wed, 17 Aug 2005)
New Revision: 3965

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/control
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/10_cobalt-patch.dpatch
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
Log:
Release 2.4.27-11.040815-1.


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	2005-08-17 19:38:05 UTC (rev 3964)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog	2005-08-17 19:39:29 UTC (rev 3965)
@@ -1,9 +1,13 @@
-kernel-patch-2.4.27-mips (2.4.27-10.040815-2) UNRELEASED; urgency=low
+kernel-patch-2.4.27-mips (2.4.27-11.040815-1) unstable; urgency=high
 
-  * Added build debpends on gcc-3.3 as the default gcc
+  * Update to debian kernel source 2.4.27-11 for security fixes.
+    See kernel source changelog for details.
+  * Added build depends on gcc-3.3 as the default gcc
     is being changed from 3.3 to 4.0.
+  * Actually use gcc-3.3 by exporting $(CC).
+  * Fix the Cobalt PCI initialization fix.
 
- -- Simon Horman <horms at debian.org>  Mon,  4 Jul 2005 12:12:20 +0900
+ -- Thiemo Seufer <ths at debian.org>  Wed, 17 Aug 2005 11:24:35 +0200
 
 kernel-patch-2.4.27-mips (2.4.27-10.040815-1) unstable; urgency=high
 

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	2005-08-17 19:38:05 UTC (rev 3964)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control	2005-08-17 19:39:29 UTC (rev 3965)
@@ -3,7 +3,7 @@
 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
+Build-Depends: kernel-source-2.4.27 (=2.4.27-11), 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

Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/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 19:38:05 UTC (rev 3964)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/10_cobalt-patch.dpatch	2005-08-17 19:39:29 UTC (rev 3965)
@@ -26,7 +26,18 @@
 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 @@
+@@ -212,15 +219,25 @@
+ 	 */
+ 	pci_read_config_word(dev, PCI_REVISION_ID, &galileo_id);
+ 	galileo_id &= 0xff;     /* mask off class info */
++#if 0
+ 	if (galileo_id >= 0x10) {
+ 		/* New Galileo, assumes PCI stop line to VIA is connected. */
+ 		GALILEO_OUTL(0x4020, GT_PCI0_TOR_OFS);
+ 	} else if (galileo_id == 0x1 || galileo_id == 0x2) {
++#endif
++	{
+ 		signed int timeo;
  		/* 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. */

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	2005-08-17 19:38:05 UTC (rev 3964)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules	2005-08-17 19:39:29 UTC (rev 3965)
@@ -5,6 +5,8 @@
 
 arch := $(shell dpkg --print-architecture)
 
+CC = gcc-3.3
+
 # The package version should be UPSTREAM-MINOR
 # For instance:
 #  2.4.27-5.040815-1
@@ -48,7 +50,7 @@
   MT_INSTALL += -s
 endif
 
-NUM_CPUS=`cat /proc/cpuinfo | grep '^processor[:space:]*' | wc -l`
+NUM_CPUS := $(shell grep '^processor[:space:]*' /proc/cpuinfo | wc -l)
 
 source-unpack-stamp:
 	rm -rf build-tmp
@@ -81,7 +83,7 @@
 	# build the mips-tools
 	cd $(kdir) && make-kpkg clean && make-kpkg debian
 	cd $(kdir)/arch/mips/boot \
-		&& gcc $(MT_CFLAGS) -o elf2ecoff elf2ecoff.c
+		&& $(CC) $(MT_CFLAGS) -o elf2ecoff elf2ecoff.c
 
 install: build
 	dh_testdir
@@ -99,7 +101,7 @@
 	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
+	cd $(kdir) && MAKEFLAGS="CC=$(CC)" make-kpkg kernel_headers
 	cp build-tmp/kernel-headers-$(basever)_$(debver)_$(arch).deb ..
 endif
 
@@ -116,7 +118,7 @@
 		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 \
+		( cd $(kdir) && CONCURRENCY_LEVEL=$(NUM_CPUS) MAKEFLAGS="CC=$(CC)" make-kpkg \
 		  --subarch $(sub) --append-to-version=-$(sub) kernel_image ) && \
 		cp build-tmp/kernel-image-$(basever)-$(sub)_$(debver)_$(arch).deb .. && ) :
 endif