[d-i-commits] r32144 - in trunk/installer: build build/pkg-lists build/pkg-lists/access build/pkg-lists/cd_drivers build/pkg-lists/cdrom build/pkg-lists/cdrom-apus build/pkg-lists/cdrom-minimal build/pkg-lists/cdrom64 build/pkg-lists/floppy build/pkg-lists/hd-media build/pkg-lists/monolithic build/pkg-lists/net_drivers build/pkg-lists/netboot build/pkg-lists/netboot/arm build/pkg-lists/netboot/sparc build/pkg-lists/netboot-apus build/pkg-lists/netboot-minimal build/pkg-lists/netboot64 build/util debian

Joey Hess joeyh at costa.debian.org
Tue Nov 15 23:57:09 UTC 2005 

Author: joeyh
Date: 2005-11-15 23:57:03 +0000 (Tue, 15 Nov 2005)
New Revision: 32144

Added:
   trunk/installer/build/pkg-lists/discover
   trunk/installer/build/pkg-lists/netboot/sparc/
   trunk/installer/build/pkg-lists/netboot/sparc/combined.cfg
   trunk/installer/build/pkg-lists/netboot/sparc/sparc32.cfg
   trunk/installer/build/pkg-lists/netboot/sparc/sparc64.cfg
Removed:
   trunk/installer/build/pkg-lists/kernel_specific/
Modified:
   trunk/installer/build/README
   trunk/installer/build/pkg-lists/access/i386.cfg
   trunk/installer/build/pkg-lists/cd_drivers/i386.cfg
   trunk/installer/build/pkg-lists/cd_drivers/powerpc.cfg
   trunk/installer/build/pkg-lists/cdrom-apus/powerpc.cfg
   trunk/installer/build/pkg-lists/cdrom-minimal/powerpc.cfg
   trunk/installer/build/pkg-lists/cdrom/amd64.cfg
   trunk/installer/build/pkg-lists/cdrom/i386.cfg
   trunk/installer/build/pkg-lists/cdrom/powerpc.cfg
   trunk/installer/build/pkg-lists/cdrom/sparc.cfg
   trunk/installer/build/pkg-lists/cdrom64/powerpc.cfg
   trunk/installer/build/pkg-lists/floppy/i386.cfg
   trunk/installer/build/pkg-lists/floppy/sparc.cfg
   trunk/installer/build/pkg-lists/hd-media/amd64.cfg
   trunk/installer/build/pkg-lists/hd-media/i386.cfg
   trunk/installer/build/pkg-lists/monolithic/amd64.cfg
   trunk/installer/build/pkg-lists/monolithic/i386.cfg
   trunk/installer/build/pkg-lists/net_drivers/i386.cfg
   trunk/installer/build/pkg-lists/netboot-apus/powerpc.cfg
   trunk/installer/build/pkg-lists/netboot-minimal/powerpc.cfg
   trunk/installer/build/pkg-lists/netboot/alpha.cfg
   trunk/installer/build/pkg-lists/netboot/amd64.cfg
   trunk/installer/build/pkg-lists/netboot/arm/netwinder.cfg
   trunk/installer/build/pkg-lists/netboot/i386.cfg
   trunk/installer/build/pkg-lists/netboot/powerpc.cfg
   trunk/installer/build/pkg-lists/netboot/sparc.cfg
   trunk/installer/build/pkg-lists/netboot64/powerpc.cfg
   trunk/installer/build/util/pkg-list
   trunk/installer/debian/changelog
Log:
  * Did away with the kernel_specific pkg-lists directories.


Modified: trunk/installer/build/README
===================================================================
--- trunk/installer/build/README	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/README	2005-11-15 23:57:03 UTC (rev 32144)
@@ -59,8 +59,6 @@
   not for another, put the kernel major version(s) that should have the
   package in brackets at the end of the line.
   For example: discover1 [2.2 2.4]
-  An older way to accomplish the same thing is the pkg-lists/kernel_specific
-  directories.
 * If you'd like to include a given package only if it's available, and not
   fail otherwise, put a question mark at the end of the line.
   For example: pcmcia-modules-${kernel:Version} ?

