From cb01662a3edd26080d2bf5e2aa87081465aa1313 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 12 Feb 2019 21:06:54 +0000
Subject: [PATCH] udeb: Move basic PV modules from {hyperv,virtio}-modules to
 kernel-image

These modules will end up in every installer build, one way or
another.  Move them into kernel-image, which all other packages
depend on, so we can then split up the remaining PV drivers.
---
 debian/changelog                        | 1 +
 debian/installer/modules/hyperv-modules | 2 --
 debian/installer/modules/kernel-image   | 9 +++++++++
 debian/installer/modules/virtio-modules | 5 -----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a0f19c48..d6483c139 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (4.19.20-2) UNRELEASED; urgency=medium
   * [arm64,armhf] udeb: Add mmc-core-modules to Provides of kernel-image
   * udeb: Add fb-modules and include drm and drm_kms_helper on most
     architecures
+  * udeb: Move basic PV modules from {hyperv,virtio}-modules to kernel-image
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 12 Feb 2019 12:49:10 +0000
 
diff --git a/debian/installer/modules/hyperv-modules b/debian/installer/modules/hyperv-modules
index 4c7d2cdc4..9499774c2 100644
--- a/debian/installer/modules/hyperv-modules
+++ b/debian/installer/modules/hyperv-modules
@@ -2,6 +2,4 @@
 hid-hyperv
 hv_netvsc
 hv_storvsc
-hv_utils
-hv_vmbus
 hyperv-keyboard
diff --git a/debian/installer/modules/kernel-image b/debian/installer/modules/kernel-image
index 334f13717..6155f4707 100644
--- a/debian/installer/modules/kernel-image
+++ b/debian/installer/modules/kernel-image
@@ -8,3 +8,12 @@ mfd-core ?
 nls_base
 # Default I/O charset for most filesystems that do character conversion
 nls_utf8
+
+# Basic paravirtual modules
+hv_utils ?
+hv_vmbus ?
+virtio ?
+virtio_balloon ?
+virtio_mmio ?
+virtio_pci ?
+virtio_ring ?
diff --git a/debian/installer/modules/virtio-modules b/debian/installer/modules/virtio-modules
index a4f19afb6..a92b29624 100644
--- a/debian/installer/modules/virtio-modules
+++ b/debian/installer/modules/virtio-modules
@@ -1,13 +1,8 @@
 virtio_net
 virtio_blk
-virtio_balloon
 virtio_scsi
 virtio_input
 virtio_console
 
 # Some architectures do not build graphics
 virtio-gpu ?
-
-# Some architectures do not have PCI bus
-virtio_pci ?
-virtio_mmio ?