Update and cleanup udeb exclusion lists for lenny (general, i386, amd64)

Some udebs that no longer exist are removed and new (in some cases not
really new, but well) udebs that are known to be included in the initrd
are added. For i386 and amd64 the list of kernel udebs already included
in the initrd is updated.

data/lenny/exclude-udebs

@@ -4,11 +4,13 @@
 # This duplicates data found in the file build/pkg-lists/kernel, in d-i svn
 kernel-image-*
 # build/pkg-lists/base in d-i svn
+archdetect
 rootskel
 main-menu
 cdebconf-udeb
 udpkg
 anna
+di-utils
 di-utils-shell
 di-utils-reboot
 lowmemcheck
@@ -34,15 +36,18 @@ file-preseed
 nano-udeb
 floppy-retriever
 libfribidi0-udeb
-# Already on the initrd, thanks to library reduction.
+# Already on the initrd as dependencies
 libdebconfclient0-udeb
+libdebian-installer4-udeb
 libdebian-installer-extra4-udeb
 # These udebs are only useful in building the boot floppy image.
 busybox-floppy-udeb
 rootskel-bootfloppy
-# gtk stuff
+# gtk stuff included in initrd if needed
+rootskel-gtk
 cdebconf-gtk-udeb
 fontconfig-udeb
+gtk2-engines-udeb
 libatk1.0-udeb
 libcairo-directfb2-udeb
 libdirectfb-*-udeb
@@ -52,18 +57,19 @@ libglib2.0-udeb
 libgtk-directfb-2.0-0-udeb
 libgtk2-engines-udeb
 libpango1.0-udeb
+libpcre3-udeb
+libpixman-1-0-udeb
 libpng12-0-udeb
 libsdl1.2debian-udeb
 mouse-modules-*
 ttf-*
 fbset-udeb
-# We're currently using busybox's own shell, and do not need this one.
-dash-udeb
+# terminal for gtk frontend is also included in initrd
+cdebconf-gtk-terminal
+libvte9-udeb
 # Not currently used
 cdebootstrap-udeb
 hdparm-udeb
-laptop-detect-udeb
-multipath-udeb
 libaio1-udeb
 dhcp-client-udeb
 # This package is only useful in the d-i-demo.
@@ -74,16 +80,11 @@ load-floppy
 # Only useful in the hd-media initrd.
 iso-scan
 load-iso
-# We're using busybox's modutils these days.
-modutils-basic
-modutils-full
 # Nothing currently depends on this, and it seems not useful on its own.
 reiserfsprogs-udeb
 # reiser4 is not in the Debian kernel.
 mkreiser4-udeb
 reiser4progs-udeb
-# No longer used by parted.
-libreiserfs0.3-udeb
 # These are not really needed, the regular netcfg subsumes them.
 netcfg-static
 # skolelinux stuff, not for the stock CDs
@@ -92,16 +93,13 @@ debian-edu-profile-udeb
 debian-edu-archive-keyring-udeb
 ltsp-client-builder
 autopartkit
-lvm10-udeb
 # live CD stuff
 live-installer
 simple-cdd-profiles
 # If needed, will be on the initrd already.
-modutils-full
 module-init-tools-udeb
 env-preseed
 rescue-check
-rootskel-gtk
 cdebconf-text-udeb
 brltty-udeb
 klibc-utils-udeb
@@ -109,18 +107,12 @@ libklibc-udeb
 udev-udeb
 ai-choosers
 auto-install
+libslang2-udeb
 # Currently unused
 nbd-client-udeb
 pwgen-udeb
-# Obsolete
-libslang1-utf8-udeb
-discover-udeb
-discover-data-udeb
-discover1-udeb
-discover1-data-udeb
-libdiscover1-udeb
 # Eh?
 gnumach-udeb
 # Exclude kbd and console-setup udebs, they're not currently used
 kbd-udeb
-console-setup-*-udeb
+console-setup-*

data/lenny/exclude-udebs-amd64

@@ -1,26 +1,41 @@
 # These udebs are in the d-i cdrom initrd and the hd-media initrd. 
 # As such, there is no reason to keep another copy of them on the CD
 # in udeb form.
-isa-pnp-modules-*
-socket-modules-*
 console-keymaps-at
 console-keymaps-usb
-fat-modules-*
-cdrom-core-modules-*
-cdrom-modules-*
-ide-modules-*
-ide-core-modules-*
-input-modules-*
-fb-modules-*
 kbd-chooser
-usb-modules-*
-usb-storage-modules-*
+acpi-modules-*
+ata-modules-*
+cdrom-core-modules-*
+core-modules-*
+fat-modules-*
+fb-modules-*
+ide-core-modules-*
+ide-modules-*
+input-modules-*
+isofs-modules-*
+mmc-modules-*
+nls-core-modules-*
+parport-modules-*
+pcmcia-modules-*
+sata-modules-*
+scsi-common-modules-*
 scsi-core-modules-*
+scsi-modules-*
+serial-modules-*
+speakup-modules-*
+usb-modules-*
+usb-serial-modules-*
+usb-storage-modules-*
+zlib-modules-*
+# Not used on amd64
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-sun
 # Not needed with the 2.6 kernel on amd64.
 userdevfs
-# The speakup kernel modules are not useful unless the access images are
-# provided.
-*-speakup-di
 # Only needed on arches that use partconf or autopartkit.
 partconf-mkfstab
 # Not needed on arches that use partman

data/lenny/exclude-udebs-i386

@@ -1,28 +1,43 @@
 # These udebs are in the d-i cdrom initrd and the cd-drivers+root floppies. 
 # As such, there is no reason to keep another copy of them on the CD
 # in udeb form.
-isa-pnp-modules-*
-socket-modules-*
 console-keymaps-at
 console-keymaps-usb
-floppy-modules-*
-cdrom-core-modules-*
-cdrom-modules-*
-ide-modules-*
-ide-core-modules-*
-input-modules-*
-fb-modules-*
 kbd-chooser
-usb-modules-*
-usb-storage-modules-*
+acpi-modules-*
+ata-modules-*
+cdrom-core-modules-*
+core-modules-*
+fat-modules-*
+fb-modules-*
+ide-core-modules-*
+ide-modules-*
+input-modules-*
+isofs-modules-*
+mmc-modules-*
+nls-core-modules-*
+parport-modules-*
+pcmcia-modules-*
+sata-modules-*
+scsi-common-modules-*
 scsi-core-modules-*
+scsi-modules-*
+serial-modules-*
+speakup-modules-*
+usb-modules-*
+usb-serial-modules-*
+usb-storage-modules-*
+zlib-modules-*
 # 686-bigmem kernel udebs are only used for the Xen netboot image
 *-686-bigmem-di
+# Not used on i386
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-sun
 # Not needed with the 2.4 kernel on i386.
 userdevfs
-# The speakup kernel modules are not useful unless the access images are
-# provided.
-*-speakup-di
 # Only needed on arches that use partconf or autopartkit.
 partconf-mkfstab
 # Not needed on arches that use partman

debian/changelog

@@ -125,6 +125,8 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
   * Exclude 686-bigmem kernel udebs as they are only used for Xen netboot.
   * Stop including jfbterm and unifont on all images; jbfterm is no longer
     installed from D-I.
+  * Update and cleanup the udeb exclusion lists for lenny (general list and
+    lists for i386 and amd64).
 
  -- Frans Pop <fjp@debian.org>  Tue, 14 Oct 2008 10:01:20 +0200