Modified: trunk/installer/build/pkg-lists/access/i386.cfg
===================================================================
--- trunk/installer/build/pkg-lists/access/i386.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/access/i386.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -17,4 +17,4 @@
 
 dhcp-client-udeb
 
-#include "acpi-modules"
+acpi-modules-${kernel:Version} [2.6]

Modified: trunk/installer/build/pkg-lists/cd_drivers/i386.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cd_drivers/i386.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cd_drivers/i386.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,4 +1,4 @@
-#include "isa-pnp-modules"
+isa-pnp-modules-${kernel:Version} [2.4]
 ide-core-modules-${kernel:Version}
 ide-modules-${kernel:Version}
 cdrom-core-modules-${kernel:Version}

Modified: trunk/installer/build/pkg-lists/cd_drivers/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cd_drivers/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cd_drivers/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,5 @@
-#include "powerpc-extra-modules"
-
+input-modules-${kernel:Version} [2.6]
+firewire-core-modules-${kernel:Version} [2.6]
 ide-modules-${kernel:Version}
 scsi-common-modules-${kernel:Version}
 scsi-modules-${kernel:Version}

Modified: trunk/installer/build/pkg-lists/cdrom/amd64.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cdrom/amd64.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cdrom/amd64.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,4 @@
 #include "discover"
-#include "isa-pnp-modules"
 
 socket-modules-${kernel:Version}
 console-keymaps-at
@@ -25,4 +24,4 @@
 # Support for SCSI cdroms on common controllers.
 scsi-common-modules-${kernel:Version}
 
-#include "acpi-modules"
+acpi-modules-${kernel:Version}

Modified: trunk/installer/build/pkg-lists/cdrom/i386.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cdrom/i386.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cdrom/i386.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,5 @@
 #include "discover"
-#include "isa-pnp-modules"
+isa-pnp-modules-${kernel:Version} [2.4]
 
 socket-modules-${kernel:Version}
 console-keymaps-at
@@ -25,4 +25,4 @@
 # Support for SCSI cdroms on common controllers.
 scsi-common-modules-${kernel:Version}
 
-#include "acpi-modules"
+acpi-modules-${kernel:Version} [2.6]

Modified: trunk/installer/build/pkg-lists/cdrom/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cdrom/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cdrom/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,5 @@
-# Extra kernel-specific modules.
-#include "powerpc-extra-modules"
+input-modules-${kernel:Version} [2.6]
+firewire-core-modules-${kernel:Version} [2.6]
 
 ide-modules-${kernel:Version}
 console-keymaps-at

Modified: trunk/installer/build/pkg-lists/cdrom/sparc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cdrom/sparc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cdrom/sparc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,11 +1,20 @@
-#include "sparc-keymap"
-#include "sparc-ide"
-#include "sparc-scsi"
-#include "sparc-usb"
-
 nic-modules-${kernel:Version}
 cdrom-core-modules-${kernel:Version}
 
 console-keymaps-usb
 #include "discover"
 kbd-chooser
+
+# Some modules are only available for sparc64, so only include them if they
+# are available.
+usb-modules-${kernel:Version} ?
+usb-discover
+ide-modules-${kernel:Version} ?
+
+# sparc 2.4 has scsi-modules, while 2.6 has scsi-common-modules
+scsi-modules-${kernel:Version} [2.4]
+scsi-common-modules-${kernel:Version} [2.6]
+
+# sparc 2.4 has one keymap, 2.6 another
+console-keymaps-sun [2.4]
+console-keymaps-at [2.6]

Modified: trunk/installer/build/pkg-lists/cdrom-apus/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cdrom-apus/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cdrom-apus/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,5 @@
-#include "powerpc-extra-modules"
-
+input-modules-${kernel:Version} [2.6]
+firewire-core-modules-${kernel:Version} [2.6]
 ide-modules-${kernel:Version}
 scsi-modules-${kernel:Version}
 console-keymaps-amiga

