From 5d1f93eb6afde0913ef35ec67178864dfd517f17 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 15 Jan 2013 15:18:22 +0000 Subject: [PATCH] udeb: Remove ipv6-modules on all architectures/flavours except for armel/iop32x (fixes FTBFS) svn path=/dists/trunk/linux/; revision=19735 --- debian/changelog | 2 ++ debian/installer/armel/modules/armel-kirkwood/ipv6-modules | 1 - debian/installer/armel/modules/armel-orion5x/ipv6-modules | 1 - debian/installer/armel/modules/armel-versatile/ipv6-modules | 1 - debian/installer/armhf/modules/armhf-mx5/ipv6-modules | 1 - debian/installer/hppa/modules/hppa/ipv6-modules | 2 -- debian/installer/m68k/modules/m68k-mac/ipv6-modules | 1 - debian/installer/m68k/modules/m68k/ipv6-modules | 1 - debian/installer/mips/modules/mips-4kc-malta/ipv6-modules | 2 -- debian/installer/mips/modules/mips-sb1-bcm91250a/ipv6-modules | 2 -- debian/installer/mips/modules/mips/ipv6-modules | 2 -- debian/installer/mipsel/modules/mipsel-4kc-malta/ipv6-modules | 2 -- debian/installer/mipsel/modules/mipsel-loongson-2f/ipv6-modules | 1 - debian/installer/mipsel/modules/mipsel-r5k-cobalt/ipv6-modules | 2 -- .../installer/mipsel/modules/mipsel-sb1-bcm91250a/ipv6-modules | 2 -- debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules | 1 - debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules | 1 - 17 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 debian/installer/armel/modules/armel-kirkwood/ipv6-modules delete mode 100644 debian/installer/armel/modules/armel-orion5x/ipv6-modules delete mode 100644 debian/installer/armel/modules/armel-versatile/ipv6-modules delete mode 100644 debian/installer/armhf/modules/armhf-mx5/ipv6-modules delete mode 100644 debian/installer/hppa/modules/hppa/ipv6-modules delete mode 100644 debian/installer/m68k/modules/m68k-mac/ipv6-modules delete mode 100644 debian/installer/m68k/modules/m68k/ipv6-modules delete mode 100644 debian/installer/mips/modules/mips-4kc-malta/ipv6-modules delete mode 100644 debian/installer/mips/modules/mips-sb1-bcm91250a/ipv6-modules delete mode 100644 debian/installer/mips/modules/mips/ipv6-modules delete mode 100644 debian/installer/mipsel/modules/mipsel-4kc-malta/ipv6-modules delete mode 100644 debian/installer/mipsel/modules/mipsel-loongson-2f/ipv6-modules delete mode 100644 debian/installer/mipsel/modules/mipsel-r5k-cobalt/ipv6-modules delete mode 100644 debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/ipv6-modules delete mode 100644 debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules delete mode 100644 debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules diff --git a/debian/changelog b/debian/changelog index 1d8dee7e5..6b4293c98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ linux (3.7.2-1~experimental.1) UNRELEASED; urgency=low autopm for MIDI input (Closes: #664068) * [!x86] Disable ZRAM, ZSMALLOC as modules (Reopens: #676779), as they really aren't portable yet. + * udeb: Remove ipv6-modules on all architectures/flavours except for + armel/iop32x (fixes FTBFS) -- Ben Hutchings Sun, 06 Jan 2013 04:39:12 +0000 diff --git a/debian/installer/armel/modules/armel-kirkwood/ipv6-modules b/debian/installer/armel/modules/armel-kirkwood/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/armel/modules/armel-kirkwood/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-orion5x/ipv6-modules b/debian/installer/armel/modules/armel-orion5x/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/armel/modules/armel-orion5x/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-versatile/ipv6-modules b/debian/installer/armel/modules/armel-versatile/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/armel/modules/armel-versatile/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/ipv6-modules b/debian/installer/armhf/modules/armhf-mx5/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/hppa/modules/hppa/ipv6-modules b/debian/installer/hppa/modules/hppa/ipv6-modules deleted file mode 100644 index cadae6f8b..000000000 --- a/debian/installer/hppa/modules/hppa/ipv6-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/m68k/modules/m68k-mac/ipv6-modules b/debian/installer/m68k/modules/m68k-mac/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/m68k/modules/m68k-mac/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k/ipv6-modules b/debian/installer/m68k/modules/m68k/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/m68k/modules/m68k/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/ipv6-modules b/debian/installer/mips/modules/mips-4kc-malta/ipv6-modules deleted file mode 100644 index cadae6f8b..000000000 --- a/debian/installer/mips/modules/mips-4kc-malta/ipv6-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/ipv6-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/ipv6-modules deleted file mode 100644 index cadae6f8b..000000000 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/ipv6-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/mips/modules/mips/ipv6-modules b/debian/installer/mips/modules/mips/ipv6-modules deleted file mode 100644 index cadae6f8b..000000000 --- a/debian/installer/mips/modules/mips/ipv6-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/mipsel/modules/mipsel-4kc-malta/ipv6-modules b/debian/installer/mipsel/modules/mipsel-4kc-malta/ipv6-modules deleted file mode 100644 index cadae6f8b..000000000 --- a/debian/installer/mipsel/modules/mipsel-4kc-malta/ipv6-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/ipv6-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/mipsel/modules/mipsel-loongson-2f/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/mipsel/modules/mipsel-r5k-cobalt/ipv6-modules b/debian/installer/mipsel/modules/mipsel-r5k-cobalt/ipv6-modules deleted file mode 100644 index cadae6f8b..000000000 --- a/debian/installer/mipsel/modules/mipsel-r5k-cobalt/ipv6-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/ipv6-modules b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/ipv6-modules deleted file mode 100644 index cadae6f8b..000000000 --- a/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/ipv6-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules b/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/sh4/modules/sh4-sh7751r/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules b/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/sh4/modules/sh4-sh7785lcr/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include