r2304 - in trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8: config debian

Kyle McMartin kyle@costa.debian.org
Sat, 15 Jan 2005 20:54:04 +0100 

Author: kyle
Date: 2005-01-15 20:54:03 +0100 (Sat, 15 Jan 2005)
New Revision: 2304

Modified:
   trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/32
   trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/32-smp
   trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/64
   trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/64-smp
   trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/default
   trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/debian/changelog
   trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/debian/control
Log:
Check in the 2.6.8-{4,5} that Bdale uploaded.


Modified: trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/32
===================================================================
--- trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/32	2005-01-15 18:55:11 UTC (rev 2303)
+++ trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/32	2005-01-15 19:54:03 UTC (rev 2304)
@@ -791,7 +791,7 @@
 CONFIG_SERIO=m
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_GSCPS2=m
+CONFIG_SERIO_GSCPS2=y
 CONFIG_HP_SDC=m
 CONFIG_HIL_MLC=m
 # CONFIG_SERIO_PCIPS2 is not set
@@ -800,7 +800,7 @@
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -808,7 +808,7 @@
 CONFIG_KEYBOARD_HIL_OLD=m
 CONFIG_KEYBOARD_HIL=m
 CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
+CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
@@ -1239,7 +1239,7 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 CONFIG_EXT3_FS=m
 # CONFIG_EXT3_FS_XATTR is not set

Modified: trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/32-smp
===================================================================
--- trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/32-smp	2005-01-15 18:55:11 UTC (rev 2303)
+++ trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/32-smp	2005-01-15 19:54:03 UTC (rev 2304)
@@ -592,7 +592,7 @@
 CONFIG_SMC9194=m
 CONFIG_NET_VENDOR_RACAL=y
 CONFIG_NI52=m
-CONFIG_NI65=n
+# CONFIG_NI65 is not set
 
 #
 # Tulip family network device support
@@ -791,7 +791,7 @@
 CONFIG_SERIO=m
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_GSCPS2=m
+CONFIG_SERIO_GSCPS2=y
 CONFIG_HP_SDC=m
 CONFIG_HIL_MLC=m
 # CONFIG_SERIO_PCIPS2 is not set
@@ -800,7 +800,7 @@
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -808,7 +808,7 @@
 CONFIG_KEYBOARD_HIL_OLD=m
 CONFIG_KEYBOARD_HIL=m
 CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
+CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
@@ -1239,7 +1239,7 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 CONFIG_EXT3_FS=m
 # CONFIG_EXT3_FS_XATTR is not set

Modified: trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/64
===================================================================
--- trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/64	2005-01-15 18:55:11 UTC (rev 2303)
+++ trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/64	2005-01-15 19:54:03 UTC (rev 2304)
@@ -786,7 +786,7 @@
 CONFIG_SERIO=m
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_GSCPS2=m
+CONFIG_SERIO_GSCPS2=y
 CONFIG_HP_SDC=m
 CONFIG_HIL_MLC=m
 # CONFIG_SERIO_PCIPS2 is not set
@@ -795,7 +795,7 @@
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -803,7 +803,7 @@
 CONFIG_KEYBOARD_HIL_OLD=m
 CONFIG_KEYBOARD_HIL=m
 CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
+CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
@@ -1234,7 +1234,7 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 CONFIG_EXT3_FS=m
 # CONFIG_EXT3_FS_XATTR is not set

Modified: trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/64-smp
===================================================================
--- trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/64-smp	2005-01-15 18:55:11 UTC (rev 2303)
+++ trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/64-smp	2005-01-15 19:54:03 UTC (rev 2304)
@@ -786,7 +786,7 @@
 CONFIG_SERIO=m
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_GSCPS2=m
+CONFIG_SERIO_GSCPS2=y
 CONFIG_HP_SDC=m
 CONFIG_HIL_MLC=m
 # CONFIG_SERIO_PCIPS2 is not set
@@ -795,7 +795,7 @@
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -803,7 +803,7 @@
 CONFIG_KEYBOARD_HIL_OLD=m
 CONFIG_KEYBOARD_HIL=m
 CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
+CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
@@ -1234,7 +1234,7 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 CONFIG_EXT3_FS=m
 # CONFIG_EXT3_FS_XATTR is not set

Modified: trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/default
===================================================================
--- trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/default	2005-01-15 18:55:11 UTC (rev 2303)
+++ trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/config/default	2005-01-15 19:54:03 UTC (rev 2304)
@@ -791,7 +791,7 @@
 CONFIG_SERIO=m
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_GSCPS2=m
+CONFIG_SERIO_GSCPS2=y
 CONFIG_HP_SDC=m
 CONFIG_HIL_MLC=m
 # CONFIG_SERIO_PCIPS2 is not set
@@ -800,7 +800,7 @@
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -808,7 +808,7 @@
 CONFIG_KEYBOARD_HIL_OLD=m
 CONFIG_KEYBOARD_HIL=m
 CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
+CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
@@ -1239,7 +1239,7 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 CONFIG_EXT3_FS=m
 # CONFIG_EXT3_FS_XATTR is not set

Modified: trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/debian/changelog	2005-01-15 18:55:11 UTC (rev 2303)
+++ trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/debian/changelog	2005-01-15 19:54:03 UTC (rev 2304)
@@ -1,3 +1,21 @@
+kernel-image-2.6.8-hppa (2.6.8-5) unstable; urgency=high
+
+  * make ps2 keyboard support built-in instead of modular to ease d-i pain
+    
+ -- Bdale Garbee <bdale@gag.com>  Tue,  2 Nov 2004 12:55:33 -0700
+
+kernel-image-2.6.8-hppa (2.6.8-4) unstable; urgency=high
+
+  * we really want ext2 built-in and not as a module for d-i initrd use
+  * turn AT keyboard and PS mouse support back on as modules
+  * add gcc-3.3-hppa64 and binutils-hppa64 to build deps
+  * make sure all the configs are 'make oldconfig' clean again, and the diffs
+    between flavors are only those things that should vary between them
+  * add Bdale as an uploader
+  * crank up urgency as we need these changes in sarge for d-i udebs
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 28 Oct 2004 10:51:22 -0600
+
 kernel-image-2.6.8-hppa (2.6.8-3) unstable; urgency=low
 
   * CONFIG_BLK_DEV_RAM_SIZE must be 8192, or d-i fails, because

Modified: trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/debian/control
===================================================================
--- trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/debian/control	2005-01-15 18:55:11 UTC (rev 2303)
+++ trunk/kernel/hppa/kernel-image-2.6.8-hppa-2.6.8/debian/control	2005-01-15 19:54:03 UTC (rev 2304)
@@ -2,7 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Kyle McMartin <kyle@debian.org>
-Build-Depends: kernel-tree-2.6.8-7, kernel-patch-2.6.8-hppa (>= 2.6.8-3), kernel-package, debianutils (>= 1.6), debhelper (>= 2), bzip2, modutils (>=2.4.21-3)
+Uploaders: Bdale Garbee <bdale@gag.com>
+Build-Depends: kernel-tree-2.6.8-7, kernel-patch-2.6.8-hppa (>= 2.6.8-3), kernel-package, debianutils (>= 1.6), debhelper (>= 2), bzip2, modutils (>=2.4.21-3), gcc-3.3-hppa64, binutils-hppa64
 Standards-Version: 3.5.4
 
 Package: kernel-headers-2.6.8-1