Build udebs for the installer

Use kernel-wedge in gencontrol.py and during the build process to
generate the udeb packages required by debian-installer.

Add the kernel-wedge configuration files from all the current
linux-kernel-di-$arch-2.6 packages.

svn path=/dists/trunk/linux-2.6/; revision=18121

debian/bin/gencontrol.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
-import os, sys
+import os, os.path, subprocess, sys
 sys.path.append("debian/lib/python")
 
 from debian_linux.config import ConfigCoreHierarchy
 from debian_linux.debian import *
 from debian_linux.gencontrol import Gencontrol as Base
-from debian_linux.utils import Templates
+from debian_linux.utils import Templates, read_control
 
 class Gencontrol(Base):
     def __init__(self, config_dirs = ["debian/config"], template_dirs = ["debian/templates"]):
@@ -69,6 +69,33 @@ class Gencontrol(Base):
                      ["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
                       (arch, makeflags)])
 
+        # Add udebs using kernel-wedge
+        installer_dir = 'debian/installer/' + arch
+        if os.path.isdir(installer_dir):
+            kw_env = os.environ.copy()
+            kw_env['KW_CONFIG_DIR'] = installer_dir
+            kw_proc = subprocess.Popen(
+                ['kernel-wedge', 'gen-control',
+                 self.version.linux_upstream + vars['abiname']],
+                stdout=subprocess.PIPE,
+                env=kw_env)
+            udeb_packages = read_control(kw_proc.stdout)
+            kw_proc.wait()
+            if kw_proc.returncode != 0:
+                raise RuntimeError('kernel-wedge exited with code %d' %
+                                   kw_proc.returncode)
+
+            self.merge_packages(packages, udeb_packages, arch)
+
+            # These packages must be built after the per-flavour/
+            # per-featureset packages.
+            makefile.add(
+                'binary-arch_%s' % arch,
+                cmds = ["$(MAKE) -f debian/rules.real install-udeb_%s %s "
+                        "PACKAGE_NAMES='%s'" %
+                        (arch, makeflags,
+                         ' '.join(p['Package'] for p in udeb_packages))])
+
     def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
         config_base = self.config.merge('base', arch, featureset)
         makeflags['LOCALVERSION_HEADERS'] = vars['localversion_headers'] = vars['localversion']

debian/changelog

