[linux] 01/02: [mips*] Build ext4 as module. Add core-modules and ext4-modules udeb. Fixes FTBFS.

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Thu Aug 20 22:09:18 UTC 2015 

This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch master
in repository linux.

commit 081ba19db9d87cb2e64e3fb4dce431071763fffa
Author: Aurelien Jarno <aurelien at aurel32.net>
Date:   Tue Aug 18 11:38:30 2015 +0200

    [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 +
 debian/installer/mips/modules/mips-sb1-bcm91250a/core-modules   | 1 +
 debian/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 +-
 debian/installer/mipsel/modules/mipsel-loongson-2e/core-modules | 1 +
 debian/installer/mipsel/modules/mipsel-loongson-2e/ext4-modules | 1 +
 debian/installer/mipsel/modules/mipsel-loongson-2f/core-modules | 1 +
 debian/installer/mipsel/modules/mipsel-loongson-2f/ext4-modules | 1 +
 debian/installer/mipsel/modules/mipsel-loongson-3/core-modules  | 1 +
 debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules  | 1 +
 debian/installer/mipsel/package-list                            | 2 +-
 20 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b56cb5..d1dfd17 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 <ben at decadent.org.uk>  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 17c1f56..5372e40 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -27,11 +27,6 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_VGA_CONSOLE is not set
 
 ##
-## file: fs/ext4/Kconfig
-##
-CONFIG_EXT4_FS=y
-
-##
 ## file: init/Kconfig
 ##
 CONFIG_SGETMASK_SYSCALL=y
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 0000000..f05d062
--- /dev/null
+++ b/debian/installer/mips/modules/mips-4kc-malta/core-modules
@@ -0,0 +1 @@
+#include <core-modules>
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 0000000..394c577
--- /dev/null
+++ b/debian/installer/mips/modules/mips-4kc-malta/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
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 0000000..f05d062
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/core-modules
@@ -0,0 +1 @@
+#include <core-modules>
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 0000000..394c577
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
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 0000000..f05d062
--- /dev/null
+++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/core-modules
@@ -0,0 +1 @@
+#include <core-modules>
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 0000000..394c577
--- /dev/null
+++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/mips/modules/mips/core-modules b/debian/installer/mips/modules/mips/core-modules
new file mode 100644
index 0000000..f05d062
--- /dev/null
+++ b/debian/installer/mips/modules/mips/core-modules
@@ -0,0 +1 @@
+#include <core-modules>
diff --git a/debian/installer/mips/modules/mips/ext4-modules b/debian/installer/mips/modules/mips/ext4-modules
new file mode 100644
index 0000000..394c577
--- /dev/null
+++ b/debian/installer/mips/modules/mips/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/mips/package-list b/debian/installer/mips/package-list
index 18d3d86..6e25f06 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 c94fcfd..193faf1 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 c94fcfd..193faf1 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 0000000..f05d062
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/core-modules
@@ -0,0 +1 @@
+#include <core-modules>
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 0000000..394c577
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-loongson-2e/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
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 0000000..f05d062
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/core-modules
@@ -0,0 +1 @@
+#include <core-modules>
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 0000000..394c577
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
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 0000000..f05d062
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-loongson-3/core-modules
@@ -0,0 +1 @@
+#include <core-modules>
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 0000000..394c577
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/mipsel/package-list b/debian/installer/mipsel/package-list
index c94fcfd..193faf1 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git

More information about the Kernel-svn-changes mailing list