From d41803dc84cf981034c416de3b634c0f8b0367ed Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 6 Nov 2014 16:41:04 +0000 Subject: [PATCH] [hppa] udeb: Fix modules in multiple packages (Closes: 768297) svn path=/dists/sid/linux/; revision=22047 --- debian/changelog | 3 +++ debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules | 1 + .../hppa/modules/hppa-parisc64-smp/nic-shared-modules | 1 + debian/installer/hppa/modules/hppa/ata-modules | 1 + debian/installer/hppa/modules/hppa/nic-shared-modules | 1 + debian/installer/hppa/modules/hppa/scsi-modules | 1 - 6 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules create mode 100644 debian/installer/hppa/modules/hppa-parisc64-smp/nic-shared-modules create mode 100644 debian/installer/hppa/modules/hppa/ata-modules create mode 100644 debian/installer/hppa/modules/hppa/nic-shared-modules diff --git a/debian/changelog b/debian/changelog index 730223926..37eeb725a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ linux (3.16.7-2) UNRELEASED; urgency=low [ Aurelien Jarno ] * [i386] Rename 486 flavour to 586 for udebs. (Closes: #768288) + [ Ben Hutchings ] + * [hppa] udeb: Fix modules in multiple packages (Closes: 768297) + -- Ian Campbell Tue, 04 Nov 2014 19:18:38 +0000 linux (3.16.7-1) unstable; urgency=medium diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules new file mode 100644 index 000000000..08f295ad2 --- /dev/null +++ b/debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules @@ -0,0 +1 @@ +#include "../hppa/ata-modules" diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-shared-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/nic-shared-modules new file mode 100644 index 000000000..fd0b19c80 --- /dev/null +++ b/debian/installer/hppa/modules/hppa-parisc64-smp/nic-shared-modules @@ -0,0 +1 @@ +#include "../hppa/nic-shared-modules" diff --git a/debian/installer/hppa/modules/hppa/ata-modules b/debian/installer/hppa/modules/hppa/ata-modules new file mode 100644 index 000000000..b81c0f38b --- /dev/null +++ b/debian/installer/hppa/modules/hppa/ata-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/hppa/modules/hppa/nic-shared-modules b/debian/installer/hppa/modules/hppa/nic-shared-modules new file mode 100644 index 000000000..cc84b14dc --- /dev/null +++ b/debian/installer/hppa/modules/hppa/nic-shared-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/hppa/modules/hppa/scsi-modules b/debian/installer/hppa/modules/hppa/scsi-modules index 2c200820d..284481edf 100644 --- a/debian/installer/hppa/modules/hppa/scsi-modules +++ b/debian/installer/hppa/modules/hppa/scsi-modules @@ -4,7 +4,6 @@ lasi700 osst sg st -sym53c8xx zalon7xx megaraid ? megaraid_mbox ?