[kernel] r5622 - in dists/sid/linux-2.6/debian: . arch/powerpc

[Sven Luther]

Author: luther
Date: Sun Jan 29 11:25:28 2006
New Revision: 5622

Modified:
   dists/sid/linux-2.6/debian/arch/powerpc/config.apus
   dists/sid/linux-2.6/debian/arch/powerpc/defines
   dists/sid/linux-2.6/debian/changelog
Log:
Adapted apus config files. Disabling scsi drivers for now as they don't build cleanly.
Makes initramfs-tools the default on powerpc, now that i fixed the klibc build :).


Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config.apus	Sun Jan 29 11:25:28 2006
@@ -18,30 +18,6 @@
 CONFIG_ATARI_PARTITION=y
 CONFIG_BLK_DEV_BUDDHA=y
 CONFIG_BLK_DEV_GAYLE=y
-CONFIG_BLZ1230_SCSI=y
-CONFIG_BLZ2060_SCSI=y
-CONFIG_BOOT_LOAD=0x00800000
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_JUMPS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CYBERSTORMII_SCSI=y
-CONFIG_CYBERSTORM_SCSI=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DMASOUND=m
-CONFIG_DMASOUND_PAULA=m
-CONFIG_FB=y
-CONFIG_FB_AMIGA=y
-CONFIG_FB_AMIGA_AGA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_NVRAM=y
-CONFIG_HIGHMEM_START=0xfe000000
-CONFIG_HW_CONSOLE=y
-CONFIG_HYDRA=y
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_KEYBOARD_AMIGA=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_OKTAGON_SCSI=y
 CONFIG_PARPORT=m
@@ -66,7 +42,6 @@
 CONFIG_AMIGA_Z2RAM=m
 CONFIG_BLK_DEV_IDEDOUBLER=y
 CONFIG_GVP11_SCSI=m
-CONFIG_FASTLANE_SCSI=m
 CONFIG_ZORRO8390=m
 CONFIG_MOUSE_AMIGA=m
 CONFIG_JOYSTICK_AMIGA=m
@@ -99,3 +74,36 @@
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_OKTAGON_SCSI is not set
+# CONFIG_FB_CT65550 is not set
+# CONFIG_FB_CONTROL is not set
+# CONFIG_FB_PLATINUM is not set
+# CONFIG_FB_VALKYRIE is not set
+CONFIG_BOOT_LOAD=0x00800000
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DMASOUND=m
+CONFIG_DMASOUND_PAULA=m
+CONFIG_FB=y
+CONFIG_FB_AMIGA=y
+CONFIG_FB_AMIGA_AGA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_HW_CONSOLE=y
+CONFIG_HYDRA=y
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_KEYBOARD_AMIGA=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_LOGO_LINUX_MONO=y
+# CONFIG_FASTLANE_SCSI is not set
+# CONFIG_CYBERSTORMII_SCSI is not set
+# CONFIG_CYBERSTORM_SCSI is not set
+# CONFIG_BLZ1230_SCSI is not set
+# CONFIG_BLZ2060_SCSI is not set
+# CONFIG_IPMI_HANDLER is not set

Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/defines	Sun Jan 29 11:25:28 2006
@@ -1,5 +1,5 @@
 [base]
-depends: yaird | initramfs-tools | linux-initramfs-tool
+depends: initramfs-tools | yaird | linux-initramfs-tool
 flavours:
  apus
  powerpc

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Jan 29 11:25:28 2006
@@ -9,7 +9,8 @@
 
   [ Christian T. Steigies ]
   * [m68k] update m68k patch and config to 2.6.15
-  * [m68k] SCSI drivers need to be built in until initrd supports loading scsi modules
+  * [m68k] SCSI drivers need to be built in until ramdisk generator tools
+    supports loading scsi modules
   * [m68k] ISCSI and IDE-TAPE don't compile, disabled
   * [m68k] set CC_OPTIMIZE_FOR_SIZE=n
   * [m68k] added vmeints patch which fixes building for vme
@@ -38,7 +39,14 @@
   * Add 64bit-vidiocswin-ioctl-fix.patch to fix VIDIOCSWIN ioctl on 64bit
     kernel 32bit userland setups. (Closes: #349338)
 
- -- Frederik Schüler <fs at debian.org>  Sat, 28 Jan 2006 13:28:10 +0100
+  [ Sven Luther ]
+  * [powerpc] Adapted apus config file to be more modular and in sync with the
+    other powerpc configs. Scsi drivers are disabled as they don't build
+    cleanly though (need some esp stuff).
+  * [powerpc] Default to initramfs-tools as initramfs generator, as klibc
+    build is fixed now.
+
+ -- Sven Luther <luther at debian.org>  Sun, 29 Jan 2006 11:07:45 +0000
 
 linux-2.6 (2.6.15-3) unstable; urgency=low