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
This commit is contained in:
Ben Hutchings
parent
555d263559
commit
ed776fb227
|
|
@ -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']
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
# arch version flavour installedname suffix build-depends
|
||||
alpha - alpha-generic - - -
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ata-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <btrfs-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <cdrom-core-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
crc32
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <crypto-dm-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <crypto-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ext3-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <ext4-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <fat-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
fbcon
|
||||
tgafb
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ide-core-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ide-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ipv6-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <isofs-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <jfs-modules>
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
g450_pll
|
||||
matroxfb_DAC1064
|
||||
matroxfb_Ti3026
|
||||
matroxfb_accel
|
||||
matroxfb_base
|
||||
matroxfb_g450
|
||||
matroxfb_misc
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <md-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <multipath-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <nbd-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 ? -
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
8139too
|
||||
de2104x
|
||||
tulip
|
||||
de4x5
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
8390
|
||||
mii
|
||||
libphy
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <nic-wireless-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <parport-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <plip-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ppp-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <reiserfs-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <rtc-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <sata-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <scsi-common-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <scsi-core-modules>
|
||||
scsi_transport_spi
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <scsi-extra-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <scsi-modules>
|
||||
a100u2w
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <squashfs-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
srm_env
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <uinput-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <usb-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <usb-serial-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <usb-storage-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <xfs-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <zlib-modules>
|
||||
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
# arch version flavour installedname suffix build-depends
|
||||
amd64 - amd64 - - -
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <acpi-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ata-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <btrfs-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <cdrom-core-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <core-modules>
|
||||
mbcache
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <crc-modules>
|
||||
crc-itu-t
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <crypto-dm-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <crypto-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <efi-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <event-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <ext2-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ext3-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <ext4-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <fat-modules>
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
fbcon ?
|
||||
vesafb ?
|
||||
vga16fb
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <firewire-core-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <floppy-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <i2c-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ide-core-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <ide-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <input-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 ?
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <isofs-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <jfs-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <loop-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <md-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <mmc-core-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <mmc-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <mouse-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <multipath-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <nbd-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <nic-extra-modules>
|
||||
eexpress -
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <nic-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <nic-pcmcia-modules>
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
8390
|
||||
mii
|
||||
libphy
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <nic-usb-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <nic-wireless-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
ntfs
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <parport-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <pata-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <pcmcia-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <pcmcia-storage-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <plip-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ppp-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <qnx4-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <reiserfs-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <sata-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <scsi-common-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <scsi-core-modules>
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#include <scsi-extra-modules>
|
||||
dpt_i2o -
|
||||
i2o_block
|
||||
i2o_scsi
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <scsi-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <serial-modules>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue