udeb: Drop zlib-modules packages, as zlib_deflate is now always built-in

This fixes FTBFS on alpha, armel, armhf, powerpc,riscv64, s390x.  Other
architectures were probably affected too, but have earlier build
failures.

18 files changed, 7 insertions, 31 deletions

diff --git a/debian/installer/modules/alpha-generic/zlib-modules b/debian/installer/modules/alpha-generic/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/alpha-generic/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/armel-marvell/zlib-modules b/debian/installer/modules/armel-marvell/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/armel-marvell/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/armhf-armmp/zlib-modules b/debian/installer/modules/armhf-armmp/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/armhf-armmp/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/hppa-parisc64/zlib-modules b/debian/installer/modules/hppa-parisc64/zlib-modules
deleted file mode 100644
index b3f829cf2dd1..000000000000
--- a/debian/installer/modules/hppa-parisc64/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../hppa/zlib-modules"
diff --git a/debian/installer/modules/hppa/zlib-modules b/debian/installer/modules/hppa/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/hppa/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/m68k/zlib-modules b/debian/installer/modules/m68k/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/m68k/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/mips-4kc-malta/zlib-modules b/debian/installer/modules/mips-4kc-malta/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/mips-4kc-malta/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/mips-octeon/zlib-modules b/debian/installer/modules/mips-octeon/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/mips-octeon/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/mips/zlib-modules b/debian/installer/modules/mips/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/mips/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/mipsel-loongson-3/zlib-modules b/debian/installer/modules/mipsel-loongson-3/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/mipsel-loongson-3/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/powerpc/zlib-modules b/debian/installer/modules/powerpc/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/powerpc/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/riscv64/zlib-modules b/debian/installer/modules/riscv64/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/riscv64/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/s390x/zlib-modules b/debian/installer/modules/s390x/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/s390x/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/zlib-modules b/debian/installer/modules/sh4-sh7751r/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/sh4-sh7751r/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/zlib-modules b/debian/installer/modules/sh4-sh7785lcr/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/sh4-sh7785lcr/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/sparc64/zlib-modules b/debian/installer/modules/sparc64/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/modules/sparc64/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/modules/zlib-modules b/debian/installer/modules/zlib-modules
deleted file mode 100644
index 322c546d199d..000000000000
--- a/debian/installer/modules/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-zlib_deflate
diff --git a/debian/installer/package-list b/debian/installer/package-list
index 165495981969..c08d2f1683c3 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -3,12 +3,11 @@
 # architecture, which is derived from the files in the modules directory.
 #
 Package: kernel-image
-Provides_amd64: zlib-modules
-Provides_arm64: mmc-core-modules, zlib-modules
+Provides_arm64: mmc-core-modules
 Provides_armel: rtc-modules
 Provides_armmp: mmc-core-modules, mtd-core-modules
-Provides_i386: rtc-modules, zlib-modules
-Provides_ia64: efi-modules, zlib-modules
+Provides_i386: rtc-modules
+Provides_ia64: efi-modules
 Provides_loongson-3: i2c-modules, rtc-modules
 Provides_mips: rtc-modules
 Provides_mips64: rtc-modules
@@ -29,7 +28,7 @@ Description: Linux kernel image and core modules for the Debian installer
  Debian system.
 
 Package: nic-modules
-Depends: kernel-image, nic-shared-modules, i2c-modules, crc-modules, zlib-modules, mtd-core-modules
+Depends: kernel-image, nic-shared-modules, i2c-modules, crc-modules, mtd-core-modules
 Provides: nic-extra-modules
 Priority: standard
 Description: NIC drivers
@@ -63,7 +62,7 @@ Description: USB serial drivers
  This package contains USB serial drivers for the kernel.
 
 Package: ppp-modules
-Depends: kernel-image, serial-modules, zlib-modules, crc-modules
+Depends: kernel-image, serial-modules, crc-modules
 Priority: optional
 Description: PPP drivers
  This package contains PPP drivers for the kernel.
@@ -120,7 +119,7 @@ Description: IPv6 driver
  This package contains the IPv6 driver for the kernel.
 
 Package: btrfs-modules
-Depends: kernel-image, crc-modules, zlib-modules, compress-modules, md-modules
+Depends: kernel-image, crc-modules, compress-modules, md-modules
 Priority: optional
 Description: BTRFS filesystem support
  This package contains the BTRFS filesystem module for the kernel.
@@ -140,7 +139,7 @@ Description: ISOFS filesystem support
  This package contains the ISOFS filesystem module for the kernel.
 
 Package: jffs2-modules
-Depends: kernel-image, zlib-modules, compress-modules, mtd-modules
+Depends: kernel-image, compress-modules, mtd-modules
 Priority: optional
 Description: JFFS2 filesystem support
  This package contains the JFFS2 filesystem module for the kernel.
@@ -387,12 +386,6 @@ Priority: optional
 Description: sound support
  This package contains sound modules.
 
-Package: zlib-modules
-Depends: kernel-image
-Priority: optional
-Description: zlib modules
- This package contains zlib modules.
-
 Package: compress-modules
 Depends: kernel-image
 Priority: optional