diff --git a/debian/changelog b/debian/changelog index 6a1bde4db..0e4811c2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,17 @@ linux (3.2.21-2) UNRELEASED; urgency=low * tracing/mm: Move include of trace/events/kmem.h out of header into slab.c (fixes FTBFS on sparc) * [i386] Disable incomplete lguest support + * udeb: Add missing dependencies for various modules (see #678587) + - [armel/kirkwood] fb-modules depends on kernel-image + - [ia64] nic-usb-modules depends on kernel-image, nic-shared-modules, + usb-modules + - [ia64] sata-modules depends on kernel-image, scsi-core-modules + - [ia64] scsi-modules depends on scsi-core-modules + - [ia64,powerpc,ppc64] pcmcia-modules depends on kernel-image + - [powerpc,ppc64] nic-pcmcia-modules depends on kernel-image, + nic-shared-modules, pcmcia-modules + - [powerpc,ppc64,x86] scsi-modules depends on ata-modules + - [x86] nic-extra-modules depends on i2c-modules -- Ben Hutchings Sat, 23 Jun 2012 20:19:15 +0100 diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list index 9076b8110..96cd11954 100644 --- a/debian/installer/amd64/package-list +++ b/debian/installer/amd64/package-list @@ -17,10 +17,7 @@ Package: nic-modules Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules Package: scsi-modules -Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules - -Package: nic-extra-modules -Depends: kernel-image, nic-shared-modules, core-modules, crc-modules +Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules Package: pcmcia-modules Depends: kernel-image, core-modules diff --git a/debian/installer/armel/package-list b/debian/installer/armel/package-list index a4aaeed10..3f3d9fd06 100644 --- a/debian/installer/armel/package-list +++ b/debian/installer/armel/package-list @@ -22,7 +22,7 @@ Description: Beeper support This package contains beeper drivers for the kernel. Package: fb-modules -Depends: usb-modules, nls-core-modules +Depends: kernel-image, usb-modules, nls-core-modules Package: pata-modules Depends: kernel-image, ata-modules diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list index f6460dfd1..6379be4ce 100644 --- a/debian/installer/i386/package-list +++ b/debian/installer/i386/package-list @@ -20,10 +20,7 @@ Package: nic-modules Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules Package: scsi-modules -Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules - -Package: nic-extra-modules -Depends: kernel-image, nic-shared-modules, core-modules, crc-modules +Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules Package: pcmcia-modules Depends: kernel-image, core-modules diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list index 3131434fd..c0591794a 100644 --- a/debian/installer/ia64/package-list +++ b/debian/installer/ia64/package-list @@ -12,17 +12,8 @@ Depends: kernel-image, ide-core-modules, sn-modules Package: nic-modules Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules, crc-modules -Package: nic-usb-modules -Depends: core-modules - Package: pcmcia-modules -Depends: core-modules - -Package: sata-modules -Depends: ata-modules - -Package: scsi-modules -Depends: kernel-image, ata-modules, parport-modules, cdrom-core-modules, core-modules +Depends: kernel-image, core-modules Package: serial-modules Depends: kernel-image, pcmcia-modules, sn-modules diff --git a/debian/installer/powerpc/package-list b/debian/installer/powerpc/package-list index a5e76c764..c112f5165 100644 --- a/debian/installer/powerpc/package-list +++ b/debian/installer/powerpc/package-list @@ -16,13 +16,13 @@ Package: pata-modules Depends: kernel-image, ata-modules, core-modules Package: scsi-modules -Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules +Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules Package: pcmcia-modules -Depends: core-modules +Depends: kernel-image, core-modules Package: nic-pcmcia-modules -Depends: nic-modules, nic-wireless-modules, core-modules +Depends: kernel-image, nic-modules, nic-shared-modules, nic-wireless-modules, pcmcia-modules, core-modules Package: hypervisor-modules Depends: kernel-image diff --git a/debian/installer/ppc64/package-list b/debian/installer/ppc64/package-list index a5e76c764..c112f5165 100644 --- a/debian/installer/ppc64/package-list +++ b/debian/installer/ppc64/package-list @@ -16,13 +16,13 @@ Package: pata-modules Depends: kernel-image, ata-modules, core-modules Package: scsi-modules -Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules +Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules Package: pcmcia-modules -Depends: core-modules +Depends: kernel-image, core-modules Package: nic-pcmcia-modules -Depends: nic-modules, nic-wireless-modules, core-modules +Depends: kernel-image, nic-modules, nic-shared-modules, nic-wireless-modules, pcmcia-modules, core-modules Package: hypervisor-modules Depends: kernel-image