Today I have done the initial work to prepare the switch to 2.6.25 for D-I. Note that I have done no checks at all for new/removed/changed modules, not even for i386/amd64! I'll leave that to others. What I have done is only the structural changes required to build using basically the current definitions, which was somewhat complex this time. All architectures build now (with updated version of kernel-wedge). The work is based on 2.6.25-3, but -4 was uploaded today. Also note that the first upload of l-m-e seems to be having troubles on some arches. The first two changes below are minor: modules made optional because they are no longer available. The third change is a simple module rename. Changes 4 and 5 are the most invasive. I've had to create several new module udebs to cope with new interdependencies and to avoid unwanted dependencies. The first of these solves the problem earlier reported by Martin Michlmayr and affects partman-crypto. Changes 6 and 7 are minor arch specific fixups needed after change 5. Change 8 is in the installer build system and also needed after change 5. Please comment based on my git log entries below. If anyone wants to review the actual patches before they are committed I can provide them. If there are no comments I'll commit in about 2 days. Cheers, FJP Overview of changes =================== 1. scsi-modules: module atp870u is no longer available --- 2. ide-modules: generic module no longer available (powerpc only) --- 3. crypto-core-modules: blkcipher has been renamed to crypto_blkcipher --- 4. Move dm-crypt to a separate udeb The dm-crypt module is moved from md-modules to crypto-dm-modules to avoid having md-modules depend on crypto-core-modules. With this change all dependencies on crypto-core-modules are defined in kernel-wedge. Exception is m68k which did not have md-modules to begin with. !! Consequence of this change is that partman-crypto will have to start !! loading crypto-dm-modules when needed. --- 5. Changes because of separate nls_base modules Most architectures (except m68k and some arm, mips and mipsel subarchs) now have a separate nls_base module on which all nls_* modules and some file system modules (isofs, fat, ntfs, jfs, hfs) depend. * move the isofs module from ide-modules to a separate udeb * let cdrom-core-modules depend on the new isofs-modules * this leaves ide-modules empty for m68k, so remove it * add an nls-core-modules udeb !! Consequence of this change is that hd-media targets will need to include !! the isofs-modules udeb in their pkg-lists. --- 6. powerpc fixup: move nls_utf8 from core-modules to hfs-modules --- 7. m68k fixup: mac does not have the nls_base module Create a separate modules definition directory for m68k-mac as that subarch does not need nls-core-modules while amiga and atari do. --- 8. Include isofs-modules in hd-media images Now that the isofs module has been split out of the ide-modules udeb (kernels >=2.6.25), it needs to be included explicitly.
Attachment:
signature.asc
Description: This is a digitally signed message part.