diff --git a/debian/changelog b/debian/changelog index 0d8953480..1130e7dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -113,6 +113,7 @@ linux (3.8.11-1) UNRELEASED; urgency=high on it - Make xfs-modules depends on crc-modules - Move pps_core and ptp to nic-common-modules or nic-modules as appropriate + * udeb: Merge redundant configuration for ext{2,3} dependency on mbcache -- Ben Hutchings Sat, 04 May 2013 03:45:10 +0100 diff --git a/debian/installer/amd64/modules/amd64/core-modules b/debian/installer/amd64/modules/amd64/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/amd64/modules/amd64/core-modules +++ b/debian/installer/amd64/modules/amd64/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list index 96cd11954..fd555f10c 100644 --- a/debian/installer/amd64/package-list +++ b/debian/installer/amd64/package-list @@ -4,12 +4,6 @@ # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - Package: fat-modules Priority: standard diff --git a/debian/installer/armel/modules/armel-iop32x/core-modules b/debian/installer/armel/modules/armel-iop32x/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/armel/modules/armel-iop32x/core-modules +++ b/debian/installer/armel/modules/armel-iop32x/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/armel/modules/armel-kirkwood/core-modules b/debian/installer/armel/modules/armel-kirkwood/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/armel/modules/armel-kirkwood/core-modules +++ b/debian/installer/armel/modules/armel-kirkwood/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/armel/modules/armel-orion5x/core-modules b/debian/installer/armel/modules/armel-orion5x/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/armel/modules/armel-orion5x/core-modules +++ b/debian/installer/armel/modules/armel-orion5x/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/armel/modules/armel-versatile/core-modules b/debian/installer/armel/modules/armel-versatile/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/armel/modules/armel-versatile/core-modules +++ b/debian/installer/armel/modules/armel-versatile/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/armel/package-list b/debian/installer/armel/package-list index 3f3d9fd06..e4b3748a5 100644 --- a/debian/installer/armel/package-list +++ b/debian/installer/armel/package-list @@ -9,12 +9,6 @@ Provides_kirkwood: rtc-modules, jffs2-modules, zlib-modules Provides_orion5x: rtc-modules Provides_versatile: rtc-modules -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - Package: beeper-modules Depends: event-modules Priority: extra diff --git a/debian/installer/armhf/modules/armhf-mx5/core-modules b/debian/installer/armhf/modules/armhf-mx5/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/armhf/modules/armhf-mx5/core-modules +++ b/debian/installer/armhf/modules/armhf-mx5/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/armhf/modules/armhf-vexpress/core-modules b/debian/installer/armhf/modules/armhf-vexpress/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/armhf/modules/armhf-vexpress/core-modules +++ b/debian/installer/armhf/modules/armhf-vexpress/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/armhf/package-list b/debian/installer/armhf/package-list index 4bc3dc99b..452b151ac 100644 --- a/debian/installer/armhf/package-list +++ b/debian/installer/armhf/package-list @@ -7,12 +7,6 @@ Package: kernel-image Provides_mx5: rtc-modules Provides_vexpress: rtc-modules -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - # Package: beeper-modules # Depends: event-modules # Priority: extra diff --git a/debian/installer/i386/modules/i386/core-modules b/debian/installer/i386/modules/i386/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/i386/modules/i386/core-modules +++ b/debian/installer/i386/modules/i386/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list index 6379be4ce..83bf36370 100644 --- a/debian/installer/i386/package-list +++ b/debian/installer/i386/package-list @@ -7,12 +7,6 @@ Package: kernel-image Provides: rtc-modules -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - Package: fat-modules Priority: standard diff --git a/debian/installer/ia64/modules/ia64/core-modules b/debian/installer/ia64/modules/ia64/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/ia64/modules/ia64/core-modules +++ b/debian/installer/ia64/modules/ia64/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list index 84637be08..122b50d05 100644 --- a/debian/installer/ia64/package-list +++ b/debian/installer/ia64/package-list @@ -24,12 +24,6 @@ Priority: extra Description: SN modules This package contains SN modules for Altix systems -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - Package: nbd-modules Depends: kernel-image diff --git a/debian/installer/modules/core-modules b/debian/installer/modules/core-modules index d06c2be69..cd5cdfce8 100644 --- a/debian/installer/modules/core-modules +++ b/debian/installer/modules/core-modules @@ -1,2 +1,3 @@ bitrev ? led-class ? +mbcache diff --git a/debian/installer/package-list b/debian/installer/package-list index 957deeb49..5844b49e1 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -140,13 +140,13 @@ Description: BTRFS filesystem support This package contains the BTRFS filesystem module for the kernel. Package: ext2-modules -Depends: kernel-image +Depends: kernel-image, core-modules Priority: standard Description: EXT2 filesystem support This package contains the EXT2 filesystem module for the kernel. Package: ext3-modules -Depends: kernel-image +Depends: kernel-image, core-modules Priority: standard Description: EXT3 filesystem support This package contains the EXT3 filesystem module for the kernel. diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules +++ b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/powerpc/modules/powerpc/core-modules b/debian/installer/powerpc/modules/powerpc/core-modules index d90987bf4..73e336a32 100644 --- a/debian/installer/powerpc/modules/powerpc/core-modules +++ b/debian/installer/powerpc/modules/powerpc/core-modules @@ -1,3 +1,2 @@ #include -mbcache bestcomm-core ? diff --git a/debian/installer/powerpc/package-list b/debian/installer/powerpc/package-list index 03b0f6442..b2d4246b2 100644 --- a/debian/installer/powerpc/package-list +++ b/debian/installer/powerpc/package-list @@ -3,11 +3,6 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules Package: pata-modules Depends: kernel-image, ata-modules, core-modules diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules index 21826c6d0..f05d06298 100644 --- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules +++ b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules @@ -1,2 +1 @@ #include -mbcache diff --git a/debian/installer/powerpcspe/modules/powerpcspe/core-modules b/debian/installer/powerpcspe/modules/powerpcspe/core-modules index d90987bf4..73e336a32 100644 --- a/debian/installer/powerpcspe/modules/powerpcspe/core-modules +++ b/debian/installer/powerpcspe/modules/powerpcspe/core-modules @@ -1,3 +1,2 @@ #include -mbcache bestcomm-core ? diff --git a/debian/installer/powerpcspe/package-list b/debian/installer/powerpcspe/package-list index c121e2f80..4b8f8e6c4 100644 --- a/debian/installer/powerpcspe/package-list +++ b/debian/installer/powerpcspe/package-list @@ -3,11 +3,6 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules Package: pata-modules Depends: kernel-image, ata-modules, core-modules diff --git a/debian/installer/ppc64/modules/ppc64/core-modules b/debian/installer/ppc64/modules/ppc64/core-modules index d90987bf4..73e336a32 100644 --- a/debian/installer/ppc64/modules/ppc64/core-modules +++ b/debian/installer/ppc64/modules/ppc64/core-modules @@ -1,3 +1,2 @@ #include -mbcache bestcomm-core ? diff --git a/debian/installer/ppc64/package-list b/debian/installer/ppc64/package-list index 03b0f6442..b2d4246b2 100644 --- a/debian/installer/ppc64/package-list +++ b/debian/installer/ppc64/package-list @@ -3,11 +3,6 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules Package: pata-modules Depends: kernel-image, ata-modules, core-modules diff --git a/debian/installer/s390/modules/s390x/core-modules b/debian/installer/s390/modules/s390x/core-modules index 433f0a5cb..892a30fa4 100644 --- a/debian/installer/s390/modules/s390x/core-modules +++ b/debian/installer/s390/modules/s390x/core-modules @@ -1,2 +1,2 @@ +#include vmcp ? -mbcache diff --git a/debian/installer/s390/package-list b/debian/installer/s390/package-list index e480fba15..3153a7178 100644 --- a/debian/installer/s390/package-list +++ b/debian/installer/s390/package-list @@ -19,11 +19,5 @@ Description: optional dasd DIAG support not loaded by default as the installer does not actually support this. It can however be useful to have available in rescue situations. -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - Package: nbd-modules Depends: kernel-image diff --git a/debian/installer/s390x/modules/s390x/core-modules b/debian/installer/s390x/modules/s390x/core-modules index 433f0a5cb..892a30fa4 100644 --- a/debian/installer/s390x/modules/s390x/core-modules +++ b/debian/installer/s390x/modules/s390x/core-modules @@ -1,2 +1,2 @@ +#include vmcp ? -mbcache diff --git a/debian/installer/s390x/package-list b/debian/installer/s390x/package-list index e480fba15..3153a7178 100644 --- a/debian/installer/s390x/package-list +++ b/debian/installer/s390x/package-list @@ -19,11 +19,5 @@ Description: optional dasd DIAG support not loaded by default as the installer does not actually support this. It can however be useful to have available in rescue situations. -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - Package: nbd-modules Depends: kernel-image diff --git a/debian/installer/sh4/package-list b/debian/installer/sh4/package-list index 8e9a0538c..bdcefca5b 100644 --- a/debian/installer/sh4/package-list +++ b/debian/installer/sh4/package-list @@ -6,9 +6,6 @@ Package: kernel-image Provides: event-modules, ext3-modules, fb-modules, input-modules, mouse-modules, nic-shared-modules, rtc-modules, uinput-modules, usb-modules -Package: ext2-modules -Depends: kernel-image, core-modules - Package: nic-modules Depends: kernel-image, core-modules, firewire-core-modules diff --git a/debian/installer/sparc/modules/sparc/core-modules b/debian/installer/sparc/modules/sparc/core-modules index ec6342bf5..f05d06298 100644 --- a/debian/installer/sparc/modules/sparc/core-modules +++ b/debian/installer/sparc/modules/sparc/core-modules @@ -1 +1 @@ -mbcache +#include diff --git a/debian/installer/sparc/package-list b/debian/installer/sparc/package-list index a682580ac..856217570 100644 --- a/debian/installer/sparc/package-list +++ b/debian/installer/sparc/package-list @@ -5,12 +5,6 @@ # Package: kernel-image -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - Package: nic-modules Priority: standard Description: Network card modules for Sparc kernels diff --git a/debian/installer/sparc64/modules/sparc64/core-modules b/debian/installer/sparc64/modules/sparc64/core-modules index ec6342bf5..f05d06298 100644 --- a/debian/installer/sparc64/modules/sparc64/core-modules +++ b/debian/installer/sparc64/modules/sparc64/core-modules @@ -1 +1 @@ -mbcache +#include diff --git a/debian/installer/sparc64/package-list b/debian/installer/sparc64/package-list index a682580ac..856217570 100644 --- a/debian/installer/sparc64/package-list +++ b/debian/installer/sparc64/package-list @@ -5,12 +5,6 @@ # Package: kernel-image -Package: ext2-modules -Depends: kernel-image, core-modules - -Package: ext3-modules -Depends: kernel-image, core-modules - Package: nic-modules Priority: standard Description: Network card modules for Sparc kernels