From 63a7595d7532637633b816b90d1cf6bd3680ef2d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 20 Jun 2017 19:28:13 +0100 Subject: [PATCH] [md68k] udeb: Use only the common module list for nic-shared-modules (fixes FTBFS) Delete all the additional lines: - 7990, 82596 and 8390p are now included in nic-modules, resulting in the "some modules are in more than one package" error - 8390 and libphy are already listed in the common module list - There's no particular reason to think m68k needs the dummy driver --- debian/changelog | 7 +++++++ debian/installer/m68k/modules/m68k/nic-shared-modules | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 786c81ce9..c4b624db8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.11.6-2) UNRELEASED; urgency=medium + + * [md68k] udeb: Use only the common module list for nic-shared-modules + (fixes FTBFS) + + -- Ben Hutchings Tue, 20 Jun 2017 19:18:44 +0100 + linux (4.11.6-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/installer/m68k/modules/m68k/nic-shared-modules b/debian/installer/m68k/modules/m68k/nic-shared-modules index d6bb0f96d..cc84b14dc 100644 --- a/debian/installer/m68k/modules/m68k/nic-shared-modules +++ b/debian/installer/m68k/modules/m68k/nic-shared-modules @@ -1,8 +1 @@ #include - -82596 ? -8390 ? -8390p ? -7990 ? -dummy -libphy