[linux] 04/05: udeb: Fold core-modules into kernel-image
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Oct 2 01:22:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit b324a81a22fcb0fb1d64f5e6e1238102f61b58c9
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Oct 2 02:10:26 2016 +0100
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.
---
debian/changelog | 1 +
.../alpha/modules/alpha-generic/core-modules | 1 -
.../alpha/modules/alpha-generic/kernel-image | 2 +-
debian/installer/amd64/modules/amd64/core-modules | 1 -
debian/installer/amd64/modules/amd64/kernel-image | 2 +-
debian/installer/arm64/modules/arm64/core-modules | 7 ----
debian/installer/arm64/modules/arm64/kernel-image | 8 ++++-
.../armel/modules/armel-marvell/core-modules | 1 -
.../armel/modules/armel-marvell/kernel-image | 2 +-
.../armel/modules/armel-versatile/core-modules | 1 -
.../armel/modules/armel-versatile/kernel-image | 2 +-
.../armhf/modules/armhf-armmp/core-modules | 17 ----------
.../armhf/modules/armhf-armmp/kernel-image | 18 ++++++++++-
.../hppa/modules/hppa-parisc64-smp/core-modules | 1 -
.../hppa/modules/hppa-parisc64-smp/kernel-image | 2 +-
debian/installer/hppa/modules/hppa/core-modules | 1 -
debian/installer/hppa/modules/hppa/kernel-image | 2 +-
debian/installer/i386/modules/i386/core-modules | 1 -
debian/installer/i386/modules/i386/kernel-image | 2 +-
debian/installer/m68k/modules/m68k/core-modules | 1 -
debian/installer/m68k/modules/m68k/kernel-image | 2 +-
.../mips/modules/mips-4kc-malta/core-modules | 1 -
.../mips/modules/mips-4kc-malta/kernel-image | 2 +-
.../mips/modules/mips-octeon/core-modules | 1 -
.../mips/modules/mips-octeon/kernel-image | 2 +-
debian/installer/mips/modules/mips/core-modules | 1 -
debian/installer/mips/modules/mips/kernel-image | 2 +-
.../mipsel/modules/mipsel-loongson-3/core-modules | 1 -
.../mipsel/modules/mipsel-loongson-3/kernel-image | 2 +-
.../modules/{core-modules => kernel-image} | 0
debian/installer/package-list | 37 +++++++++-------------
.../modules/powerpc-powerpc-miboot/core-modules | 1 -
.../powerpc/modules/powerpc-powerpc64/core-modules | 1 -
.../installer/powerpc/modules/powerpc/core-modules | 2 --
.../installer/powerpc/modules/powerpc/kernel-image | 3 +-
.../installer/ppc64el/modules/ppc64el/core-modules | 1 -
debian/installer/s390x/modules/s390x/core-modules | 2 --
debian/installer/s390x/modules/s390x/kernel-image | 3 +-
.../installer/sh4/modules/sh4-sh7751r/kernel-image | 2 +-
.../sh4/modules/sh4-sh7785lcr/kernel-image | 2 +-
.../installer/sparc64/modules/sparc64/core-modules | 1 -
.../installer/sparc64/modules/sparc64/kernel-image | 2 +-
42 files changed, 59 insertions(+), 85 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c76bc56..7ceac16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/installer/alpha/modules/alpha-generic/core-modules b/debian/installer/alpha/modules/alpha-generic/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/alpha/modules/alpha-generic/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/alpha/modules/alpha-generic/kernel-image b/debian/installer/alpha/modules/alpha-generic/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/alpha/modules/alpha-generic/kernel-image
+++ b/debian/installer/alpha/modules/alpha-generic/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/amd64/modules/amd64/core-modules b/debian/installer/amd64/modules/amd64/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/amd64/modules/amd64/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/amd64/modules/amd64/kernel-image b/debian/installer/amd64/modules/amd64/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/amd64/modules/amd64/kernel-image
+++ b/debian/installer/amd64/modules/amd64/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/arm64/modules/arm64/core-modules b/debian/installer/arm64/modules/arm64/core-modules
deleted file mode 100644
index 796aac4..0000000
--- a/debian/installer/arm64/modules/arm64/core-modules
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <core-modules>
-
-# Regulators
-drivers/regulator/**
-
-# SoC modules
-drivers/soc/**
diff --git a/debian/installer/arm64/modules/arm64/kernel-image b/debian/installer/arm64/modules/arm64/kernel-image
index 1bb8bf6..6b6fb41 100644
--- a/debian/installer/arm64/modules/arm64/kernel-image
+++ b/debian/installer/arm64/modules/arm64/kernel-image
@@ -1 +1,7 @@
-# empty
+#include <kernel-image>
+
+# Regulators
+drivers/regulator/**
+
+# SoC modules
+drivers/soc/**
diff --git a/debian/installer/armel/modules/armel-marvell/core-modules b/debian/installer/armel/modules/armel-marvell/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/armel/modules/armel-marvell/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/armel/modules/armel-marvell/kernel-image b/debian/installer/armel/modules/armel-marvell/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/armel/modules/armel-marvell/kernel-image
+++ b/debian/installer/armel/modules/armel-marvell/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/armel/modules/armel-versatile/core-modules b/debian/installer/armel/modules/armel-versatile/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/armel/modules/armel-versatile/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/armel/modules/armel-versatile/kernel-image b/debian/installer/armel/modules/armel-versatile/kernel-image
index 8b13789..1d11b19 100644
--- a/debian/installer/armel/modules/armel-versatile/kernel-image
+++ b/debian/installer/armel/modules/armel-versatile/kernel-image
@@ -1 +1 @@
-
+#include <kernel-image>
diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
deleted file mode 100644
index ff4ff9f..0000000
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ /dev/null
@@ -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/**
diff --git a/debian/installer/armhf/modules/armhf-armmp/kernel-image b/debian/installer/armhf/modules/armhf-armmp/kernel-image
index 1bb8bf6..edd1bf7 100644
--- a/debian/installer/armhf/modules/armhf-armmp/kernel-image
+++ b/debian/installer/armhf/modules/armhf-armmp/kernel-image
@@ -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/**
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/core-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/core-modules
deleted file mode 100644
index cb29dfa..0000000
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../hppa/core-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image b/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image
index 1bb8bf6..93d59f5 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image
@@ -1 +1 @@
-# empty
+#include "../hppa/kernel-image"
diff --git a/debian/installer/hppa/modules/hppa/core-modules b/debian/installer/hppa/modules/hppa/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/hppa/modules/hppa/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/hppa/modules/hppa/kernel-image b/debian/installer/hppa/modules/hppa/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/hppa/modules/hppa/kernel-image
+++ b/debian/installer/hppa/modules/hppa/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/i386/modules/i386/core-modules b/debian/installer/i386/modules/i386/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/i386/modules/i386/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/i386/modules/i386/kernel-image b/debian/installer/i386/modules/i386/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/i386/modules/i386/kernel-image
+++ b/debian/installer/i386/modules/i386/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/m68k/modules/m68k/core-modules b/debian/installer/m68k/modules/m68k/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/m68k/modules/m68k/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/m68k/modules/m68k/kernel-image b/debian/installer/m68k/modules/m68k/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/m68k/modules/m68k/kernel-image
+++ b/debian/installer/m68k/modules/m68k/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/mips/modules/mips-4kc-malta/core-modules b/debian/installer/mips/modules/mips-4kc-malta/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/mips/modules/mips-4kc-malta/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/mips/modules/mips-4kc-malta/kernel-image b/debian/installer/mips/modules/mips-4kc-malta/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/kernel-image
+++ b/debian/installer/mips/modules/mips-4kc-malta/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/mips/modules/mips-octeon/core-modules b/debian/installer/mips/modules/mips-octeon/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/mips/modules/mips-octeon/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/kernel-image b/debian/installer/mips/modules/mips-octeon/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/mips/modules/mips-octeon/kernel-image
+++ b/debian/installer/mips/modules/mips-octeon/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/mips/modules/mips/core-modules b/debian/installer/mips/modules/mips/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/mips/modules/mips/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/mips/modules/mips/kernel-image b/debian/installer/mips/modules/mips/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/mips/modules/mips/kernel-image
+++ b/debian/installer/mips/modules/mips/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/core-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/kernel-image b/debian/installer/mipsel/modules/mipsel-loongson-3/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/kernel-image
+++ b/debian/installer/mipsel/modules/mipsel-loongson-3/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
diff --git a/debian/installer/modules/core-modules b/debian/installer/modules/kernel-image
similarity index 100%
rename from debian/installer/modules/core-modules
rename to debian/installer/modules/kernel-image
diff --git a/debian/installer/package-list b/debian/installer/package-list
index fbaee3a..a170318 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -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.
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/core-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/core-modules
deleted file mode 100644
index e789d4b..0000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/core-modules"
diff --git a/debian/installer/powerpc/modules/powerpc/core-modules b/debian/installer/powerpc/modules/powerpc/core-modules
deleted file mode 100644
index 73e336a..0000000
--- a/debian/installer/powerpc/modules/powerpc/core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <core-modules>
-bestcomm-core ?
diff --git a/debian/installer/powerpc/modules/powerpc/kernel-image b/debian/installer/powerpc/modules/powerpc/kernel-image
index 1bb8bf6..b17bb59 100644
--- a/debian/installer/powerpc/modules/powerpc/kernel-image
+++ b/debian/installer/powerpc/modules/powerpc/kernel-image
@@ -1 +1,2 @@
-# empty
+#include <kernel-image>
+bestcomm-core ?
diff --git a/debian/installer/ppc64el/modules/ppc64el/core-modules b/debian/installer/ppc64el/modules/ppc64el/core-modules
deleted file mode 100644
index b5c598d..0000000
--- a/debian/installer/ppc64el/modules/ppc64el/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/core-modules"
diff --git a/debian/installer/s390x/modules/s390x/core-modules b/debian/installer/s390x/modules/s390x/core-modules
deleted file mode 100644
index 892a30f..0000000
--- a/debian/installer/s390x/modules/s390x/core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <core-modules>
-vmcp ?
diff --git a/debian/installer/s390x/modules/s390x/kernel-image b/debian/installer/s390x/modules/s390x/kernel-image
index 1bb8bf6..fd8c3a7 100644
--- a/debian/installer/s390x/modules/s390x/kernel-image
+++ b/debian/installer/s390x/modules/s390x/kernel-image
@@ -1 +1,2 @@
-# empty
+#include <kernel-image>
+vmcp ?
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/kernel-image b/debian/installer/sh4/modules/sh4-sh7751r/kernel-image
index 8b13789..1d11b19 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/kernel-image
+++ b/debian/installer/sh4/modules/sh4-sh7751r/kernel-image
@@ -1 +1 @@
-
+#include <kernel-image>
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/kernel-image b/debian/installer/sh4/modules/sh4-sh7785lcr/kernel-image
index 8b13789..1d11b19 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/kernel-image
+++ b/debian/installer/sh4/modules/sh4-sh7785lcr/kernel-image
@@ -1 +1 @@
-
+#include <kernel-image>
diff --git a/debian/installer/sparc64/modules/sparc64/core-modules b/debian/installer/sparc64/modules/sparc64/core-modules
deleted file mode 100644
index f05d062..0000000
--- a/debian/installer/sparc64/modules/sparc64/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/kernel-image b/debian/installer/sparc64/modules/sparc64/kernel-image
index 1bb8bf6..1d11b19 100644
--- a/debian/installer/sparc64/modules/sparc64/kernel-image
+++ b/debian/installer/sparc64/modules/sparc64/kernel-image
@@ -1 +1 @@
-# empty
+#include <kernel-image>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list