From 926704f2b9ab941366a0ad78be9f34282bbe604e Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Sat, 14 Apr 2018 22:38:57 +0900 Subject: [PATCH] [armel] Add dependency of udeb to fix FTBFS * [armel] Add dependency of udeb modules (fixes FTBFS): - Add lzo_decompress to lzo-modules. - Add cmdlinepart to mtd-modules. * [armel] Add dependency of udeb packages (fixes FTBFS): - Add package dependency of mtd-modules to jffs2-modules. - Add package dependency of lzo-modules to squashfs-modules. (cherry picked from commit 175171d42d928ba7cafa4297f58246d53cc9d4ca) --- debian/changelog | 6 ++++++ debian/installer/armel/modules/armel-marvell/lzo-modules | 2 ++ debian/installer/armel/modules/armel-marvell/mtd-modules | 1 + debian/installer/armel/package-list | 6 ++++++ 4 files changed, 15 insertions(+) create mode 100644 debian/installer/armel/modules/armel-marvell/lzo-modules diff --git a/debian/changelog b/debian/changelog index 2fd657f83..e565c68f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,12 @@ linux (4.15.11-2) UNRELEASED; urgency=medium built-in to module. - Disable VT, ZSWAP, RD_BZIP2, and RD_LZMA. Thanks to Leigh Brown for his idea to disable VT. + * [armel] Add dependency of udeb modules (fixes FTBFS): + - Add lzo_decompress to lzo-modules. + - Add cmdlinepart to mtd-modules. + * [armel] Add dependency of udeb packages (fixes FTBFS): + - Add package dependency of mtd-modules to jffs2-modules. + - Add package dependency of lzo-modules to squashfs-modules. [ Ben Hutchings ] * wireless: Disable regulatory.db direct loading (see #892229) diff --git a/debian/installer/armel/modules/armel-marvell/lzo-modules b/debian/installer/armel/modules/armel-marvell/lzo-modules new file mode 100644 index 000000000..9dd85bedc --- /dev/null +++ b/debian/installer/armel/modules/armel-marvell/lzo-modules @@ -0,0 +1,2 @@ +#include +lzo_decompress diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/armel/modules/armel-marvell/mtd-modules index 2a064755f..c1aeb935a 100644 --- a/debian/installer/armel/modules/armel-marvell/mtd-modules +++ b/debian/installer/armel/modules/armel-marvell/mtd-modules @@ -8,3 +8,4 @@ orion_nand ofpart mtdblock physmap_of +cmdlinepart diff --git a/debian/installer/armel/package-list b/debian/installer/armel/package-list index d975323d3..a507168f5 100644 --- a/debian/installer/armel/package-list +++ b/debian/installer/armel/package-list @@ -9,3 +9,9 @@ Provides_versatile: rtc-modules Package: fb-modules Depends: kernel-image, usb-modules + +Package: jffs2-modules +Depends: kernel-image, zlib-modules, lzo-modules, mtd-modules + +Package: squashfs-modules +Depends: kernel-image, lzo-modules