r2264 - in trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27: . config

Tue, 11 Jan 2005 01:32:15 +0100

Author: joshk
Date: 2005-01-11 01:32:15 +0100 (Tue, 11 Jan 2005)
New Revision: 2264

Modified:
   trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32
   trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp
   trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install
   trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/post-install
Log:
fixify

Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32
===================================================================

--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32	2005-01-10 21:28:48 UTC (rev 2263)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32	2005-01-11 00:32:15 UTC (rev 2264)
@@ -43,7 +43,6 @@
 CONFIG_SUN_PM=y
 # CONFIG_SUN4 is not set
 # CONFIG_PCI is not set
-# CONFIG_PCI_NAMES is not set
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_NET=y
 CONFIG_SYSVIPC=y
@@ -81,21 +80,7 @@
 #
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_CLGEN is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
 # CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_INTEL is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
 CONFIG_FB_SBUS=y
 CONFIG_FB_CGSIX=y
 # CONFIG_FB_BWTWO is not set
@@ -104,8 +89,6 @@
 CONFIG_FB_CGFOURTEEN=y
 # CONFIG_FB_P9100 is not set
 CONFIG_FB_LEO=y
-# CONFIG_FB_PCI is not set
-# CONFIG_FB_IT8181 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
 CONFIG_FBCON_CFB8=y
@@ -129,8 +112,6 @@
 CONFIG_SUN_AURORA=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 CONFIG_SUN_JSFLASH=y
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_RTC is not set
 
 #
 # Linux/SPARC audio subsystem (EXPERIMENTAL)
@@ -359,10 +340,6 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
-
-#
-# ATA/IDE/MFM/RLL support
-#
 # CONFIG_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 
@@ -440,7 +417,6 @@
 CONFIG_SUNBMAC=m
 CONFIG_SUNQE=m
 CONFIG_MYRI_SBUS=m
-CONFIG_VORTEX=m
 
 #
 # Unix98 PTY support

Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp	2005-01-10 21:28:48 UTC (rev 2263)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp	2005-01-11 00:32:15 UTC (rev 2264)
@@ -44,7 +44,6 @@
 CONFIG_SUN_PM=y
 # CONFIG_SUN4 is not set
 # CONFIG_PCI is not set
-# CONFIG_PCI_NAMES is not set
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_NET=y
 CONFIG_SYSVIPC=y
@@ -82,21 +81,7 @@
 #
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_CLGEN is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
 # CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_INTEL is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
 CONFIG_FB_SBUS=y
 CONFIG_FB_CGSIX=y
 # CONFIG_FB_BWTWO is not set
@@ -105,8 +90,6 @@
 CONFIG_FB_CGFOURTEEN=y
 # CONFIG_FB_P9100 is not set
 CONFIG_FB_LEO=y
-# CONFIG_FB_PCI is not set
-# CONFIG_FB_IT8181 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
 CONFIG_FBCON_CFB8=y
@@ -130,8 +113,6 @@
 CONFIG_SUN_AURORA=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 CONFIG_SUN_JSFLASH=y
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_RTC is not set
 
 #
 # Linux/SPARC audio subsystem (EXPERIMENTAL)
@@ -360,10 +341,6 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
-
-#
-# ATA/IDE/MFM/RLL support
-#
 # CONFIG_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 
@@ -441,7 +418,6 @@
 CONFIG_SUNBMAC=m
 CONFIG_SUNQE=m
 CONFIG_MYRI_SBUS=m
-CONFIG_VORTEX=m
 
 #
 # Unix98 PTY support

Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install	2005-01-10 21:28:48 UTC (rev 2263)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install	2005-01-11 00:32:15 UTC (rev 2264)
@@ -3,7 +3,7 @@
 set -e
 
 cd $DEBIAN_SRCTOP
-find . -type f -path './scripts/*' ! -name '*.o' | \
+find . -type f -path './scripts/*' ! -o -path './arch/sparc/*' -name '*.o' | \
 	cpio -pd --preserve-modification-time $OLDPWD
 cd - > /dev/null
 

Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/post-install
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/post-install	2005-01-10 21:28:48 UTC (rev 2263)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/post-install	2005-01-11 00:32:15 UTC (rev 2264)
@@ -34,7 +34,7 @@
 cp -a .config $dir
 cd include
 find . -mindepth 1 -maxdepth 1 \
-	! -name config -a ! -name linux -a ! -name asm-$karch \
+	! -name config -a ! -name linux -a \
 	-printf "../../kernel-headers-$prefix/include/%f\n" |
 	xargs ln -s --target-directory=$dir/include
 cp -a config $dir/include



