aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2012-09-16 03:35:17 +0000
committerBen Hutchings <benh@debian.org>2012-09-16 03:35:17 +0000
commit1418cb6f608edce6720801786483abc5f3068cda (patch)
treefdb4f17d13bc64696d501cd6653ecb5d9fbde0b4
parent4feefc75c716debe6a60ad2ce4310fe68796e235 (diff)
downloadkernel_replicant_linux-1418cb6f608edce6720801786483abc5f3068cda.tar.gz
kernel_replicant_linux-1418cb6f608edce6720801786483abc5f3068cda.tar.bz2
kernel_replicant_linux-1418cb6f608edce6720801786483abc5f3068cda.zip
udeb: Add fuse-modules to support os-prober (see #684265)
svn path=/dists/sid/linux/; revision=19382
-rw-r--r--debian/changelog1
-rw-r--r--debian/installer/amd64/modules/amd64/fuse-modules1
-rw-r--r--debian/installer/armel/modules/armel-iop32x/fuse-modules1
-rw-r--r--debian/installer/armel/modules/armel-kirkwood/fuse-modules1
-rw-r--r--debian/installer/armel/modules/armel-orion5x/fuse-modules1
-rw-r--r--debian/installer/armel/modules/armel-versatile/fuse-modules1
-rw-r--r--debian/installer/armhf/modules/armhf-mx5/fuse-modules1
-rw-r--r--debian/installer/hppa/modules/hppa/fuse-modules1
-rw-r--r--debian/installer/i386/modules/i386/fuse-modules1
-rw-r--r--debian/installer/ia64/modules/ia64/fuse-modules1
-rw-r--r--debian/installer/m68k/modules/m68k-mac/fuse-modules1
-rw-r--r--debian/installer/m68k/modules/m68k/fuse-modules1
-rw-r--r--debian/installer/mips/modules/mips-4kc-malta/fuse-modules1
-rw-r--r--debian/installer/mips/modules/mips-sb1-bcm91250a/fuse-modules1
-rw-r--r--debian/installer/mips/modules/mips/fuse-modules1
-rw-r--r--debian/installer/mipsel/modules/mipsel-4kc-malta/fuse-modules1
-rw-r--r--debian/installer/mipsel/modules/mipsel-loongson-2f/fuse-modules1
-rw-r--r--debian/installer/mipsel/modules/mipsel-r5k-cobalt/fuse-modules1
-rw-r--r--debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/fuse-modules1
-rw-r--r--debian/installer/modules/fuse-modules1
-rw-r--r--debian/installer/package-list6
-rw-r--r--debian/installer/powerpc/modules/powerpc-powerpc-miboot/fuse-modules1
-rw-r--r--debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules1
-rw-r--r--debian/installer/powerpc/modules/powerpc/fuse-modules1
-rw-r--r--debian/installer/ppc64/modules/ppc64/fuse-modules1
-rw-r--r--debian/installer/s390/modules/s390x-tape/fuse-modules1
-rw-r--r--debian/installer/s390/modules/s390x/fuse-modules1
-rw-r--r--debian/installer/s390x/modules/s390x/fuse-modules1
-rw-r--r--debian/installer/sh4/modules/sh4-sh7751r/fuse-modules1
-rw-r--r--debian/installer/sh4/modules/sh4-sh7785lcr/fuse-modules1
-rw-r--r--debian/installer/sparc/modules/sparc/fuse-modules1
-rw-r--r--debian/installer/sparc64/modules/sparc64/fuse-modules1
32 files changed, 37 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 76317c647141..0d0c0f1bbd98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,6 +147,7 @@ linux (3.2.29-1) UNRELEASED; urgency=low
* netlink: fix possible spoofing from non-root processes
* net: ipv4: ipmr_expire_timer causes crash when removing net namespace
* [i386] i810fb: Enable FB_I810_GTF, FB_I810_I2C (Closes: #687644)
+ * udeb: Add fuse-modules to support os-prober (see #684265)
[ Bastian Blank ]
* Make xen-linux-system meta-packages depend on xen-system. This allows
diff --git a/debian/installer/amd64/modules/amd64/fuse-modules b/debian/installer/amd64/modules/amd64/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/amd64/modules/amd64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/armel/modules/armel-iop32x/fuse-modules b/debian/installer/armel/modules/armel-iop32x/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/armel/modules/armel-iop32x/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/armel/modules/armel-kirkwood/fuse-modules b/debian/installer/armel/modules/armel-kirkwood/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/armel/modules/armel-kirkwood/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/armel/modules/armel-orion5x/fuse-modules b/debian/installer/armel/modules/armel-orion5x/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/armel/modules/armel-orion5x/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/armel/modules/armel-versatile/fuse-modules b/debian/installer/armel/modules/armel-versatile/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/armel/modules/armel-versatile/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/armhf/modules/armhf-mx5/fuse-modules b/debian/installer/armhf/modules/armhf-mx5/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-mx5/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/hppa/modules/hppa/fuse-modules b/debian/installer/hppa/modules/hppa/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/i386/modules/i386/fuse-modules b/debian/installer/i386/modules/i386/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/i386/modules/i386/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/ia64/modules/ia64/fuse-modules b/debian/installer/ia64/modules/ia64/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/ia64/modules/ia64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/m68k/modules/m68k-mac/fuse-modules b/debian/installer/m68k/modules/m68k-mac/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/m68k/modules/m68k-mac/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/m68k/modules/m68k/fuse-modules b/debian/installer/m68k/modules/m68k/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/m68k/modules/m68k/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/mips/modules/mips-4kc-malta/fuse-modules b/debian/installer/mips/modules/mips-4kc-malta/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/mips/modules/mips-4kc-malta/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/fuse-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/mips/modules/mips/fuse-modules b/debian/installer/mips/modules/mips/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/mips/modules/mips/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/mipsel/modules/mipsel-4kc-malta/fuse-modules b/debian/installer/mipsel/modules/mipsel-4kc-malta/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-4kc-malta/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/fuse-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/mipsel/modules/mipsel-r5k-cobalt/fuse-modules b/debian/installer/mipsel/modules/mipsel-r5k-cobalt/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-r5k-cobalt/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/fuse-modules b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/fuse-modules b/debian/installer/modules/fuse-modules
new file mode 100644
index 000000000000..a517c488f349
--- /dev/null
+++ b/debian/installer/modules/fuse-modules
@@ -0,0 +1 @@
+fuse
diff --git a/debian/installer/package-list b/debian/installer/package-list
index c8cdc688aff8..3052b84e9f65 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -460,3 +460,9 @@ Depends: kernel-image, crc-modules
Priority: extra
Description: UDF modules
This package contains the UDF filesystem module.
+
+Package: fuse-modules
+Depends: kernel-image
+Priority: extra
+Description: FUSE modules
+ This package contains the Filesystem in Userspace (FUSE) module.
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fuse-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fuse-modules
new file mode 100644
index 000000000000..49bdce41b076
--- /dev/null
+++ b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fuse-modules
@@ -0,0 +1 @@
+#include "../powerpc/fuse-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules
new file mode 100644
index 000000000000..49bdce41b076
--- /dev/null
+++ b/debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules
@@ -0,0 +1 @@
+#include "../powerpc/fuse-modules"
diff --git a/debian/installer/powerpc/modules/powerpc/fuse-modules b/debian/installer/powerpc/modules/powerpc/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/powerpc/modules/powerpc/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/fuse-modules b/debian/installer/ppc64/modules/ppc64/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/s390/modules/s390x-tape/fuse-modules b/debian/installer/s390/modules/s390x-tape/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/s390/modules/s390x-tape/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/s390/modules/s390x/fuse-modules b/debian/installer/s390/modules/s390x/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/s390/modules/s390x/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/s390x/modules/s390x/fuse-modules b/debian/installer/s390x/modules/s390x/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/s390x/modules/s390x/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/fuse-modules b/debian/installer/sh4/modules/sh4-sh7751r/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/sh4/modules/sh4-sh7751r/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/fuse-modules b/debian/installer/sh4/modules/sh4-sh7785lcr/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/sh4/modules/sh4-sh7785lcr/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/sparc/modules/sparc/fuse-modules b/debian/installer/sparc/modules/sparc/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/sparc/modules/sparc/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/fuse-modules b/debian/installer/sparc64/modules/sparc64/fuse-modules
new file mode 100644
index 000000000000..0b6ba0c8c8fe
--- /dev/null
+++ b/debian/installer/sparc64/modules/sparc64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>