Merge ~bdrung/ubuntu/+source/initramfs-tools:ubuntu/devel-drm into ~ubuntu-core-dev/ubuntu/+source/initramfs-tools:ubuntu/devel

[Benjamin Drung]

Implement https://bugs.launchpad.net/ubuntu/+source/plymouth/+bug/1970069/comments/95

There is an alternative: Only pick the first two commits (move framebuffer drivers into auto_add_modules) and then drop the framebuffer hook (Debian dropped that hook a long time ago) and just let Plymouth call:

```
if [ "${MODULES-}" = "dep" ]; then
 if [ -e /sys/class/drm ]; then
  class_add_modules drm
 fi
elif [ "$MODULES" != "list" ]; then
 auto_add_modules drm fbdev

 for x in "${MODULESDIR}"/initrd/*; do
  x=${x##*/}
  x=${x%.*}
  case ${x} in
  '*')
   break
   ;;
  *fb)
   ;;
  esac

  manual_add_modules "${x}"
 done
fi
```

The clear separation to initramfs-tools are auto_add_modules and class_add_modules in this case.

[Daniel van Vugt (vanvugt)]

> framebuffer: Drop not existing fbcon video kernel module

I believe we should still be including drivers that might be built as a module in some kernels (like simpledrm and efifb in older Ubuntu kernels). fbcon is potentially needed to provide the console on which the disk unlock prompt appears if there is no working Plymouth. But maybe that dependency on fbcon belongs elsewhere with the disk unlock prompt...

[Daniel van Vugt (vanvugt)]

> There is an alternative: Only pick the first two commits (move framebuffer drivers into auto_add_modules) and then drop the framebuffer hook (Debian dropped that hook a long time ago)

There have been moments where I wondered if FRAMEBUFFER=y needs to exist, but I think it's good to keep because:

 * It's simpler for consumers.
 * It prevents other packages from accidentally pulling in more drivers than they need to (like Plymouth does right now).
 * It prevents other packages from having to learn new syntax.
 * I don't think there should be a "drm" class because it implies the full set of large DRM drivers that we _don't_ want.

4f00055... by Benjamin Drung on 2024-03-20

Move adding framebuffer drivers into auto_add_modules

The hook function `auto_add_modules` contains all the logic for
selecting kernel modules. So move adding the framebuffer drivers from
the framebuffer hook into `auto_add_modules`.

93079d6... by Benjamin Drung on 2024-03-20

framebuffer: Drop looking in $MODULESDIR/initrd/ for kernel modules

The `${MODULESDIR}/initrd` kernel directory is a relic from the Linux
kernel. Looking in this (now empty) directory can be dropped (according
to Timo Aaltonen).

bc9b014... by Benjamin Drung on 2024-03-20

Support MODULES=dep in framebuffer hook

Import MODULES=dep logic from plymouth except for excluding specific
modules in this case. The git history did not reveal a reason for
excluding those modules and we want the system loaded modules in the
`MODULES=dep` mode.

LP: #1970069

4291791... by Benjamin Drung on 2024-03-20

Release initramfs-tools 0.142ubuntu23

Signed-off-by: Benjamin Drung <email address hidden>

[Benjamin Drung (bdrung)]

* Dropped the "framebuffer: Drop not existing fbcon video kernel module" commit
* renamed "drm" to "minimal_drm" to make the purpose clearer
* dropped the $MODULESDIR/initrd/ code (checked with the kernel team)

Please re-review.

[Daniel van Vugt (vanvugt)]

Looks fine, but is "${MODULES-}" a typo? Is it meant to look different to "$MODULES" below it?

[Daniel van Vugt (vanvugt)]

review: Needs Information

[Benjamin Drung (bdrung)]

The "${MODULES-}" is used in case "set -u" is used. See https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html

Thanks for your review. I'll use that syntax for the second occurrence and release that new version.

diff --git a/debian/changelog b/debian/changelog
index b45ac16..b9d94a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+initramfs-tools (0.142ubuntu23) noble; urgency=medium
+
+  [ Daniel van Vugt ]
+  * hooks/framebuffer: Only add simple/tiny framebuffer drivers. This is to
+    limit the size of initrd when FRAMEBUFFER=y is soon enabled for desktop
+    installations (LP: #1970069, #1869655).
+
+  [ Benjamin Drung ]
+  * autopkgtest: Increase QEMU timeouts on arm64/armhf
+  * hooks/framebuffer:
+    - Move adding framebuffer drivers into auto_add_modules
+    - Drop looking in $MODULESDIR/initrd/ for kernel modules
+    - Support MODULES=dep in framebuffer hook
+
+ -- Benjamin Drung <[e-mail]>  Wed, 20 Mar 2024 11:57:22 +0100
+
 initramfs-tools (0.142ubuntu22) noble; urgency=medium
 
   * autopkgtest: update systemd-udevd path from /lib to /usr/lib
diff --git a/hook-functions b/hook-functions
index 33e03e6..8aa8dec 100644
--- a/hook-functions
+++ b/hook-functions
@@ -747,6 +747,19 @@ auto_add_modules()
 			modules="$modules pwm_imx27 nwl-dsi ti-sn65dsi86 imx-dcss"
 			modules="$modules mux-mmio mxsfb imx8mq-interconnect"
 		;;
+		fbdev)
+			# Video drivers from drivers/video/fbdev
+			modules="$modules efifb fbcon simplefb vesafb vga16fb"
+		;;
+		minimal_drm)
+			# Minimal required set of Direct Rendering Manager (DRM) drivers for video
+			modules="$modules =drivers/gpu/drm/tiny vboxvideo virtio-gpu"
+			# if there is a privacy screen then its driver must be loaded before the
+			# kms driver will bind, otherwise its probe() will return -EPROBE_DEFER
+			# So include privacy screen providers
+			# atm all providers live under drivers/platform/x86
+			manual_add_modules -s "drm_privacy_screen_register" "=drivers/platform/x86"
+		;;
 		virtual)
 			# Hyper-V
 			modules="$modules hv_vmbus hv_utils hv_netvsc hv_mouse hv_storvsc hyperv-keyboard"
diff --git a/hooks/framebuffer b/hooks/framebuffer
index c559efd..336fc85 100755
--- a/hooks/framebuffer
+++ b/hooks/framebuffer
@@ -19,25 +19,10 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
-manual_add_modules "=drivers/gpu/drm/tiny" \
-	fbcon vesafb vga16fb vboxvideo simplefb efifb virtio-gpu
-
-# if there is a privacy screen then its driver must be loaded before the
-# kms driver will bind, otherwise its probe() will return -EPROBE_DEFER
-# So include privacy screen providers
-# atm all providers live under drivers/platform/x86
-manual_add_modules -s "drm_privacy_screen_register" "=drivers/platform/x86"
-
-for x in "${MODULESDIR}"/initrd/*; do
-	x=${x##*/}
-	x=${x%.*}
-	case ${x} in
-	'*')
-		break
-		;;
-	*fb)
-		;;
-	esac
-
-	manual_add_modules "${x}"
-done
+if [ "${MODULES-}" = "dep" ]; then
+	if [ -e /sys/class/drm ]; then
+		class_add_modules drm
+	fi
+elif [ "$MODULES" != "list" ]; then
+	auto_add_modules fbdev minimal_drm
+fi