r1412 - in trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8: config debian

[Joshua Kwan]

Author: joshk
Date: 2004-08-27 17:48:17 -0600 (Fri, 27 Aug 2004)
New Revision: 1412

Modified:
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc32
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64-smp
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/rules
Log:
no more tunnel as module


Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc32
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc32	2004-08-27 23:43:00 UTC (rev 1411)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc32	2004-08-27 23:48:17 UTC (rev 1412)
@@ -325,7 +325,6 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -365,7 +364,6 @@
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64	2004-08-27 23:43:00 UTC (rev 1411)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64	2004-08-27 23:48:17 UTC (rev 1412)
@@ -443,7 +443,6 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -483,7 +482,6 @@
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64-smp
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64-smp	2004-08-27 23:43:00 UTC (rev 1411)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64-smp	2004-08-27 23:48:17 UTC (rev 1412)
@@ -444,7 +444,6 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -484,7 +483,6 @@
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/rules
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/rules	2004-08-27 23:43:00 UTC (rev 1411)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/rules	2004-08-27 23:48:17 UTC (rev 1412)
@@ -74,9 +74,10 @@
 build-stamp: unpack-stamp
 	PATH=$$PWD/bin:$$PATH; \
 	for i in $(flavours); do \
+		karch=$${i%-smp}; karch=$${karch%32}; \
 		cd build-$$i; \
 		make-kpkg --subarch $${i%-smp} --append_to_version $(debnum)-$$i build; \
-		$(CROSS)strip -R .comment -R .note -K sun4u_init -K _end -K _start arch/$${i%-smp}/boot/image; \
+		$(CROSS)strip -R .comment -R .note -K sun4u_init -K _end -K _start arch/$$karch/boot/image; \
 		cd ..; \
 	done