From c5abd5318000e8193b82aa2e82ff56e85486649d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 17 Sep 2018 01:02:32 +0100 Subject: [PATCH] [ppc64] udeb: Revert accidental change to nic-pcmcia-modules dependencies I failed to notice that ppc64 had a symlink to powerpc's package-list which overrode the dependencies for nic-pcmcia-modules. For now, duplicate that override for ppc64. In the longer term the powerpc* net driver packages should be reorganised to match other architectures. Fixes FTBFS. --- debian/changelog | 2 ++ debian/installer/package-list | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 69421a45f..f9237e6ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ linux (4.19~rc4-1~exp1) UNRELEASED; urgency=medium * debian/patches: Add Forwarded fields to several patches * [ppc64el] udeb: Fix relative #include filenames in module lists (fixes FTBFS) + * [ppc64] udeb: Revert accidental change to nic-pcmcia-modules dependencies + (fixes FTBFS) -- Ben Hutchings Mon, 10 Sep 2018 22:25:53 +0100 diff --git a/debian/installer/package-list b/debian/installer/package-list index 8a095702d..1332ae0af 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -253,6 +253,7 @@ Description: Mouse support Package: nic-pcmcia-modules Depends: kernel-image, nic-shared-modules, nic-wireless-modules, pcmcia-modules, mmc-core-modules Depends_powerpc: kernel-image, nic-modules, nic-shared-modules, pcmcia-modules +Depends_ppc64: kernel-image, nic-modules, nic-shared-modules, pcmcia-modules Priority: standard Description: Common PCMCIA NIC drivers This package contains common PCMCIA NIC drivers for the kernel.