From a0b2080a63ed4efae18c3edcc19df2494152c850 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 8 May 2013 13:25:14 +0000 Subject: [PATCH] udeb: Fix configuration errors causing FTBFS: - [armhf/vexpress] Remove ipv6-modules; ipv6 is now built-in - [mipsel/sb1-bcm91250a,sparc] Add crc-modules as common dependency of btrfs-modules and xfs-modules (and others) - [powerpc] Add nic-shared-modules as common dependency of nic-modules and nic-extra-modules - Unify module list for nic-shared-modules across architectures [!m68k] svn path=/dists/sid/linux/; revision=20058 --- debian/changelog | 7 +++++++ debian/installer/amd64/modules/amd64/nic-shared-modules | 6 +----- .../armel/modules/armel-iop32x/nic-shared-modules | 5 +---- .../armel/modules/armel-kirkwood/nic-shared-modules | 5 +---- .../armel/modules/armel-orion5x/nic-shared-modules | 4 +--- .../armel/modules/armel-versatile/nic-shared-modules | 5 +---- .../installer/armhf/modules/armhf-mx5/nic-shared-modules | 5 +---- debian/installer/armhf/modules/armhf-vexpress/ipv6-modules | 1 - .../armhf/modules/armhf-vexpress/nic-shared-modules | 5 +---- debian/installer/i386/modules/i386/nic-shared-modules | 6 +----- debian/installer/ia64/modules/ia64/nic-shared-modules | 6 +----- .../mips/modules/mips-sb1-bcm91250a/nic-shared-modules | 4 +--- debian/installer/mips/modules/mips/nic-shared-modules | 5 +---- .../mipsel/modules/mipsel-loongson-2f/nic-shared-modules | 4 +--- .../mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules | 5 +---- .../mipsel/modules/mipsel-sb1-bcm91250a/crc-modules | 1 + .../mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules | 4 +--- debian/installer/modules/nic-shared-modules | 1 + .../modules/powerpc-powerpc-miboot/nic-shared-modules | 3 +-- .../powerpc/modules/powerpc-powerpc64/nic-shared-modules | 6 +----- .../installer/powerpc/modules/powerpc/nic-shared-modules | 3 +-- .../powerpcspe-powerpcspe-miboot/nic-shared-modules | 3 +-- .../powerpcspe/modules/powerpcspe/nic-shared-modules | 3 +-- debian/installer/ppc64/modules/ppc64/nic-shared-modules | 6 +----- debian/installer/sparc/modules/sparc/crc-modules | 1 + 25 files changed, 30 insertions(+), 74 deletions(-) delete mode 100644 debian/installer/armhf/modules/armhf-vexpress/ipv6-modules create mode 100644 debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/crc-modules create mode 100644 debian/installer/modules/nic-shared-modules create mode 100644 debian/installer/sparc/modules/sparc/crc-modules diff --git a/debian/changelog b/debian/changelog index 220d4b735..9baae45a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,13 @@ linux (3.8.11-2) UNRELEASED; urgency=low * [rt] Remove xen-linux-system packages and references to Xen support, as Xen does not support real-time scheduling + * udeb: Fix configuration errors causing FTBFS: + - [armhf/vexpress] Remove ipv6-modules; ipv6 is now built-in + - [mipsel/sb1-bcm91250a,sparc] Add crc-modules as common dependency of + btrfs-modules and xfs-modules (and others) + - [powerpc] Add nic-shared-modules as common dependency of nic-modules + and nic-extra-modules + - Unify module list for nic-shared-modules across architectures [!m68k] -- Ben Hutchings Mon, 06 May 2013 03:59:09 +0100 diff --git a/debian/installer/amd64/modules/amd64/nic-shared-modules b/debian/installer/amd64/modules/amd64/nic-shared-modules index daa84479b..cc84b14dc 100644 --- a/debian/installer/amd64/modules/amd64/nic-shared-modules +++ b/debian/installer/amd64/modules/amd64/nic-shared-modules @@ -1,5 +1 @@ -8390 -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/armel/modules/armel-iop32x/nic-shared-modules b/debian/installer/armel/modules/armel-iop32x/nic-shared-modules index 133e3ae4f..cc84b14dc 100644 --- a/debian/installer/armel/modules/armel-iop32x/nic-shared-modules +++ b/debian/installer/armel/modules/armel-iop32x/nic-shared-modules @@ -1,4 +1 @@ -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules b/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules index 133e3ae4f..cc84b14dc 100644 --- a/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules +++ b/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules @@ -1,4 +1 @@ -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/armel/modules/armel-orion5x/nic-shared-modules b/debian/installer/armel/modules/armel-orion5x/nic-shared-modules index c4bfbc89b..cc84b14dc 100644 --- a/debian/installer/armel/modules/armel-orion5x/nic-shared-modules +++ b/debian/installer/armel/modules/armel-orion5x/nic-shared-modules @@ -1,3 +1 @@ -mii -pps_core -ptp +#include diff --git a/debian/installer/armel/modules/armel-versatile/nic-shared-modules b/debian/installer/armel/modules/armel-versatile/nic-shared-modules index 133e3ae4f..cc84b14dc 100644 --- a/debian/installer/armel/modules/armel-versatile/nic-shared-modules +++ b/debian/installer/armel/modules/armel-versatile/nic-shared-modules @@ -1,4 +1 @@ -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules b/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules index b157bab62..cc84b14dc 100644 --- a/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules +++ b/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules @@ -1,4 +1 @@ -mii -#libphy -pps_core -ptp +#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/ipv6-modules b/debian/installer/armhf/modules/armhf-vexpress/ipv6-modules deleted file mode 100644 index 1e3fc3388..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/ipv6-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules b/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules index 133e3ae4f..cc84b14dc 100644 --- a/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules +++ b/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules @@ -1,4 +1 @@ -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/i386/modules/i386/nic-shared-modules b/debian/installer/i386/modules/i386/nic-shared-modules index daa84479b..cc84b14dc 100644 --- a/debian/installer/i386/modules/i386/nic-shared-modules +++ b/debian/installer/i386/modules/i386/nic-shared-modules @@ -1,5 +1 @@ -8390 -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/ia64/modules/ia64/nic-shared-modules b/debian/installer/ia64/modules/ia64/nic-shared-modules index daa84479b..cc84b14dc 100644 --- a/debian/installer/ia64/modules/ia64/nic-shared-modules +++ b/debian/installer/ia64/modules/ia64/nic-shared-modules @@ -1,5 +1 @@ -8390 -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules index c4bfbc89b..cc84b14dc 100644 --- a/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules @@ -1,3 +1 @@ -mii -pps_core -ptp +#include diff --git a/debian/installer/mips/modules/mips/nic-shared-modules b/debian/installer/mips/modules/mips/nic-shared-modules index 133e3ae4f..cc84b14dc 100644 --- a/debian/installer/mips/modules/mips/nic-shared-modules +++ b/debian/installer/mips/modules/mips/nic-shared-modules @@ -1,4 +1 @@ -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules index c4bfbc89b..cc84b14dc 100644 --- a/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules @@ -1,3 +1 @@ -mii -pps_core -ptp +#include diff --git a/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules b/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules index 133e3ae4f..cc84b14dc 100644 --- a/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules +++ b/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules @@ -1,4 +1 @@ -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/crc-modules b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/crc-modules new file mode 100644 index 000000000..7e00de705 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/crc-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules index c4bfbc89b..cc84b14dc 100644 --- a/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules +++ b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules @@ -1,3 +1 @@ -mii -pps_core -ptp +#include diff --git a/debian/installer/modules/nic-shared-modules b/debian/installer/modules/nic-shared-modules new file mode 100644 index 000000000..cc84b14dc --- /dev/null +++ b/debian/installer/modules/nic-shared-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules index d93c8f340..cc84b14dc 100644 --- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules +++ b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules @@ -1,2 +1 @@ -8390 -libphy +#include diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules index daa84479b..cc84b14dc 100644 --- a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules +++ b/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules @@ -1,5 +1 @@ -8390 -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/powerpc/modules/powerpc/nic-shared-modules b/debian/installer/powerpc/modules/powerpc/nic-shared-modules index d93c8f340..cc84b14dc 100644 --- a/debian/installer/powerpc/modules/powerpc/nic-shared-modules +++ b/debian/installer/powerpc/modules/powerpc/nic-shared-modules @@ -1,2 +1 @@ -8390 -libphy +#include diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules index d93c8f340..cc84b14dc 100644 --- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules +++ b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules @@ -1,2 +1 @@ -8390 -libphy +#include diff --git a/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules b/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules index d93c8f340..cc84b14dc 100644 --- a/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules +++ b/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules @@ -1,2 +1 @@ -8390 -libphy +#include diff --git a/debian/installer/ppc64/modules/ppc64/nic-shared-modules b/debian/installer/ppc64/modules/ppc64/nic-shared-modules index daa84479b..cc84b14dc 100644 --- a/debian/installer/ppc64/modules/ppc64/nic-shared-modules +++ b/debian/installer/ppc64/modules/ppc64/nic-shared-modules @@ -1,5 +1 @@ -8390 -mii -libphy -pps_core -ptp +#include diff --git a/debian/installer/sparc/modules/sparc/crc-modules b/debian/installer/sparc/modules/sparc/crc-modules new file mode 100644 index 000000000..7e00de705 --- /dev/null +++ b/debian/installer/sparc/modules/sparc/crc-modules @@ -0,0 +1 @@ +#include