diff --git a/debian/changelog b/debian/changelog index 4ee1975ae..930fcd1d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +linux (3.11-1~exp2) UNRELEASED; urgency=low + + * udeb: Update config to match previous kernel config changes: + - Remove ext{2,3}-modules + - Update description of ext4-modules and let it provide ext{2,3}-modules + - Remove aic7xxx_old, enc28j60 and imm from module lists + + -- Ben Hutchings Fri, 13 Sep 2013 04:37:21 +0100 + linux (3.11-1~exp1) experimental; urgency=low * New upstream release: http://kernelnewbies.org/Linux_3.11 diff --git a/debian/installer/amd64/modules/amd64/ext2-modules b/debian/installer/amd64/modules/amd64/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/amd64/modules/amd64/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/amd64/modules/amd64/ext3-modules b/debian/installer/amd64/modules/amd64/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/amd64/modules/amd64/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/armel/modules/armel-iop32x/ext2-modules b/debian/installer/armel/modules/armel-iop32x/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/armel/modules/armel-iop32x/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-iop32x/ext3-modules b/debian/installer/armel/modules/armel-iop32x/ext3-modules deleted file mode 100644 index bbdd7f4b7..000000000 --- a/debian/installer/armel/modules/armel-iop32x/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-kirkwood/ext2-modules b/debian/installer/armel/modules/armel-kirkwood/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/armel/modules/armel-kirkwood/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-kirkwood/ext3-modules b/debian/installer/armel/modules/armel-kirkwood/ext3-modules deleted file mode 100644 index bbdd7f4b7..000000000 --- a/debian/installer/armel/modules/armel-kirkwood/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-orion5x/ext2-modules b/debian/installer/armel/modules/armel-orion5x/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/armel/modules/armel-orion5x/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-orion5x/ext3-modules b/debian/installer/armel/modules/armel-orion5x/ext3-modules deleted file mode 100644 index bbdd7f4b7..000000000 --- a/debian/installer/armel/modules/armel-orion5x/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-versatile/ext2-modules b/debian/installer/armel/modules/armel-versatile/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/armel/modules/armel-versatile/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-versatile/ext3-modules b/debian/installer/armel/modules/armel-versatile/ext3-modules deleted file mode 100644 index bbdd7f4b7..000000000 --- a/debian/installer/armel/modules/armel-versatile/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-armmp/ext2-modules b/debian/installer/armhf/modules/armhf-armmp/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/armhf/modules/armhf-armmp/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-armmp/ext3-modules b/debian/installer/armhf/modules/armhf-armmp/ext3-modules deleted file mode 100644 index bbdd7f4b7..000000000 --- a/debian/installer/armhf/modules/armhf-armmp/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/ext2-modules b/debian/installer/armhf/modules/armhf-mx5/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/ext3-modules b/debian/installer/armhf/modules/armhf-mx5/ext3-modules deleted file mode 100644 index bbdd7f4b7..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/ext2-modules b/debian/installer/armhf/modules/armhf-vexpress/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/ext3-modules b/debian/installer/armhf/modules/armhf-vexpress/ext3-modules deleted file mode 100644 index bbdd7f4b7..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/hppa/modules/hppa/ext3-modules b/debian/installer/hppa/modules/hppa/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/hppa/modules/hppa/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/i386/modules/i386/ext2-modules b/debian/installer/i386/modules/i386/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/i386/modules/i386/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/i386/modules/i386/ext3-modules b/debian/installer/i386/modules/i386/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/i386/modules/i386/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/ext2-modules b/debian/installer/ia64/modules/ia64/ext2-modules deleted file mode 100644 index bbaebc8f1..000000000 --- a/debian/installer/ia64/modules/ia64/ext2-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/ext3-modules b/debian/installer/ia64/modules/ia64/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/ia64/modules/ia64/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/m68k/modules/m68k/ext2-modules b/debian/installer/m68k/modules/m68k/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/m68k/modules/m68k/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k/ext3-modules b/debian/installer/m68k/modules/m68k/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/m68k/modules/m68k/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/modules/ext2-modules b/debian/installer/modules/ext2-modules deleted file mode 100644 index 43d7af310..000000000 --- a/debian/installer/modules/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -ext2 diff --git a/debian/installer/modules/ext3-modules b/debian/installer/modules/ext3-modules deleted file mode 100644 index 1c285721e..000000000 --- a/debian/installer/modules/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -ext3 -jbd diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules index 8f46439a7..db1eaff23 100644 --- a/debian/installer/modules/nic-modules +++ b/debian/installer/modules/nic-modules @@ -30,7 +30,6 @@ dmfe e100 e1000 ? e1000e ? -enc28j60 enic ? epic100 et131x ? diff --git a/debian/installer/modules/scsi-extra-modules b/debian/installer/modules/scsi-extra-modules index 2d45395dc..cbbc14583 100644 --- a/debian/installer/modules/scsi-extra-modules +++ b/debian/installer/modules/scsi-extra-modules @@ -8,7 +8,6 @@ st 3w-xxxx aacraid aha152x ? -aic7xxx_old arcmsr ? bnx2fc ? cciss diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules index e2a44d023..a3332d152 100644 --- a/debian/installer/modules/scsi-modules +++ b/debian/installer/modules/scsi-modules @@ -6,7 +6,6 @@ atp870u ? dmx3191d fd_mcs ? g_NCR5380 ? -imm in2000 ? pas16 ? qla1280 ? diff --git a/debian/installer/package-list b/debian/installer/package-list index 5910052d9..c5f9db6cb 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -111,23 +111,13 @@ Priority: extra Description: BTRFS filesystem support This package contains the BTRFS filesystem module for the kernel. -Package: ext2-modules -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, core-modules -Priority: standard -Description: EXT3 filesystem support - This package contains the EXT3 filesystem module for the kernel. - Package: ext4-modules Depends: kernel-image, core-modules, crc-modules +Provides: ext2-modules, ext3-modules Priority: standard -Description: EXT4 filesystem support - This package contains the EXT4 filesystem module for the kernel. +Description: ext2/ext3/ext4 filesystem support + This package contains the ext4 filesystem module for the kernel, which + also supports ext2 and ext3. Package: isofs-modules Depends: kernel-image, nls-core-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext2-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext2-modules deleted file mode 100644 index b8cca99d8..000000000 --- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../powerpc/ext2-modules" diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext3-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext3-modules deleted file mode 100644 index 3f963c993..000000000 --- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../powerpc/ext3-modules" diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ext2-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/ext2-modules deleted file mode 100644 index b8cca99d8..000000000 --- a/debian/installer/powerpc/modules/powerpc-powerpc64/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../powerpc/ext2-modules" diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ext3-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/ext3-modules deleted file mode 100644 index 3f963c993..000000000 --- a/debian/installer/powerpc/modules/powerpc-powerpc64/ext3-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../powerpc/ext3-modules" diff --git a/debian/installer/powerpc/modules/powerpc/ext2-modules b/debian/installer/powerpc/modules/powerpc/ext2-modules deleted file mode 100644 index bbaebc8f1..000000000 --- a/debian/installer/powerpc/modules/powerpc/ext2-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/powerpc/modules/powerpc/ext3-modules b/debian/installer/powerpc/modules/powerpc/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/powerpc/modules/powerpc/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/s390x/modules/s390x/ext2-modules b/debian/installer/s390x/modules/s390x/ext2-modules deleted file mode 100644 index bbaebc8f1..000000000 --- a/debian/installer/s390x/modules/s390x/ext2-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/s390x/modules/s390x/ext3-modules b/debian/installer/s390x/modules/s390x/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/s390x/modules/s390x/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sh4/modules/sh4-sh7751r/ext2-modules b/debian/installer/sh4/modules/sh4-sh7751r/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/sh4/modules/sh4-sh7751r/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/ext2-modules b/debian/installer/sh4/modules/sh4-sh7785lcr/ext2-modules deleted file mode 100644 index c407140bf..000000000 --- a/debian/installer/sh4/modules/sh4-sh7785lcr/ext2-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc/modules/sparc/ext2-modules b/debian/installer/sparc/modules/sparc/ext2-modules deleted file mode 100644 index bbaebc8f1..000000000 --- a/debian/installer/sparc/modules/sparc/ext2-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc/modules/sparc/ext3-modules b/debian/installer/sparc/modules/sparc/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/sparc/modules/sparc/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc/modules/sparc/scsi-common-modules b/debian/installer/sparc/modules/sparc/scsi-common-modules index 2d8c1d95f..5163bfed7 100644 --- a/debian/installer/sparc/modules/sparc/scsi-common-modules +++ b/debian/installer/sparc/modules/sparc/scsi-common-modules @@ -1,7 +1,6 @@ sun_esp aic79xx aic7xxx -aic7xxx_old qlogicpti ? sym53c8xx mptsas