Modified: trunk/installer/build/pkg-lists/cdrom-minimal/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cdrom-minimal/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cdrom-minimal/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,5 @@
-# Extra kernel-specific modules.
-#include "powerpc-extra-modules"
+input-modules-${kernel:Version} [2.6]
+firewire-core-modules-${kernel:Version} [2.6]
 
 ide-modules-${kernel:Version}
 console-keymaps-at

Modified: trunk/installer/build/pkg-lists/cdrom64/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/cdrom64/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/cdrom64/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,6 +1,5 @@
-# Extra kernel-specific modules.
-#include "powerpc-extra-modules"
-
+input-modules-${kernel:Version} [2.6]
+firewire-core-modules-${kernel:Version} [2.6]
 ide-modules-${kernel:Version}
 console-keymaps-at
 console-keymaps-usb

Added: trunk/installer/build/pkg-lists/discover
===================================================================
--- trunk/installer/build/pkg-lists/discover	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/discover	2005-11-15 23:57:03 UTC (rev 32144)
@@ -0,0 +1,2 @@
+discover1-data-udeb
+discover1-udeb

Modified: trunk/installer/build/pkg-lists/floppy/i386.cfg
===================================================================
--- trunk/installer/build/pkg-lists/floppy/i386.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/floppy/i386.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,4 +1,4 @@
-#include "acpi-modules"
+acpi-modules-${kernel:Version} [2.6]
 socket-modules-${kernel:Version}
 console-keymaps-at
 console-keymaps-usb

Modified: trunk/installer/build/pkg-lists/floppy/sparc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/floppy/sparc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/floppy/sparc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,3 @@
-#include "sparc-keymap"
-
 #include "discover"
 dhcp-client-udeb
 nic-modules-${kernel:Version}
@@ -13,3 +11,7 @@
 choose-mirror
 hw-detect
 ethdetect
+
+# sparc 2.4 has one keymap, 2.6 another
+console-keymaps-sun [2.4]
+console-keymaps-at [2.6]

Modified: trunk/installer/build/pkg-lists/hd-media/amd64.cfg
===================================================================
--- trunk/installer/build/pkg-lists/hd-media/amd64.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/hd-media/amd64.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -3,7 +3,6 @@
 console-keymaps-usb
 input-modules-${kernel:Version}
 fb-modules-${kernel:Version}
-#include "isa-pnp-modules"
 kbd-chooser
 
 #include "discover"
@@ -30,4 +29,4 @@
 # the iso is loop-mounted
 loop-modules-${kernel:Version}
 
-#include "acpi-modules"
+acpi-modules-${kernel:Version}

Modified: trunk/installer/build/pkg-lists/hd-media/i386.cfg
===================================================================
--- trunk/installer/build/pkg-lists/hd-media/i386.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/hd-media/i386.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -3,7 +3,7 @@
 console-keymaps-usb
 input-modules-${kernel:Version}
 fb-modules-${kernel:Version}
-#include "isa-pnp-modules"
+isa-pnp-modules-${kernel:Version} [2.4]
 kbd-chooser
 
 #include "discover"
@@ -30,4 +30,4 @@
 # the iso is loop-mounted
 loop-modules-${kernel:Version}
 
-#include "acpi-modules"
+acpi-modules-${kernel:Version} [2.6]

Modified: trunk/installer/build/pkg-lists/monolithic/amd64.cfg
===================================================================
--- trunk/installer/build/pkg-lists/monolithic/amd64.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/monolithic/amd64.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -7,5 +7,4 @@
 pcmcia-cs-udeb
 wireless-tools-udeb
 dhcp-client-udeb
-
-#include "acpi-modules"
+acpi-modules-${kernel:Version}

Modified: trunk/installer/build/pkg-lists/monolithic/i386.cfg
===================================================================
--- trunk/installer/build/pkg-lists/monolithic/i386.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/monolithic/i386.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -8,4 +8,4 @@
 wireless-tools-udeb
 dhcp-client-udeb
 
