udeb: Fold core-modules into kernel-image
So many module packages depend on core-modules already that almost every installer image includes it. The only obvious exceptions are the sh4 installer builds, as there was no core-modules package on sh4. For consistency, include the default set of modules in its kernel-image package now.
This commit is contained in:
Ben Hutchings
parent
04774ae4fa
commit
b324a81a22
|
|
@ -5,6 +5,7 @@ linux (4.7.5-2) UNRELEASED; urgency=medium
|
|||
dpkg-buildpackage
|
||||
* linux-image: Exclude vmlinux from stripping by dh_strip (fixes FTBFS
|
||||
on hppa)
|
||||
* udeb: Fold core-modules into kernel-image
|
||||
|
||||
[ Cyril Brulebois ]
|
||||
* Add nls_ascii to the fat-modules udeb, following the change of
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
||||
# Regulators
|
||||
drivers/regulator/**
|
||||
|
||||
# SoC modules
|
||||
drivers/soc/**
|
||||
|
|
@ -1 +1,7 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
||||
# Regulators
|
||||
drivers/regulator/**
|
||||
|
||||
# SoC modules
|
||||
drivers/soc/**
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
||||
# Clocks
|
||||
clk-palmas ?
|
||||
clk-s2mps11 ?
|
||||
clk-twl6040 ?
|
||||
|
||||
# GPIO
|
||||
gpio-da9052 ?
|
||||
gpio-pca953x ?
|
||||
|
||||
# PCIe PHYs
|
||||
phy-omap-control ?
|
||||
phy-ti-pipe3 ?
|
||||
|
||||
# Regulators
|
||||
drivers/regulator/**
|
||||
|
|
@ -1 +1,17 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
||||
# Clocks
|
||||
clk-palmas ?
|
||||
clk-s2mps11 ?
|
||||
clk-twl6040 ?
|
||||
|
||||
# GPIO
|
||||
gpio-da9052 ?
|
||||
gpio-pca953x ?
|
||||
|
||||
# PCIe PHYs
|
||||
phy-omap-control ?
|
||||
phy-ti-pipe3 ?
|
||||
|
||||
# Regulators
|
||||
drivers/regulator/**
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include "../hppa/core-modules"
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include "../hppa/kernel-image"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
# architecture, which is derived from the files in the modules directory.
|
||||
#
|
||||
Package: kernel-image
|
||||
Priority: extra
|
||||
Description: Linux kernel binary image for the Debian installer
|
||||
This package contains the kernel image for the Debian installer
|
||||
boot images. It does _not_ provide a usable kernel for your full
|
||||
Priority: standard
|
||||
Description: Linux kernel image and core modules for the Debian installer
|
||||
This package contains the kernel image and core modules for the Debian
|
||||
installer boot images. It does _not_ provide a usable kernel for your full
|
||||
Debian system.
|
||||
|
||||
Package: nic-modules
|
||||
Depends: kernel-image, nic-shared-modules, core-modules, i2c-modules, crc-modules
|
||||
Depends: kernel-image, nic-shared-modules, i2c-modules, crc-modules
|
||||
Provides: nic-extra-modules
|
||||
Priority: standard
|
||||
Description: NIC drivers
|
||||
|
|
@ -18,7 +18,7 @@ Description: NIC drivers
|
|||
for the kernel.
|
||||
|
||||
Package: nic-wireless-modules
|
||||
Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, mmc-modules, pcmcia-modules, crc-modules
|
||||
Depends: kernel-image, nic-shared-modules, usb-modules, mmc-modules, pcmcia-modules, crc-modules
|
||||
Priority: standard
|
||||
Description: Wireless NIC drivers
|
||||
This package contains wireless NIC drivers for the kernel.
|
||||
|
|
@ -74,7 +74,7 @@ Description: Core SCSI subsystem
|
|||
This package contains the core SCSI subsystem for the kernel.
|
||||
|
||||
Package: scsi-modules
|
||||
Depends: kernel-image, scsi-core-modules, cdrom-core-modules, core-modules, ata-modules
|
||||
Depends: kernel-image, scsi-core-modules, cdrom-core-modules, ata-modules
|
||||
Priority: standard
|
||||
Description: SCSI drivers
|
||||
This package contains SCSI drivers for the kernel.
|
||||
|
|
@ -92,13 +92,13 @@ Description: IPv6 driver
|
|||
This package contains the IPv6 driver for the kernel.
|
||||
|
||||
Package: btrfs-modules
|
||||
Depends: kernel-image, core-modules, crc-modules, zlib-modules, lzo-modules, md-modules
|
||||
Depends: kernel-image, crc-modules, zlib-modules, lzo-modules, md-modules
|
||||
Priority: extra
|
||||
Description: BTRFS filesystem support
|
||||
This package contains the BTRFS filesystem module for the kernel.
|
||||
|
||||
Package: ext4-modules
|
||||
Depends: kernel-image, core-modules, crc-modules
|
||||
Depends: kernel-image, crc-modules
|
||||
Provides: ext2-modules, ext3-modules
|
||||
Priority: standard
|
||||
Description: ext2/ext3/ext4 filesystem support
|
||||
|
|
@ -178,7 +178,7 @@ Description: Multipath support
|
|||
This package contains DM-Multipath modules for the kernel.
|
||||
|
||||
Package: usb-modules
|
||||
Depends: kernel-image, core-modules
|
||||
Depends: kernel-image
|
||||
Priority: extra
|
||||
Description: USB support
|
||||
This package contains core USB drivers for the kernel.
|
||||
|
|
@ -226,13 +226,13 @@ Description: Common PCMCIA NIC drivers
|
|||
This package contains common PCMCIA NIC drivers for the kernel.
|
||||
|
||||
Package: pcmcia-modules
|
||||
Depends: kernel-image, core-modules
|
||||
Depends: kernel-image
|
||||
Priority: standard
|
||||
Description: Common PCMCIA drivers
|
||||
This package contains common PCMCIA drivers for the kernel.
|
||||
|
||||
Package: nic-usb-modules
|
||||
Depends: kernel-image, nic-shared-modules, nic-wireless-modules, usb-modules, core-modules, crc-modules
|
||||
Depends: kernel-image, nic-shared-modules, nic-wireless-modules, usb-modules, crc-modules
|
||||
Priority: standard
|
||||
Description: USB NIC drivers
|
||||
This package contains USB network adapter drivers for the kernel.
|
||||
|
|
@ -243,13 +243,6 @@ Priority: standard
|
|||
Description: SATA drivers
|
||||
This package contains SATA drivers for the kernel.
|
||||
|
||||
Package: core-modules
|
||||
Depends: kernel-image
|
||||
Priority: standard
|
||||
Description: Core modules
|
||||
This package contains core modules for the kernel, that will almost
|
||||
always be needed.
|
||||
|
||||
Package: acpi-modules
|
||||
Depends: kernel-image
|
||||
Priority: extra
|
||||
|
|
@ -294,13 +287,13 @@ Description: ATA disk modules
|
|||
disk drivers.
|
||||
|
||||
Package: mmc-core-modules
|
||||
Depends: kernel-image, core-modules
|
||||
Depends: kernel-image
|
||||
Priority: extra
|
||||
Description: MMC/SD/SDIO core modules
|
||||
This package contains core modules for MMC/SD/SDIO support.
|
||||
|
||||
Package: mmc-modules
|
||||
Depends: kernel-image, core-modules, mmc-core-modules, usb-modules, crc-modules
|
||||
Depends: kernel-image, mmc-core-modules, usb-modules, crc-modules
|
||||
Priority: extra
|
||||
Description: MMC/SD card modules
|
||||
This package contains modules needed to support MMC (multimedia) and
|
||||
|
|
@ -344,7 +337,7 @@ Description: uinput support
|
|||
This package contains the uinput module.
|
||||
|
||||
Package: sound-modules
|
||||
Depends: kernel-image, core-modules, i2c-modules, usb-modules, pcmcia-modules, firewire-core-modules, crc-modules
|
||||
Depends: kernel-image, i2c-modules, usb-modules, pcmcia-modules, firewire-core-modules, crc-modules
|
||||
Priority: extra
|
||||
Description: sound support
|
||||
This package contains sound modules.
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "../powerpc/core-modules"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#include <core-modules>
|
||||
bestcomm-core ?
|
||||
|
|
@ -1 +1,2 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
bestcomm-core ?
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include "../../../ppc64/modules/ppc64/core-modules"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#include <core-modules>
|
||||
vmcp ?
|
||||
|
|
@ -1 +1,2 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
vmcp ?
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include <core-modules>
|
||||
|
|
@ -1 +1 @@
|
|||
# empty
|
||||
#include <kernel-image>
|
||||
|
|
|
|||
Loading…
Reference in New Issue