From e3cf96b2d1356ddf809b38b7fbbb769bf68bd448 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 28 Nov 2019 04:05:23 +0000 Subject: [PATCH] [ia64] udeb: Remove SGI SN2 modules (fixes FTBFS) SGI SN2 (early Altix) support has been removed upstream. --- debian/changelog | 1 + debian/installer/modules/ia64/ide-modules | 1 - debian/installer/modules/ia64/serial-modules | 2 -- debian/installer/modules/ia64/sn-modules | 2 -- debian/installer/package-list | 9 +-------- 5 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 debian/installer/modules/ia64/sn-modules diff --git a/debian/changelog b/debian/changelog index f93add2e3520..2ba3edb42fe1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ linux (5.4-1~exp2) UNRELEASED; urgency=medium * [armel] udeb: Replace m25p80 with spi-nor in mtd-modules (fixes FTBFS) + * [ia64] udeb: Remove SGI SN2 modules (fixes FTBFS) -- Ben Hutchings Thu, 28 Nov 2019 03:55:10 +0000 diff --git a/debian/installer/modules/ia64/ide-modules b/debian/installer/modules/ia64/ide-modules index 3bbc4df7631b..7fe00c50a21d 100644 --- a/debian/installer/modules/ia64/ide-modules +++ b/debian/installer/modules/ia64/ide-modules @@ -1,3 +1,2 @@ ide-gd_mod -sgiioc4 trm290 diff --git a/debian/installer/modules/ia64/serial-modules b/debian/installer/modules/ia64/serial-modules index 13dac04feb1d..6ab8b8c3551b 100644 --- a/debian/installer/modules/ia64/serial-modules +++ b/debian/installer/modules/ia64/serial-modules @@ -1,3 +1 @@ #include -ioc3_serial -ioc4_serial diff --git a/debian/installer/modules/ia64/sn-modules b/debian/installer/modules/ia64/sn-modules deleted file mode 100644 index 4274c5f89e87..000000000000 --- a/debian/installer/modules/ia64/sn-modules +++ /dev/null @@ -1,2 +0,0 @@ -ioc3 -ioc4 diff --git a/debian/installer/package-list b/debian/installer/package-list index e6d8aa6a4e2c..4bc54f3e856d 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -52,7 +52,6 @@ Description: Shared NIC drivers Package: serial-modules Depends: kernel-image, pcmcia-modules -Depends_ia64: kernel-image, pcmcia-modules, sn-modules Priority: optional Description: Serial drivers This package contains serial drivers for the kernel. @@ -432,17 +431,11 @@ Description: IDE support This package contains core IDE support for the kernel. Package: ide-modules -Depends: kernel-image, ide-core-modules, sn-modules +Depends: kernel-image, ide-core-modules Priority: standard Description: IDE drivers This package contains IDE drivers for the kernel. -Package: sn-modules -Depends: kernel-image -Priority: optional -Description: SN modules - This package contains SN modules for Altix systems - Package: hypervisor-modules Depends: kernel-image Priority: standard