From 8a04da01dcb78ef09d7c990d4e49911bd865c0b3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Jun 2013 02:19:45 +0000 Subject: [PATCH] udeb: Remove redundant control file overrides svn path=/dists/trunk/linux/; revision=20235 --- debian/changelog | 1 + debian/installer/amd64/package-list | 6 ------ debian/installer/armel/package-list | 7 ------- debian/installer/armhf/package-list | 13 ------------- debian/installer/hppa/package-list | 3 --- debian/installer/i386/package-list | 9 --------- debian/installer/ia64/package-list | 6 ------ debian/installer/m68k/package-list | 4 ---- debian/installer/mips/package-list | 3 --- debian/installer/mipsel/package-list | 3 --- debian/installer/package-list | 2 +- debian/installer/powerpc/package-list | 9 --------- debian/installer/s390/package-list | 4 ---- debian/installer/s390x/package-list | 4 ---- debian/installer/sh4/package-list | 6 ------ debian/installer/sparc/package-list | 4 ---- debian/installer/sparc64/package-list | 4 ---- 17 files changed, 2 insertions(+), 86 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c96f4d53..2e8eca1bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ linux (3.10~rc5-1~exp1) UNRELEASED; urgency=low [ Ben Hutchings ] * [x86] Enable HYPERVISOR_GUEST * udeb: Move i2c-algo-bit to i2c-modules + * udeb: Remove redundant control file overrides -- Ben Hutchings Mon, 03 Jun 2013 13:21:56 +0100 diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list index fd555f10c..9fcd9a764 100644 --- a/debian/installer/amd64/package-list +++ b/debian/installer/amd64/package-list @@ -12,9 +12,3 @@ Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules Package: scsi-modules Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules - -Package: pcmcia-modules -Depends: kernel-image, core-modules - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/armel/package-list b/debian/installer/armel/package-list index e4b3748a5..4e2929032 100644 --- a/debian/installer/armel/package-list +++ b/debian/installer/armel/package-list @@ -17,10 +17,3 @@ Description: Beeper support Package: fb-modules Depends: kernel-image, usb-modules, nls-core-modules - -Package: pata-modules -Depends: kernel-image, ata-modules -Priority: standard - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/armhf/package-list b/debian/installer/armhf/package-list index 452b151ac..2115761bb 100644 --- a/debian/installer/armhf/package-list +++ b/debian/installer/armhf/package-list @@ -7,18 +7,5 @@ Package: kernel-image Provides_mx5: rtc-modules Provides_vexpress: rtc-modules -# Package: beeper-modules -# Depends: event-modules -# Priority: extra -# Description: Beeper support -# This package contains beeper drivers for the kernel. - -# Package: fb-modules -# Depends: usb-modules, nls-core-modules - Package: pata-modules -Depends: kernel-image, ata-modules Priority: extra - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/hppa/package-list b/debian/installer/hppa/package-list index 16d8c11ee..2acdb9bc4 100644 --- a/debian/installer/hppa/package-list +++ b/debian/installer/hppa/package-list @@ -14,6 +14,3 @@ Depends: kernel-image, ide-core-modules, nls-core-modules Package: pata-modules Depends: kernel-image, scsi-core-modules - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list index 270447f3b..391ae480f 100644 --- a/debian/installer/i386/package-list +++ b/debian/installer/i386/package-list @@ -13,14 +13,5 @@ Priority: standard Package: nic-modules Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules -Package: scsi-modules -Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules - -Package: pcmcia-modules -Depends: kernel-image, core-modules - -Package: nbd-modules -Depends: kernel-image - Package: fb-modules Depends: kernel-image, i2c-modules diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list index 122b50d05..0e3de0bc6 100644 --- a/debian/installer/ia64/package-list +++ b/debian/installer/ia64/package-list @@ -12,9 +12,6 @@ Depends: kernel-image, ide-core-modules, sn-modules Package: nic-modules Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules, crc-modules -Package: pcmcia-modules -Depends: kernel-image, core-modules - Package: serial-modules Depends: kernel-image, pcmcia-modules, sn-modules @@ -24,8 +21,5 @@ Priority: extra Description: SN modules This package contains SN modules for Altix systems -Package: nbd-modules -Depends: kernel-image - Package: kernel-image Provides: efi-modules diff --git a/debian/installer/m68k/package-list b/debian/installer/m68k/package-list index 1cf8b723a..953293287 100644 --- a/debian/installer/m68k/package-list +++ b/debian/installer/m68k/package-list @@ -6,7 +6,3 @@ Package: kernel-image Provides: loop-modules, ext2-modules, ext3-modules #Provides_mac: loop-modules, ext2-modules, ext3-modules, hfs-modules - - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/mips/package-list b/debian/installer/mips/package-list index 873fe229d..8cb98eb65 100644 --- a/debian/installer/mips/package-list +++ b/debian/installer/mips/package-list @@ -7,6 +7,3 @@ Package: kernel-image Provides: ext2-modules, ext3-modules, ext4-modules, rtc-modules Provides_4kc-malta: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules Provides_sb1-bcm91250a: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/mipsel/package-list b/debian/installer/mipsel/package-list index 76c81fd51..47081921d 100644 --- a/debian/installer/mipsel/package-list +++ b/debian/installer/mipsel/package-list @@ -8,6 +8,3 @@ Provides_sb1-bcm91250a: ata-modules, ext2-modules, ext3-modules, ext4-modules, r Provides_r5k-cobalt: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules Provides_4kc-malta: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules Provides_loongson-2f: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/package-list b/debian/installer/package-list index 9e049402d..ac5e5221d 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -308,7 +308,7 @@ Description: Common PCMCIA NIC drivers This package contains common PCMCIA NIC drivers for the kernel. Package: pcmcia-modules -Depends: kernel-image +Depends: kernel-image, core-modules Priority: standard Description: Common PCMCIA drivers This package contains common PCMCIA drivers for the kernel. diff --git a/debian/installer/powerpc/package-list b/debian/installer/powerpc/package-list index b2d4246b2..798bdf521 100644 --- a/debian/installer/powerpc/package-list +++ b/debian/installer/powerpc/package-list @@ -7,12 +7,6 @@ Package: pata-modules Depends: kernel-image, ata-modules, core-modules -Package: scsi-modules -Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules - -Package: pcmcia-modules -Depends: kernel-image, core-modules - Package: nic-pcmcia-modules Depends: kernel-image, nic-modules, nic-shared-modules, nic-wireless-modules, pcmcia-modules, core-modules @@ -29,6 +23,3 @@ Priority: standard Description: Apple powermac fancontrol modules Contains drivers for macintosh i2c bus as well as for the monitoring devices connected to it. This allows to control the fans during installation. - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/s390/package-list b/debian/installer/s390/package-list index 3153a7178..74d4691e1 100644 --- a/debian/installer/s390/package-list +++ b/debian/installer/s390/package-list @@ -3,7 +3,6 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: kernel-image Package: dasd-modules Depends: kernel-image @@ -18,6 +17,3 @@ Description: optional dasd DIAG support This package contains the module for dasd DIAG support. The udeb is not loaded by default as the installer does not actually support this. It can however be useful to have available in rescue situations. - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/s390x/package-list b/debian/installer/s390x/package-list index 3153a7178..74d4691e1 100644 --- a/debian/installer/s390x/package-list +++ b/debian/installer/s390x/package-list @@ -3,7 +3,6 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: kernel-image Package: dasd-modules Depends: kernel-image @@ -18,6 +17,3 @@ Description: optional dasd DIAG support This package contains the module for dasd DIAG support. The udeb is not loaded by default as the installer does not actually support this. It can however be useful to have available in rescue situations. - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/sh4/package-list b/debian/installer/sh4/package-list index bdcefca5b..8d1891f5e 100644 --- a/debian/installer/sh4/package-list +++ b/debian/installer/sh4/package-list @@ -8,9 +8,3 @@ Provides: event-modules, ext3-modules, fb-modules, input-modules, mouse-modules, Package: nic-modules Depends: kernel-image, core-modules, firewire-core-modules - -Package: firewire-core-modules -Depends: kernel-image, scsi-core-modules, crc-modules - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/sparc/package-list b/debian/installer/sparc/package-list index 856217570..1e5e2f638 100644 --- a/debian/installer/sparc/package-list +++ b/debian/installer/sparc/package-list @@ -3,7 +3,6 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: kernel-image Package: nic-modules Priority: standard @@ -14,6 +13,3 @@ Description: Network card modules for Sparc kernels . Do not install this package on a real Debian system! You probably want a kernel-image package instead. - -Package: nbd-modules -Depends: kernel-image diff --git a/debian/installer/sparc64/package-list b/debian/installer/sparc64/package-list index 856217570..1e5e2f638 100644 --- a/debian/installer/sparc64/package-list +++ b/debian/installer/sparc64/package-list @@ -3,7 +3,6 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: kernel-image Package: nic-modules Priority: standard @@ -14,6 +13,3 @@ Description: Network card modules for Sparc kernels . Do not install this package on a real Debian system! You probably want a kernel-image package instead. - -Package: nbd-modules -Depends: kernel-image