From 4220b94e908355424689c7c415bd3867dd0a285b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 19 Apr 2018 10:50:27 +0100 Subject: [PATCH] udeb: Add zstd_decompress to compress-modules and make squashfs-modules depend on it zstd_decompress is now used by both btrfs and squashfs, so it needs to be in a common dependency of their udebs. --- debian/changelog | 2 ++ debian/installer/alpha/modules/alpha-generic/compress-modules | 1 + debian/installer/amd64/modules/amd64/compress-modules | 1 + debian/installer/arm64/modules/arm64/compress-modules | 1 + debian/installer/armel/package-list | 3 --- debian/installer/armhf/modules/armhf-armmp/compress-modules | 1 + .../installer/hppa/modules/hppa-parisc64-smp/compress-modules | 1 + debian/installer/hppa/modules/hppa/compress-modules | 1 + debian/installer/i386/modules/i386/compress-modules | 1 + debian/installer/m68k/modules/m68k/compress-modules | 1 + debian/installer/mips/modules/mips-4kc-malta/compress-modules | 1 + debian/installer/mips/modules/mips-octeon/compress-modules | 1 + debian/installer/mips/modules/mips/compress-modules | 1 + .../mipsel/modules/mipsel-loongson-3/compress-modules | 1 + debian/installer/modules/compress-modules | 1 + debian/installer/package-list | 2 +- .../powerpc/modules/powerpc-powerpc-miboot/compress-modules | 1 + .../powerpc/modules/powerpc-powerpc64/compress-modules | 1 + debian/installer/powerpc/modules/powerpc/compress-modules | 1 + debian/installer/ppc64el/modules/ppc64el/compress-modules | 1 + debian/installer/s390x/modules/s390x/compress-modules | 1 + debian/installer/sh4/modules/sh4-sh7751r/compress-modules | 1 + debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules | 1 + debian/installer/sparc64/modules/sparc64/compress-modules | 1 + 24 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 debian/installer/alpha/modules/alpha-generic/compress-modules create mode 100644 debian/installer/amd64/modules/amd64/compress-modules create mode 100644 debian/installer/arm64/modules/arm64/compress-modules create mode 100644 debian/installer/armhf/modules/armhf-armmp/compress-modules create mode 100644 debian/installer/hppa/modules/hppa-parisc64-smp/compress-modules create mode 100644 debian/installer/hppa/modules/hppa/compress-modules create mode 100644 debian/installer/i386/modules/i386/compress-modules create mode 100644 debian/installer/m68k/modules/m68k/compress-modules create mode 100644 debian/installer/mips/modules/mips-4kc-malta/compress-modules create mode 100644 debian/installer/mips/modules/mips-octeon/compress-modules create mode 100644 debian/installer/mips/modules/mips/compress-modules create mode 100644 debian/installer/mipsel/modules/mipsel-loongson-3/compress-modules create mode 100644 debian/installer/powerpc/modules/powerpc-powerpc-miboot/compress-modules create mode 100644 debian/installer/powerpc/modules/powerpc-powerpc64/compress-modules create mode 100644 debian/installer/powerpc/modules/powerpc/compress-modules create mode 100644 debian/installer/ppc64el/modules/ppc64el/compress-modules create mode 100644 debian/installer/s390x/modules/s390x/compress-modules create mode 100644 debian/installer/sh4/modules/sh4-sh7751r/compress-modules create mode 100644 debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules create mode 100644 debian/installer/sparc64/modules/sparc64/compress-modules diff --git a/debian/changelog b/debian/changelog index 5800df83f..c94b87af1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -522,6 +522,8 @@ linux (4.15.17-1) UNRELEASED; urgency=medium * [arm64] PCI: Enable PCI_TEGRA (Closes: #888817) * [amd64] net: Enable AQTION as module * udeb: Rename lzo-modules to compress-modules + * udeb: Add zstd_decompress to compress-modules and make squashfs-modules + depend on it [ Vagrant Cascadian ] * [armhf] Add patch to fix loading of imx6q-cpufreq module. diff --git a/debian/installer/alpha/modules/alpha-generic/compress-modules b/debian/installer/alpha/modules/alpha-generic/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/alpha/modules/alpha-generic/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/amd64/modules/amd64/compress-modules b/debian/installer/amd64/modules/amd64/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/amd64/modules/amd64/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/arm64/modules/arm64/compress-modules b/debian/installer/arm64/modules/arm64/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/arm64/modules/arm64/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/armel/package-list b/debian/installer/armel/package-list index 3875538ba..9c8aabcdf 100644 --- a/debian/installer/armel/package-list +++ b/debian/installer/armel/package-list @@ -12,6 +12,3 @@ Depends: kernel-image, usb-modules Package: jffs2-modules Depends: kernel-image, zlib-modules, compress-modules, mtd-modules - -Package: squashfs-modules -Depends: kernel-image, compress-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/compress-modules b/debian/installer/armhf/modules/armhf-armmp/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/armhf/modules/armhf-armmp/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/compress-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/hppa/modules/hppa-parisc64-smp/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/hppa/modules/hppa/compress-modules b/debian/installer/hppa/modules/hppa/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/hppa/modules/hppa/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/i386/modules/i386/compress-modules b/debian/installer/i386/modules/i386/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/i386/modules/i386/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/m68k/modules/m68k/compress-modules b/debian/installer/m68k/modules/m68k/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/m68k/modules/m68k/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-4kc-malta/compress-modules b/debian/installer/mips/modules/mips-4kc-malta/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips-octeon/compress-modules b/debian/installer/mips/modules/mips-octeon/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/mips/modules/mips-octeon/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mips/modules/mips/compress-modules b/debian/installer/mips/modules/mips/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/mips/modules/mips/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/compress-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-3/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/compress-modules b/debian/installer/modules/compress-modules index cd237de1a..425a92958 100644 --- a/debian/installer/modules/compress-modules +++ b/debian/installer/modules/compress-modules @@ -1,2 +1,3 @@ lzo_compress lzo_decompress +zstd_decompress diff --git a/debian/installer/package-list b/debian/installer/package-list index 7578e9c9d..817178b5c 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -313,7 +313,7 @@ Description: Network Block Device modules Device Package: squashfs-modules -Depends: kernel-image +Depends: kernel-image, compress-modules Priority: optional Description: squashfs modules This package contains squashfs modules. diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/compress-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/compress-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/powerpc/modules/powerpc-powerpc64/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/powerpc/modules/powerpc/compress-modules b/debian/installer/powerpc/modules/powerpc/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/powerpc/modules/powerpc/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/ppc64el/modules/ppc64el/compress-modules b/debian/installer/ppc64el/modules/ppc64el/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/ppc64el/modules/ppc64el/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/s390x/modules/s390x/compress-modules b/debian/installer/s390x/modules/s390x/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/s390x/modules/s390x/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/sh4/modules/sh4-sh7751r/compress-modules b/debian/installer/sh4/modules/sh4-sh7751r/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/sh4/modules/sh4-sh7751r/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules b/debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/sparc64/modules/sparc64/compress-modules b/debian/installer/sparc64/modules/sparc64/compress-modules new file mode 100644 index 000000000..804616619 --- /dev/null +++ b/debian/installer/sparc64/modules/sparc64/compress-modules @@ -0,0 +1 @@ +#include