-#include "acpi-modules"
+acpi-modules-${kernel:Version} [2.6]

Modified: trunk/installer/build/pkg-lists/net_drivers/i386.cfg
===================================================================
--- trunk/installer/build/pkg-lists/net_drivers/i386.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/net_drivers/i386.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,4 +1,4 @@
-#include "isa-pnp-modules"
+isa-pnp-modules-${kernel:Version} [2.4]
 nic-extra-modules-${kernel:Version}
 parport-modules-${kernel:Version}
 

Modified: trunk/installer/build/pkg-lists/netboot/alpha.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot/alpha.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot/alpha.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -4,7 +4,7 @@
 nic-shared-modules-${kernel:Version}
 nic-modules-${kernel:Version}
 nic-extra-modules-${kernel:Version}
-#include "isa-pnp-modules"
+isa-pnp-modules-${kernel:Version} [2.4]
 console-keymaps-at
 dhcp-client-udeb
 #include "discover"

Modified: trunk/installer/build/pkg-lists/netboot/amd64.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot/amd64.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot/amd64.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,4 @@
 #include "discover"
-#include "isa-pnp-modules"
 
 console-keymaps-at
 console-keymaps-usb
@@ -34,4 +33,4 @@
 ethdetect
 netcfg
 
-#include "acpi-modules"
+acpi-modules-${kernel:Version}

Modified: trunk/installer/build/pkg-lists/netboot/arm/netwinder.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot/arm/netwinder.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot/arm/netwinder.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,5 @@
 nic-shared-modules-${kernel:Version}
-#include "isa-pnp-modules"
+isa-pnp-modules-${kernel:Version} [2.4]
 nic-modules-${kernel:Version}
 nic-extra-modules-${kernel:Version}
 usb-modules-${kernel:Version}

Modified: trunk/installer/build/pkg-lists/netboot/i386.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot/i386.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot/i386.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,4 @@
 #include "discover"
-#include "isa-pnp-modules"
 
 console-keymaps-at
 console-keymaps-usb
@@ -12,6 +11,7 @@
 nic-extra-modules-${kernel:Version}
 usb-modules-${kernel:Version}
 input-modules-${kernel:Version}
+isa-pnp-modules-${kernel:Version} [2.4]
 kbd-chooser
 
 # This is needed for proper display of utf-8.
@@ -34,4 +34,4 @@
 ethdetect
 netcfg
 
-#include "acpi-modules"
+acpi-modules-${kernel:Version} [2.6]

Modified: trunk/installer/build/pkg-lists/netboot/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,4 @@
-#include "powerpc-extra-modules"
-
+input-modules-${kernel:Version} [2.6]
 console-keymaps-at
 console-keymaps-usb
 #include "discover"
@@ -7,7 +6,7 @@
 nic-modules-${kernel:Version}
 nic-extra-modules-${kernel:Version}
 socket-modules-${kernel:Version}
-# #include "isa-pnp-modules"
+isa-pnp-modules-${kernel:Version} [2.4]
 nic-pcmcia-modules-${kernel:Version}
 pcmcia-modules-${kernel:Version}
 floppy-retriever

Added: trunk/installer/build/pkg-lists/netboot/sparc/combined.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot/sparc/combined.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot/sparc/combined.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -0,0 +1,3 @@
+# Only available for sparc64, so only include if available.
+usb-modules-${kernel:Version} ?
+usb-discover

Added: trunk/installer/build/pkg-lists/netboot/sparc/sparc32.cfg
===================================================================

Added: trunk/installer/build/pkg-lists/netboot/sparc/sparc64.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot/sparc/sparc64.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot/sparc/sparc64.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -0,0 +1,3 @@
+# Only available on sparc64.
+usb-modules-${kernel:Version}
+usb-discover

Modified: trunk/installer/build/pkg-lists/netboot/sparc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot/sparc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot/sparc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,6 +1,3 @@
-#include "sparc-keymap"
-#include "sparc-usb"
-
 console-keymaps-usb
 dhcp-client-udeb
 #include "discover"
