From 9235dbdde87d9b61c0b1e4031f1ce7e7bb631709 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 12 Feb 2019 20:39:16 +0000 Subject: [PATCH] udeb: Add fb-modules and include drm and drm_kms_helper on most architecures The previous version failed to build on alpha: debian/virtio-modules-4.19.0-3-alpha-generic-di lib/modules/4.19.0-3-alpha-generic/kernel/drivers/i2c/i2c-core.ko debian/i2c-modules-4.19.0-3-alpha-generic-di lib/modules/4.19.0-3-alpha-generic/kernel/drivers/i2c/i2c-core.ko and sparc64: debian/virtio-modules-4.19.0-3-sparc64-di lib/modules/4.19.0-3-sparc64/kernel/drivers/i2c/i2c-core.ko debian/nic-modules-4.19.0-3-sparc64-di lib/modules/4.19.0-3-sparc64/kernel/drivers/i2c/i2c-core.ko sparc64 was missing a i2c-modules package, but adding that just gets it to the same state as alpha. On both architectures drm_kms_helper is included in the virtio-modules package as a dependency of virtio-gpu, and then i2c-core is included as a dependency of drm_kms_helper. I don't think it makes sense to make virtio-modules directly depend on i2c-modules. (In fact I think virtio-modules was a mistake entirely.) Instead, for all configurations that enable both DRM and virtio: 1. Add an fb-modules package if it doesn't already exist 2. Include drm and drm_kms_helper in it --- debian/changelog | 2 ++ debian/installer/modules/alpha-generic/fb-modules | 1 + debian/installer/modules/amd64/fb-modules | 2 ++ debian/installer/modules/arm64/fb-modules | 2 ++ debian/installer/modules/armhf-armmp/fb-modules | 2 ++ debian/installer/modules/fb-modules | 5 +++++ debian/installer/modules/hppa-parisc64-smp/fb-modules | 6 ++---- debian/installer/modules/i386/fb-modules | 2 ++ debian/installer/modules/mips-4kc-malta/fb-modules | 1 + debian/installer/modules/mipsel-loongson-3/fb-modules | 2 ++ debian/installer/modules/powerpc-powerpc64/fb-modules | 2 ++ debian/installer/modules/powerpc/fb-modules | 2 ++ debian/installer/modules/ppc64el/fb-modules | 1 + debian/installer/modules/riscv64/fb-modules | 1 + debian/installer/modules/sparc64/fb-modules | 1 + 15 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 debian/installer/modules/alpha-generic/fb-modules create mode 100644 debian/installer/modules/fb-modules create mode 100644 debian/installer/modules/mips-4kc-malta/fb-modules create mode 100644 debian/installer/modules/powerpc-powerpc64/fb-modules create mode 100644 debian/installer/modules/ppc64el/fb-modules create mode 100644 debian/installer/modules/riscv64/fb-modules create mode 100644 debian/installer/modules/sparc64/fb-modules diff --git a/debian/changelog b/debian/changelog index 306d52080..4a0f19c48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ linux (4.19.20-2) UNRELEASED; urgency=medium * udeb: Make nic-wireless-modules depend on mmc-core-modules, not mmc-modules * [powerpc*] udeb: Add i2c-modules, mmc-core-modules, nic-wireless-modules * [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 -- Ben Hutchings Tue, 12 Feb 2019 12:49:10 +0000 diff --git a/debian/installer/modules/alpha-generic/fb-modules b/debian/installer/modules/alpha-generic/fb-modules new file mode 100644 index 000000000..aba524d90 --- /dev/null +++ b/debian/installer/modules/alpha-generic/fb-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/amd64/fb-modules b/debian/installer/modules/amd64/fb-modules index 06fb9d2f8..8e9892fea 100644 --- a/debian/installer/modules/amd64/fb-modules +++ b/debian/installer/modules/amd64/fb-modules @@ -1,2 +1,4 @@ +#include + vesafb ? vga16fb diff --git a/debian/installer/modules/arm64/fb-modules b/debian/installer/modules/arm64/fb-modules index f96aaeada..81e866bc1 100644 --- a/debian/installer/modules/arm64/fb-modules +++ b/debian/installer/modules/arm64/fb-modules @@ -1,2 +1,4 @@ +#include + ast tegra-drm diff --git a/debian/installer/modules/armhf-armmp/fb-modules b/debian/installer/modules/armhf-armmp/fb-modules index 8ec57ab80..f3d4b2a64 100644 --- a/debian/installer/modules/armhf-armmp/fb-modules +++ b/debian/installer/modules/armhf-armmp/fb-modules @@ -1,3 +1,5 @@ +#include + imxdrm dw_hdmi-imx tegra-drm diff --git a/debian/installer/modules/fb-modules b/debian/installer/modules/fb-modules new file mode 100644 index 000000000..cfc8d5a9c --- /dev/null +++ b/debian/installer/modules/fb-modules @@ -0,0 +1,5 @@ +# We don't include all DRM drivers here as on many platforms we can +# call system firmware to get hold of a simple framebuffer + +drm +drm_kms_helper diff --git a/debian/installer/modules/hppa-parisc64-smp/fb-modules b/debian/installer/modules/hppa-parisc64-smp/fb-modules index acaf53bba..d0424dc9f 100644 --- a/debian/installer/modules/hppa-parisc64-smp/fb-modules +++ b/debian/installer/modules/hppa-parisc64-smp/fb-modules @@ -1,6 +1,4 @@ -drm ? -drm_kms_helper ? +#include + radeon ? ttm ? - - diff --git a/debian/installer/modules/i386/fb-modules b/debian/installer/modules/i386/fb-modules index b664dcb55..9602502af 100644 --- a/debian/installer/modules/i386/fb-modules +++ b/debian/installer/modules/i386/fb-modules @@ -1,3 +1,5 @@ +#include + lxfb ? vesafb ? vga16fb diff --git a/debian/installer/modules/mips-4kc-malta/fb-modules b/debian/installer/modules/mips-4kc-malta/fb-modules new file mode 100644 index 000000000..aba524d90 --- /dev/null +++ b/debian/installer/modules/mips-4kc-malta/fb-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/mipsel-loongson-3/fb-modules b/debian/installer/modules/mipsel-loongson-3/fb-modules index b2b61da1d..0104d9ed3 100644 --- a/debian/installer/modules/mipsel-loongson-3/fb-modules +++ b/debian/installer/modules/mipsel-loongson-3/fb-modules @@ -1,3 +1,5 @@ +#include + radeon ast sm750fb diff --git a/debian/installer/modules/powerpc-powerpc64/fb-modules b/debian/installer/modules/powerpc-powerpc64/fb-modules new file mode 100644 index 000000000..98c5ecc31 --- /dev/null +++ b/debian/installer/modules/powerpc-powerpc64/fb-modules @@ -0,0 +1,2 @@ +# We *don't* want the extra modules listed in powerpc/fb-modules +#include diff --git a/debian/installer/modules/powerpc/fb-modules b/debian/installer/modules/powerpc/fb-modules index 29bfc4c39..3a53ab269 100644 --- a/debian/installer/modules/powerpc/fb-modules +++ b/debian/installer/modules/powerpc/fb-modules @@ -1,3 +1,5 @@ +#include + # 32-bit PowerMacs mostly have either ATI Rage 128 or Radeon graphics # chips for which the offb driver doesn't work properly. aty128fb is # currently built-in but that could plausibly change in future. diff --git a/debian/installer/modules/ppc64el/fb-modules b/debian/installer/modules/ppc64el/fb-modules new file mode 100644 index 000000000..aba524d90 --- /dev/null +++ b/debian/installer/modules/ppc64el/fb-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/riscv64/fb-modules b/debian/installer/modules/riscv64/fb-modules new file mode 100644 index 000000000..aba524d90 --- /dev/null +++ b/debian/installer/modules/riscv64/fb-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/sparc64/fb-modules b/debian/installer/modules/sparc64/fb-modules new file mode 100644 index 000000000..aba524d90 --- /dev/null +++ b/debian/installer/modules/sparc64/fb-modules @@ -0,0 +1 @@ +#include