[kernel] r20241 - in dists/trunk/linux/debian: . installer installer/ia64 installer/ia64/modules/ia64 installer/modules

[Ben Hutchings]

Author: benh
Date: Tue Jun 11 02:48:16 2013
New Revision: 20241

Log:
udeb: Move ide-modules and ide-core-modules into ia64 configuration

Deleted:
   dists/trunk/linux/debian/installer/modules/ide-core-modules
   dists/trunk/linux/debian/installer/modules/ide-modules
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/installer/ia64/modules/ia64/cdrom-core-modules
   dists/trunk/linux/debian/installer/ia64/modules/ia64/ide-core-modules
   dists/trunk/linux/debian/installer/ia64/modules/ia64/ide-modules
   dists/trunk/linux/debian/installer/ia64/package-list
   dists/trunk/linux/debian/installer/modules/cdrom-core-modules
   dists/trunk/linux/debian/installer/package-list

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Jun 11 02:36:53 2013	(r20240)
+++ dists/trunk/linux/debian/changelog	Tue Jun 11 02:48:16 2013	(r20241)
@@ -12,6 +12,7 @@
     - Only list the 'new' firewire modules in firewire-core-modules
     - Remove obsolete eth1394 and firewire-core-modules dependency from
       nic-modules
+    - Move ide-modules and ide-core-modules into ia64 configuration
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 03 Jun 2013 13:21:56 +0100
 

Modified: dists/trunk/linux/debian/installer/ia64/modules/ia64/cdrom-core-modules
==============================================================================
--- dists/trunk/linux/debian/installer/ia64/modules/ia64/cdrom-core-modules	Tue Jun 11 02:36:53 2013	(r20240)
+++ dists/trunk/linux/debian/installer/ia64/modules/ia64/cdrom-core-modules	Tue Jun 11 02:48:16 2013	(r20241)
@@ -1,2 +1,2 @@
 #include <cdrom-core-modules>
-
+ide-cd_mod

Modified: dists/trunk/linux/debian/installer/ia64/modules/ia64/ide-core-modules
==============================================================================
--- dists/trunk/linux/debian/installer/ia64/modules/ia64/ide-core-modules	Tue Jun 11 02:36:53 2013	(r20240)
+++ dists/trunk/linux/debian/installer/ia64/modules/ia64/ide-core-modules	Tue Jun 11 02:48:16 2013	(r20241)
@@ -1,2 +1 @@
-#include <ide-core-modules>
-
+ide-core

Modified: dists/trunk/linux/debian/installer/ia64/modules/ia64/ide-modules
==============================================================================
--- dists/trunk/linux/debian/installer/ia64/modules/ia64/ide-modules	Tue Jun 11 02:36:53 2013	(r20240)
+++ dists/trunk/linux/debian/installer/ia64/modules/ia64/ide-modules	Tue Jun 11 02:48:16 2013	(r20241)
@@ -1,2 +1,3 @@
-#include <ide-modules>
+ide-gd_mod
 sgiioc4
+trm290

Modified: dists/trunk/linux/debian/installer/ia64/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/ia64/package-list	Tue Jun 11 02:36:53 2013	(r20240)
+++ dists/trunk/linux/debian/installer/ia64/package-list	Tue Jun 11 02:48:16 2013	(r20241)
@@ -6,8 +6,20 @@
 Package: fat-modules
 Priority: standard
 
+Package: ide-core-modules
+Depends: kernel-image
+Priority: standard
+Description: IDE support
+ This package contains core IDE support for the kernel.
+
 Package: ide-modules
 Depends: kernel-image, ide-core-modules, sn-modules
+Priority: standard
+Description: IDE drivers
+ This package contains IDE drivers for the kernel.
+
+Package: cdrom-core-modules
+Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules
 
 Package: nic-modules
 Depends: kernel-image, nic-shared-modules, core-modules, crc-modules

Modified: dists/trunk/linux/debian/installer/modules/cdrom-core-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/cdrom-core-modules	Tue Jun 11 02:36:53 2013	(r20240)
+++ dists/trunk/linux/debian/installer/modules/cdrom-core-modules	Tue Jun 11 02:48:16 2013	(r20241)
@@ -1,3 +1,2 @@
 cdrom ?
 sr_mod ?
-ide-cd_mod ?

Modified: dists/trunk/linux/debian/installer/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/package-list	Tue Jun 11 02:36:53 2013	(r20240)
+++ dists/trunk/linux/debian/installer/package-list	Tue Jun 11 02:48:16 2013	(r20241)
@@ -53,26 +53,14 @@
 Description: PPP drivers
  This package contains PPP drivers for the kernel.
 
-Package: ide-modules
-Depends: kernel-image, ide-core-modules
-Priority: standard
-Description: IDE drivers
- This package contains IDE drivers for the kernel.
-
 Package: pata-modules
 Depends: kernel-image, ata-modules
 Priority: standard
 Description: PATA drivers
  This package contains PATA drivers for the kernel.
 
-Package: ide-core-modules
-Depends: kernel-image
-Priority: standard
-Description: IDE support
- This package contains core IDE support for the kernel.
-
 Package: cdrom-core-modules
-Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules
+Depends: kernel-image, scsi-core-modules, isofs-modules
 Priority: standard
 Description: CDROM support
  This package contains core CDROM support for the kernel.