@@ -12,3 +9,7 @@
 netcfg
 
 nic-modules-${kernel:Version}
+
+# sparc 2.4 has one keymap, 2.6 another
+console-keymaps-sun [2.4]
+console-keymaps-at [2.6]

Modified: trunk/installer/build/pkg-lists/netboot-apus/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot-apus/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot-apus/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,4 +1,4 @@
-#include "powerpc-extra-modules"
+input-modules-${kernel:Version} [2.6]
 
 console-keymaps-amiga
 #include "discover"

Modified: trunk/installer/build/pkg-lists/netboot-minimal/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot-minimal/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot-minimal/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,4 @@
-#include "powerpc-extra-modules"
-
+input-modules-${kernel:Version} [2.6]
 console-keymaps-at
 console-keymaps-usb
 #include "discover"
@@ -7,7 +6,7 @@
 nic-modules-${kernel:Version}
 #nic-extra-modules-${kernel:Version}
 socket-modules-${kernel:Version}
-# #include "isa-pnp-modules"
+#isa-pnp-modules-${kernel:Version} [2.4]
 #nic-pcmcia-modules-${kernel:Version}
 #pcmcia-modules-${kernel:Version}
 #floppy-retriever

Modified: trunk/installer/build/pkg-lists/netboot64/powerpc.cfg
===================================================================
--- trunk/installer/build/pkg-lists/netboot64/powerpc.cfg	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/pkg-lists/netboot64/powerpc.cfg	2005-11-15 23:57:03 UTC (rev 32144)
@@ -1,5 +1,5 @@
-#include "powerpc-extra-modules"
-
+input-modules-${kernel:Version} [2.6]
+firewire-core-modules-${kernel:Version} [2.6]
 console-keymaps-at
 console-keymaps-usb
 #include "discover"
@@ -7,7 +7,7 @@
 nic-modules-${kernel:Version}
 nic-extra-modules-${kernel:Version}
 socket-modules-${kernel:Version}
-# #include "isa-pnp-modules"
+isa-pnp-modules-${kernel:Version} [2.4]
 nic-pcmcia-modules-${kernel:Version}
 pcmcia-modules-${kernel:Version}
 floppy-retriever

Modified: trunk/installer/build/util/pkg-list
===================================================================
--- trunk/installer/build/util/pkg-list	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/build/util/pkg-list	2005-11-15 23:57:03 UTC (rev 32144)
@@ -195,18 +195,7 @@
 				# includes
 				if (/^#include \"(.*)\"/) {
 					my $include=$1;
-					if (-e "pkg-lists/kernel_specific/$kernel_major/$deb_host_arch/$sub_arch/$include") {
-						push @lists, "pkg-lists/kernel_specific/$kernel_major/$deb_host_arch/$sub_arch/$include";
-					}
-					elsif (-e "pkg-lists/kernel_specific/$kernel_major/$deb_host_arch/$include") {
-						push @lists, "pkg-lists/kernel_specific/$kernel_major/$deb_host_arch/$include";
-					}
-					elsif (-e "pkg-lists/kernel_specific/$kernel_major/$include") {
-						push @lists, "pkg-lists/kernel_specific/$kernel_major/$include";
-					}
-					else {
-						push @lists, "pkg-lists/$include";
-					}
+					push @lists, "pkg-lists/$include";
 				}
 				
 				# comments

Modified: trunk/installer/debian/changelog
===================================================================
--- trunk/installer/debian/changelog	2005-11-15 23:00:32 UTC (rev 32143)
+++ trunk/installer/debian/changelog	2005-11-15 23:57:03 UTC (rev 32144)
@@ -19,6 +19,7 @@
   [ Joey Hess ]
   * Switch to root=/dev/ram in syslinux configs to support 2.6.14 post-devfs
     kernels.
+  * Did away with the kernel_specific pkg-lists directories.
 
  -- Joey Hess <joeyh at debian.org>  Tue, 15 Nov 2005 17:23:56 -0500

More information about the d-i-commits mailing list