From d596adba2c569ab61c03864504c64a7354801404 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 31 Jan 2012 03:15:03 +0000 Subject: [PATCH] [armel] udeb: Do not attempt to build lzo-modules udeb (fixes FTBFS) lzo_compress is now built-in due to: config REGMAP default y if (REGMAP_I2C || REGMAP_SPI) select LZO_COMPRESS select LZO_DECOMPRESS bool svn path=/dists/trunk/linux-2.6/; revision=18646 --- debian/changelog | 2 ++ debian/installer/armel/modules/armel-iop32x/lzo-modules | 1 - debian/installer/armel/modules/armel-orion5x/lzo-modules | 1 - debian/installer/armel/modules/armel-versatile/lzo-modules | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 debian/installer/armel/modules/armel-iop32x/lzo-modules delete mode 100644 debian/installer/armel/modules/armel-orion5x/lzo-modules delete mode 100644 debian/installer/armel/modules/armel-versatile/lzo-modules diff --git a/debian/changelog b/debian/changelog index 24b99cfee..7c6576f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ linux-2.6 (3.2.2-1) UNRELEASED; urgency=low * aufs: Update to aufs3.2-20120109 (fixes FTBFS on m68k) * [m68k] Fix assembler constraint to prevent overeager gcc optimisation * sdhci-pci: Include driver in installer + * [armel] udeb: Do not attempt to build lzo-modules udeb as lzo_compress + is now built-in (fixes FTBFS) [ Thorsten Glaser ] * [m68k] Use gcc-4.6 like (almost) all other architectures diff --git a/debian/installer/armel/modules/armel-iop32x/lzo-modules b/debian/installer/armel/modules/armel-iop32x/lzo-modules deleted file mode 100644 index 8e50b5ab7..000000000 --- a/debian/installer/armel/modules/armel-iop32x/lzo-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-orion5x/lzo-modules b/debian/installer/armel/modules/armel-orion5x/lzo-modules deleted file mode 100644 index 8e50b5ab7..000000000 --- a/debian/installer/armel/modules/armel-orion5x/lzo-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armel/modules/armel-versatile/lzo-modules b/debian/installer/armel/modules/armel-versatile/lzo-modules deleted file mode 100644 index 8e50b5ab7..000000000 --- a/debian/installer/armel/modules/armel-versatile/lzo-modules +++ /dev/null @@ -1 +0,0 @@ -#include