@@ -2,6 +2,9 @@ linux-2.6 (3.1.0~rc7-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release candidate
 
+  [ Ben Hutchings ]
+  * Build udebs for the installer
+
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 22 Sep 2011 04:22:13 +0100
 
 linux-2.6 (3.1.0~rc6-1~experimental.1) experimental; urgency=low

debian/installer/alpha/kernel-versions

@@ -0,0 +1,2 @@
+# arch version flavour       installedname suffix build-depends
+alpha  -       alpha-generic -             -      -

debian/installer/alpha/modules/alpha/ata-modules

@@ -0,0 +1,2 @@
+#include <ata-modules>
+

debian/installer/alpha/modules/alpha/btrfs-modules

@@ -0,0 +1 @@
+#include <btrfs-modules>

debian/installer/alpha/modules/alpha/cdrom-core-modules

@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+

debian/installer/alpha/modules/alpha/core-modules

@@ -0,0 +1 @@
+#include <core-modules>

debian/installer/alpha/modules/alpha/crc-modules

@@ -0,0 +1 @@
+crc32

debian/installer/alpha/modules/alpha/crypto-dm-modules

@@ -0,0 +1 @@
+#include <crypto-dm-modules>

debian/installer/alpha/modules/alpha/crypto-modules

@@ -0,0 +1 @@
+#include <crypto-modules>

debian/installer/alpha/modules/alpha/ext3-modules

@@ -0,0 +1,2 @@
+#include <ext3-modules>
+

debian/installer/alpha/modules/alpha/ext4-modules

@@ -0,0 +1 @@
+#include <ext4-modules>

debian/installer/alpha/modules/alpha/fat-modules

@@ -0,0 +1,2 @@
+#include <fat-modules>
+

debian/installer/alpha/modules/alpha/fb-modules

@@ -0,0 +1,2 @@
+fbcon
+tgafb

debian/installer/alpha/modules/alpha/ide-core-modules

@@ -0,0 +1,2 @@
+#include <ide-core-modules>
+

debian/installer/alpha/modules/alpha/ide-modules

@@ -0,0 +1,2 @@
+#include <ide-modules>
+

debian/installer/alpha/modules/alpha/ipv6-modules

@@ -0,0 +1,2 @@
+#include <ipv6-modules>
+

debian/installer/alpha/modules/alpha/isofs-modules

@@ -0,0 +1 @@
+#include <isofs-modules>

debian/installer/alpha/modules/alpha/jfs-modules

@@ -0,0 +1 @@
+#include <jfs-modules>

debian/installer/alpha/modules/alpha/matroxfb-modules

@@ -0,0 +1,7 @@
+g450_pll
+matroxfb_DAC1064
+matroxfb_Ti3026
+matroxfb_accel
+matroxfb_base
+matroxfb_g450
+matroxfb_misc

debian/installer/alpha/modules/alpha/md-modules

@@ -0,0 +1,2 @@
+#include <md-modules>
+

debian/installer/alpha/modules/alpha/multipath-modules

@@ -0,0 +1 @@
+#include <multipath-modules>

debian/installer/alpha/modules/alpha/nbd-modules

@@ -0,0 +1 @@
+#include <nbd-modules>

debian/installer/alpha/modules/alpha/nic-extra-modules

@@ -0,0 +1,10 @@
+#include <nic-extra-modules>
+# These are in nic-modules in kernel-wedge but only in extra-modules for
+# alpha.
+3c59x
+e100
+natsemi
+ne2k-pci
+tg3
+winbond-840
+de2104x ? -

debian/installer/alpha/modules/alpha/nic-modules

@@ -0,0 +1,4 @@
+8139too
+de2104x
+tulip
+de4x5

debian/installer/alpha/modules/alpha/nic-shared-modules

@@ -0,0 +1,3 @@
+8390
+mii
+libphy

debian/installer/alpha/modules/alpha/nic-wireless-modules

@@ -0,0 +1 @@
+#include <nic-wireless-modules>

debian/installer/alpha/modules/alpha/parport-modules

@@ -0,0 +1,2 @@
+#include <parport-modules>
+

debian/installer/alpha/modules/alpha/plip-modules

@@ -0,0 +1,2 @@
+#include <plip-modules>
+

debian/installer/alpha/modules/alpha/ppp-modules

@@ -0,0 +1,2 @@
+#include <ppp-modules>
+

debian/installer/alpha/modules/alpha/reiserfs-modules

@@ -0,0 +1,2 @@
+#include <reiserfs-modules>
+

debian/installer/alpha/modules/alpha/rtc-modules

@@ -0,0 +1 @@
+#include <rtc-modules>

debian/installer/alpha/modules/alpha/sata-modules

@@ -0,0 +1 @@
+#include <sata-modules>

debian/installer/alpha/modules/alpha/scsi-common-modules

@@ -0,0 +1,2 @@
+#include <scsi-common-modules>
+

debian/installer/alpha/modules/alpha/scsi-core-modules

@@ -0,0 +1,2 @@
+#include <scsi-core-modules>
+scsi_transport_spi

debian/installer/alpha/modules/alpha/scsi-extra-modules

@@ -0,0 +1 @@
+#include <scsi-extra-modules>

debian/installer/alpha/modules/alpha/scsi-modules

@@ -0,0 +1,2 @@
+#include <scsi-modules>
+a100u2w

debian/installer/alpha/modules/alpha/squashfs-modules

@@ -0,0 +1 @@
+#include <squashfs-modules>

debian/installer/alpha/modules/alpha/srm-modules

@@ -0,0 +1 @@
+srm_env

debian/installer/alpha/modules/alpha/uinput-modules

@@ -0,0 +1 @@
+#include <uinput-modules>

debian/installer/alpha/modules/alpha/usb-modules

@@ -0,0 +1,2 @@
+#include <usb-modules>
+

debian/installer/alpha/modules/alpha/usb-serial-modules

@@ -0,0 +1 @@
+#include <usb-serial-modules>

debian/installer/alpha/modules/alpha/usb-storage-modules

@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+

debian/installer/alpha/modules/alpha/xfs-modules

@@ -0,0 +1,2 @@
+#include <xfs-modules>
+

debian/installer/alpha/modules/alpha/zlib-modules

@@ -0,0 +1 @@
+#include <zlib-modules>

debian/installer/alpha/package-list

@@ -0,0 +1,42 @@
+# This file is used to build up the control file. The kernel version and
+# "-di" are appended to the package names. Section can be left out. So can
+# architecture, which is derived from the files in the modules directory.
+# It overwrites specifications from /usr/share/kernel-wedge/package-list.
+#
+Package: kernel-image
+Provides: ext2-modules
+
+Package: srm-modules
+Depends: kernel-image
+Priority: standard
+Description: SRM environment driver
+ This package contains the SRM environment driver for the Alpha Linux
+ kernel.
+
+Package: fb-modules
+Depends: kernel-image, crc-modules, core-modules
+Priority: extra
+Description: Frame buffer support
+ This package contains Frame buffer drivers for the Linux kernel.
+
+Package: nic-shared-modules
+Depends: kernel-image, crc-modules, core-modules
+Priority: standard
+Description: Shared NIC drivers
+ This package contains NIC drivers needed by combinations of nic-modules,
+ nic-extra-modules, and nic-pcmcia-modules.
+
+Package: ext4-modules
+Depends: kernel-image, crc-modules, core-modules
+Priority: standard
+Description: EXT4 filesystem support
+ This package contains the EXT4 filesystem module for the Linux kernel.
+
+Package: jfs-modules
+Depends: kernel-image, crc-modules, core-modules
+
+Package: reiserfs-modules
+Depends: kernel-image, crc-modules, core-modules
+
+Package: nbd-modules
+Depends: kernel-image

debian/installer/amd64/TODO

@@ -0,0 +1,3 @@
+* The 2.6 kernel is missing a lot of modules, need to get a list of all
+  modules included in the udebs, and compare vs. the full module list and
+  add missing stuff.

debian/installer/amd64/kernel-versions

@@ -0,0 +1,2 @@
+# arch version flavour installedname suffix build-depends
+amd64  -       amd64   -             -      -

debian/installer/amd64/modules/amd64/acpi-modules

@@ -0,0 +1,2 @@
+#include <acpi-modules>
+

debian/installer/amd64/modules/amd64/ata-modules

@@ -0,0 +1,2 @@
+#include <ata-modules>
+

debian/installer/amd64/modules/amd64/btrfs-modules

@@ -0,0 +1 @@
+#include <btrfs-modules>

debian/installer/amd64/modules/amd64/cdrom-core-modules

@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+

debian/installer/amd64/modules/amd64/core-modules

@@ -0,0 +1,2 @@
+#include <core-modules>
+mbcache

debian/installer/amd64/modules/amd64/crc-modules

@@ -0,0 +1,2 @@
+#include <crc-modules>
+crc-itu-t

debian/installer/amd64/modules/amd64/crypto-dm-modules

@@ -0,0 +1 @@
+#include <crypto-dm-modules>

debian/installer/amd64/modules/amd64/crypto-modules

@@ -0,0 +1 @@
+#include <crypto-modules>

debian/installer/amd64/modules/amd64/efi-modules

@@ -0,0 +1 @@
+#include <efi-modules>

debian/installer/amd64/modules/amd64/event-modules

@@ -0,0 +1 @@
+#include <event-modules>

debian/installer/amd64/modules/amd64/ext2-modules

@@ -0,0 +1 @@
+#include <ext2-modules>

debian/installer/amd64/modules/amd64/ext3-modules

@@ -0,0 +1,2 @@
+#include <ext3-modules>
+

debian/installer/amd64/modules/amd64/ext4-modules

@@ -0,0 +1 @@
+#include <ext4-modules>

debian/installer/amd64/modules/amd64/fat-modules

@@ -0,0 +1,2 @@
+#include <fat-modules>
+

debian/installer/amd64/modules/amd64/fb-modules

@@ -0,0 +1,3 @@
+fbcon ?
+vesafb ?
+vga16fb

debian/installer/amd64/modules/amd64/firewire-core-modules

@@ -0,0 +1 @@
+#include <firewire-core-modules>

debian/installer/amd64/modules/amd64/floppy-modules

@@ -0,0 +1,2 @@
+#include <floppy-modules>
+

debian/installer/amd64/modules/amd64/i2c-modules

@@ -0,0 +1 @@
+#include <i2c-modules>

debian/installer/amd64/modules/amd64/ide-core-modules

@@ -0,0 +1,2 @@
+#include <ide-core-modules>
+

debian/installer/amd64/modules/amd64/ide-modules

@@ -0,0 +1 @@
+#include <ide-modules>

debian/installer/amd64/modules/amd64/input-modules

@@ -0,0 +1 @@
+#include <input-modules>

debian/installer/amd64/modules/amd64/irda-modules

@@ -0,0 +1,15 @@
+act200l-sir
+actisys-sir
+irda-usb
+irtty-sir
+litelink-sir
+ma600-sir
+mcp2120-sir
+old_belkin-sir
+tekram-sir
+vlsi_ir
+ircomm-tty
+ircomm
+irda
+irnet
+via-ircc ?

debian/installer/amd64/modules/amd64/isofs-modules

@@ -0,0 +1 @@
+#include <isofs-modules>

debian/installer/amd64/modules/amd64/jfs-modules

@@ -0,0 +1 @@
+#include <jfs-modules>

debian/installer/amd64/modules/amd64/loop-modules

@@ -0,0 +1,2 @@
+#include <loop-modules>
+

debian/installer/amd64/modules/amd64/md-modules

@@ -0,0 +1,2 @@
+#include <md-modules>
+

debian/installer/amd64/modules/amd64/mmc-core-modules

@@ -0,0 +1 @@
+#include <mmc-core-modules>

debian/installer/amd64/modules/amd64/mmc-modules

@@ -0,0 +1 @@
+#include <mmc-modules>

debian/installer/amd64/modules/amd64/mouse-modules

@@ -0,0 +1 @@
+#include <mouse-modules>

debian/installer/amd64/modules/amd64/multipath-modules

@@ -0,0 +1 @@
+#include <multipath-modules>

debian/installer/amd64/modules/amd64/nbd-modules

@@ -0,0 +1 @@
+#include <nbd-modules>

debian/installer/amd64/modules/amd64/nic-extra-modules

@@ -0,0 +1,2 @@
+#include <nic-extra-modules>
+eexpress -

debian/installer/amd64/modules/amd64/nic-modules

@@ -0,0 +1 @@
+#include <nic-modules>

debian/installer/amd64/modules/amd64/nic-pcmcia-modules

@@ -0,0 +1 @@
+#include <nic-pcmcia-modules>

debian/installer/amd64/modules/amd64/nic-shared-modules

@@ -0,0 +1,3 @@
+8390
+mii
+libphy

debian/installer/amd64/modules/amd64/nic-usb-modules

@@ -0,0 +1 @@
+#include <nic-usb-modules>

debian/installer/amd64/modules/amd64/nic-wireless-modules

@@ -0,0 +1 @@
+#include <nic-wireless-modules>

debian/installer/amd64/modules/amd64/ntfs-modules

@@ -0,0 +1 @@
+ntfs

debian/installer/amd64/modules/amd64/parport-modules

@@ -0,0 +1,2 @@
+#include <parport-modules>
+

debian/installer/amd64/modules/amd64/pata-modules

@@ -0,0 +1,2 @@
+#include <pata-modules>
+

debian/installer/amd64/modules/amd64/pcmcia-modules

@@ -0,0 +1 @@
+#include <pcmcia-modules>

debian/installer/amd64/modules/amd64/pcmcia-storage-modules

@@ -0,0 +1 @@
+#include <pcmcia-storage-modules>

debian/installer/amd64/modules/amd64/plip-modules

@@ -0,0 +1,2 @@
+#include <plip-modules>
+

debian/installer/amd64/modules/amd64/ppp-modules

@@ -0,0 +1,2 @@
+#include <ppp-modules>
+

debian/installer/amd64/modules/amd64/qnx4-modules

@@ -0,0 +1 @@
+#include <qnx4-modules>

debian/installer/amd64/modules/amd64/reiserfs-modules

@@ -0,0 +1,2 @@
+#include <reiserfs-modules>
+

debian/installer/amd64/modules/amd64/sata-modules

@@ -0,0 +1 @@
+#include <sata-modules>

debian/installer/amd64/modules/amd64/scsi-common-modules

@@ -0,0 +1 @@
+#include <scsi-common-modules>

debian/installer/amd64/modules/amd64/scsi-core-modules

@@ -0,0 +1 @@
+#include <scsi-core-modules>

debian/installer/amd64/modules/amd64/scsi-extra-modules

@@ -0,0 +1,4 @@
+#include <scsi-extra-modules>
+dpt_i2o -
+i2o_block
+i2o_scsi

debian/installer/amd64/modules/amd64/scsi-modules

@@ -0,0 +1 @@
+#include <scsi-modules>

debian/installer/amd64/modules/amd64/serial-modules

@@ -0,0 +1 @@
+#include <serial-modules>