From 081ba19db9d87cb2e64e3fb4dce431071763fffa Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 18 Aug 2015 11:38:30 +0200 Subject: [PATCH] [mips*] Build ext4 as module. Add core-modules and ext4-modules udeb. Fixes FTBFS. --- debian/changelog | 4 ++++ debian/config/kernelarch-mips/config | 5 ----- debian/installer/mips/modules/mips-4kc-malta/core-modules | 1 + debian/installer/mips/modules/mips-4kc-malta/ext4-modules | 1 + debian/installer/mips/modules/mips-octeon/core-modules | 1 + debian/installer/mips/modules/mips-octeon/ext4-modules | 1 + .../installer/mips/modules/mips-sb1-bcm91250a/core-modules | 1 + .../installer/mips/modules/mips-sb1-bcm91250a/ext4-modules | 1 + debian/installer/mips/modules/mips/core-modules | 1 + debian/installer/mips/modules/mips/ext4-modules | 1 + debian/installer/mips/package-list | 6 +++--- debian/installer/mips64/package-list | 2 +- debian/installer/mips64el/package-list | 2 +- .../mipsel/modules/mipsel-loongson-2e/core-modules | 1 + .../mipsel/modules/mipsel-loongson-2e/ext4-modules | 1 + .../mipsel/modules/mipsel-loongson-2f/core-modules | 1 + .../mipsel/modules/mipsel-loongson-2f/ext4-modules | 1 + .../installer/mipsel/modules/mipsel-loongson-3/core-modules | 1 + .../installer/mipsel/modules/mipsel-loongson-3/ext4-modules | 1 + debian/installer/mipsel/package-list | 2 +- 20 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 debian/installer/mips/modules/mips-4kc-malta/core-modules create mode 100644 debian/installer/mips/modules/mips-4kc-malta/ext4-modules create mode 100644 debian/installer/mips/modules/mips-octeon/core-modules create mode 100644 debian/installer/mips/modules/mips-octeon/ext4-modules create mode 100644 debian/installer/mips/modules/mips-sb1-bcm91250a/core-modules create mode 100644 debian/installer/mips/modules/mips-sb1-bcm91250a/ext4-modules create mode 100644 debian/installer/mips/modules/mips/core-modules create mode 100644 debian/installer/mips/modules/mips/ext4-modules create mode 100644 debian/installer/mipsel/modules/mipsel-loongson-2e/core-modules create mode 100644 debian/installer/mipsel/modules/mipsel-loongson-2e/ext4-modules create mode 100644 debian/installer/mipsel/modules/mipsel-loongson-2f/core-modules create mode 100644 debian/installer/mipsel/modules/mipsel-loongson-2f/ext4-modules create mode 100644 debian/installer/mipsel/modules/mipsel-loongson-3/core-modules create mode 100644 debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules diff --git a/debian/changelog b/debian/changelog index 6b56cb5da..d1dfd1766 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ linux (4.2~rc7-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate + [ Aurelien Jarno ] + * [mips*] Build ext4 as module. Add core-modules and ext4-modules udeb. + Fixes FTBFS. + -- Ben Hutchings Mon, 17 Aug 2015 10:28:46 +0200 linux (4.2~rc6-1~exp1) experimental; urgency=medium diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config index 17c1f56e9..5372e403a 100644 --- a/debian/config/kernelarch-mips/config +++ b/debian/config/kernelarch-mips/config @@ -26,11 +26,6 @@ CONFIG_BLK_DEV_SD=y ## # CONFIG_VGA_CONSOLE is not set -## -## file: fs/ext4/Kconfig -## -CONFIG_EXT4_FS=y - ## ## file: init/Kconfig ## diff --git a/debian/installer/mips/modules/mips-4kc-malta/core-modules b/debian/installer/mips/modules/mips-4kc-malta/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/ext4-modules b/debian/installer/mips/modules/mips-4kc-malta/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/core-modules b/debian/installer/mips/modules/mips-octeon/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/ext4-modules b/debian/installer/mips/modules/mips-octeon/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/core-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/ext4-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips/core-modules b/debian/installer/mips/modules/mips/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/mips/modules/mips/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips/ext4-modules b/debian/installer/mips/modules/mips/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/mips/modules/mips/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/package-list b/debian/installer/mips/package-list index 18d3d8620..6e25f0609 100644 --- a/debian/installer/mips/package-list +++ b/debian/installer/mips/package-list @@ -4,6 +4,6 @@ # It overwrites specifications from /usr/share/kernel-wedge/package-list. # Package: kernel-image -Provides: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules -Provides_r4k-ip22: ext2-modules, ext3-modules, ext4-modules, rtc-modules -Provides_r5k-ip32: ext2-modules, ext3-modules, ext4-modules, rtc-modules +Provides: ata-modules, ext2-modules, ext3-modules, rtc-modules +Provides_r4k-ip22: rtc-modules +Provides_r5k-ip32: rtc-modules diff --git a/debian/installer/mips64/package-list b/debian/installer/mips64/package-list index c94fcfd67..193faf10e 100644 --- a/debian/installer/mips64/package-list +++ b/debian/installer/mips64/package-list @@ -4,4 +4,4 @@ # It overwrites specifications from /usr/share/kernel-wedge/package-list. # Package: kernel-image -Provides: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules +Provides: ata-modules, rtc-modules diff --git a/debian/installer/mips64el/package-list b/debian/installer/mips64el/package-list index c94fcfd67..193faf10e 100644 --- a/debian/installer/mips64el/package-list +++ b/debian/installer/mips64el/package-list @@ -4,4 +4,4 @@ # It overwrites specifications from /usr/share/kernel-wedge/package-list. # Package: kernel-image -Provides: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules +Provides: ata-modules, rtc-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/core-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2e/ext4-modules b/debian/installer/mipsel/modules/mipsel-loongson-2e/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/core-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/ext4-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/core-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/package-list b/debian/installer/mipsel/package-list index c94fcfd67..193faf10e 100644 --- a/debian/installer/mipsel/package-list +++ b/debian/installer/mipsel/package-list @@ -4,4 +4,4 @@ # It overwrites specifications from /usr/share/kernel-wedge/package-list. # Package: kernel-image -Provides: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules +Provides: ata-modules, rtc-modules