From 0813c8245199ac7707d17745f3b0555587a7297d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 21 Dec 2013 00:34:22 +0000 Subject: [PATCH] [x86,ia64] udeb: Remove zlib-modules as zlib is now built-in PSTORE now selects ZLIB_DEFLATE and ZLIB_INFLATE so these are built-in and zlib-modules ends up empty. (We should really have some way to enforce/assert that this is the case!) Also update the kernel-image Provides field accordingly. svn path=/dists/sid/linux/; revision=20904 --- debian/changelog | 1 + debian/installer/amd64/modules/amd64/zlib-modules | 1 - debian/installer/amd64/package-list | 3 +++ debian/installer/i386/modules/i386/zlib-modules | 1 - debian/installer/i386/package-list | 2 +- debian/installer/ia64/modules/ia64/zlib-modules | 1 - debian/installer/ia64/package-list | 2 +- 7 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 debian/installer/amd64/modules/amd64/zlib-modules delete mode 100644 debian/installer/i386/modules/i386/zlib-modules delete mode 100644 debian/installer/ia64/modules/ia64/zlib-modules diff --git a/debian/changelog b/debian/changelog index 9779d7aa5..6fc9a5440 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,7 @@ linux (3.12.5-1) UNRELEASED; urgency=medium * [x86] KVM: fix guest-initiated crash with x2apic (CVE-2013-6376) * Set ABI to 1 * [ia64] Enable PSTORE, EFI_VARS_PSTORE + * [x86,ia64] udeb: Remove zlib-modules as zlib is now built-in [ Ian Campbell ] * [armel/kirkwood+orion] Reenable MARVELL_PHY (Closes: #723177) diff --git a/debian/installer/amd64/modules/amd64/zlib-modules b/debian/installer/amd64/modules/amd64/zlib-modules deleted file mode 100644 index e02ad64bf..000000000 --- a/debian/installer/amd64/modules/amd64/zlib-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list index 2031ced85..322f816dc 100644 --- a/debian/installer/amd64/package-list +++ b/debian/installer/amd64/package-list @@ -9,3 +9,6 @@ Priority: standard Package: scsi-modules Depends: kernel-image, scsi-core-modules, scsi-common-modules, cdrom-core-modules, core-modules, ata-modules + +Package: kernel-image +Provides: zlib-modules diff --git a/debian/installer/i386/modules/i386/zlib-modules b/debian/installer/i386/modules/i386/zlib-modules deleted file mode 100644 index e02ad64bf..000000000 --- a/debian/installer/i386/modules/i386/zlib-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list index 0f3e8d3e9..b92d69595 100644 --- a/debian/installer/i386/package-list +++ b/debian/installer/i386/package-list @@ -5,7 +5,7 @@ # Package: kernel-image -Provides: rtc-modules +Provides: rtc-modules, zlib-modules Package: fat-modules Priority: standard diff --git a/debian/installer/ia64/modules/ia64/zlib-modules b/debian/installer/ia64/modules/ia64/zlib-modules deleted file mode 100644 index e02ad64bf..000000000 --- a/debian/installer/ia64/modules/ia64/zlib-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list index a814188d3..fd1dc0020 100644 --- a/debian/installer/ia64/package-list +++ b/debian/installer/ia64/package-list @@ -34,4 +34,4 @@ Description: SN modules This package contains SN modules for Altix systems Package: kernel-image -Provides: efi-modules +Provides: efi-modules, zlib-modules