Wed May 8 13:25:15 UTC 2013

Author: benh
Date: Wed May  8 13:25:14 2013
New Revision: 20058

Log:
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]

Added:
   dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/crc-modules
   dists/sid/linux/debian/installer/modules/nic-shared-modules
   dists/sid/linux/debian/installer/sparc/modules/sparc/crc-modules
Deleted:
   dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/ipv6-modules
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/installer/amd64/modules/amd64/nic-shared-modules
   dists/sid/linux/debian/installer/armel/modules/armel-iop32x/nic-shared-modules
   dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules
   dists/sid/linux/debian/installer/armel/modules/armel-orion5x/nic-shared-modules
   dists/sid/linux/debian/installer/armel/modules/armel-versatile/nic-shared-modules
   dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules
   dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules
   dists/sid/linux/debian/installer/i386/modules/i386/nic-shared-modules
   dists/sid/linux/debian/installer/ia64/modules/ia64/nic-shared-modules
   dists/sid/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules
   dists/sid/linux/debian/installer/mips/modules/mips/nic-shared-modules
   dists/sid/linux/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules
   dists/sid/linux/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules
   dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules
   dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules
   dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules
   dists/sid/linux/debian/installer/powerpc/modules/powerpc/nic-shared-modules
   dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules
   dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules
   dists/sid/linux/debian/installer/ppc64/modules/ppc64/nic-shared-modules

Modified: dists/sid/linux/debian/changelog
==============================================================================

--- dists/sid/linux/debian/changelog	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/changelog	Wed May  8 13:25:14 2013	(r20058)
@@ -2,6 +2,13 @@
 
   * [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 <ben at decadent.org.uk>  Mon, 06 May 2013 03:59:09 +0100
 

Modified: dists/sid/linux/debian/installer/amd64/modules/amd64/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/amd64/modules/amd64/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/amd64/modules/amd64/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,5 +1 @@
-8390
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/armel/modules/armel-iop32x/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-iop32x/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/armel/modules/armel-iop32x/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,4 +1 @@
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,4 +1 @@
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/armel/modules/armel-orion5x/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-orion5x/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/armel/modules/armel-orion5x/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,3 +1 @@
-mii
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/armel/modules/armel-versatile/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-versatile/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/armel/modules/armel-versatile/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,4 +1 @@
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,4 +1 @@
-mii
-#libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,4 +1 @@
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/i386/modules/i386/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/i386/modules/i386/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/i386/modules/i386/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,5 +1 @@
-8390
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/ia64/modules/ia64/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/ia64/modules/ia64/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/ia64/modules/ia64/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,5 +1 @@
-8390
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,3 +1 @@
-mii
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/mips/modules/mips/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mips/modules/mips/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/mips/modules/mips/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,4 +1 @@
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,3 +1 @@
-mii
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,4 +1 @@
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Added: dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/crc-modules
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/crc-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -0,0 +1 @@
+#include <crc-modules>

Modified: dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,3 +1 @@
-mii
-pps_core
-ptp
+#include <nic-shared-modules>

Added: dists/sid/linux/debian/installer/modules/nic-shared-modules
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/installer/modules/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -0,0 +1 @@
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,2 +1 @@
-8390
-libphy
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,5 +1 @@
-8390
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/powerpc/modules/powerpc/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/modules/powerpc/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/powerpc/modules/powerpc/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,2 +1 @@
-8390
-libphy
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,2 +1 @@
-8390
-libphy
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,2 +1 @@
-8390
-libphy
+#include <nic-shared-modules>

Modified: dists/sid/linux/debian/installer/ppc64/modules/ppc64/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/ppc64/modules/ppc64/nic-shared-modules	Tue May  7 06:03:40 2013	(r20057)
+++ dists/sid/linux/debian/installer/ppc64/modules/ppc64/nic-shared-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -1,5 +1 @@
-8390
-mii
-libphy
-pps_core
-ptp
+#include <nic-shared-modules>

Added: dists/sid/linux/debian/installer/sparc/modules/sparc/crc-modules
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/installer/sparc/modules/sparc/crc-modules	Wed May  8 13:25:14 2013	(r20058)
@@ -0,0 +1 @@
+#include <crc-modules>

