Merge ~bdrung/ubuntu/+source/initramfs-tools:ubuntu/devel-drm into 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.

Unmerged commits

46930e7... by Benjamin Drung on 2024-03-19

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

b9b76a9... by Benjamin Drung on 2024-03-19

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`.

fbb52a3... by Benjamin Drung on 2024-03-19

framebuffer: Drop not existing fbcon video kernel module

`fbcon` is not a kernel module. `fbcon.o` is compiled into the kernel if
`CONFIG_FRAMEBUFFER_CONSOLE` is set to yes.

0b771f4... by Benjamin Drung on 2024-03-19

autopkgtest: Increase QEMU timeouts on arm64/armhf

In case the arm64/armhf autopkgtest runners are under load, the
autopkgtests can run into the QEMU timeout.

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

8a45f5d... by Daniel van Vugt on 2024-03-15

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, LP: #1869655).

bc091d3... by Benjamin Drung on 2024-03-14

Release initramfs-tools 0.142ubuntu22

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

e3dd2c8... by Benjamin Drung on 2024-03-12

autopkgtest: update systemd-udevd path from /lib to /usr/lib

03f6b0c... by Benjamin Drung on 2024-03-11

Release initramfs-tools 0.142ubuntu21

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

65085fe... by Benjamin Drung on 2024-03-11

Replace obsolete pkg-config build-dependency by pkgconf

22b0b82... by Benjamin Drung on 2024-03-11

Copy /etc/passwd into the initramfs to allow dhcpcd running as dhcpcd user

`ps_init` from `dhcpcd` will spit out this warning in case there is no
busybox included it the initramfs:

```
getpwnam: No such file or directory
```

If busybox is included in the initramfs, the error message from `ps_init` changes to:

```
no such user dhcpcd
```

See https://github.com/NetworkConfiguration/dhcpcd/issues/305

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..42eda44
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+.#*
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..bc79963
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,7 @@
+/*.debhelper
+/*.debhelper.log
+/*.substvars
+/.debhelper
+/files
+/initramfs-tools/
+/initramfs-tools-core/
diff --git a/debian/tests/test-common b/debian/tests/test-common
index 2b5a52f..ae3da72 100644
--- a/debian/tests/test-common
+++ b/debian/tests/test-common
@@ -15,12 +15,21 @@ fi
 
 case "$(dpkg --print-architecture)" in
 arm64)
+<<<<<<< debian/tests/test-common
 	# Slowest execution seen in Ubuntu arm64 autopkgtest: 562 seconds
 	QEMU_TIMEOUT=1200
 	;;
 armhf)
 	# Slowest execution seen in Ubuntu armhf autopkgtest: 145 seconds
 	QEMU_TIMEOUT=300
+=======
+	# The Ubuntu arm64 autopkgtest runs rarely into the 1200 seconds timeout.
+	QEMU_TIMEOUT=1800
+	;;
+armhf)
+	# qemu-busybox on Ubuntu armhf runs into the 300 seconds timeout.
+	QEMU_TIMEOUT=600
+>>>>>>> debian/tests/test-common
 	;;
 ppc64el)
 	# Slowest execution seen in Ubuntu ppc64el autopkgtest: 230 seconds
diff --git a/hook-functions b/hook-functions
index 33e03e6..be645f3 100644
--- a/hook-functions
+++ b/hook-functions
@@ -691,6 +691,18 @@ auto_add_modules()
 			;;
 			esac
 		;;
+<<<<<<< hook-functions
+=======
+		drm)
+			# 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"
+		;;
+>>>>>>> hook-functions
 		hw_random)
 			modules="$modules =drivers/char/hw_random"
 		;;
@@ -747,6 +759,13 @@ auto_add_modules()
 			modules="$modules pwm_imx27 nwl-dsi ti-sn65dsi86 imx-dcss"
 			modules="$modules mux-mmio mxsfb imx8mq-interconnect"
 		;;
+<<<<<<< hook-functions
+=======
+		fbdev)
+			# Video drivers from drivers/video/fbdev
+			modules="$modules efifb simplefb vesafb vga16fb"
+		;;
+>>>>>>> hook-functions
 		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 7820fd6..79ca27e 100755
--- a/hooks/framebuffer
+++ b/hooks/framebuffer
@@ -19,6 +19,7 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
+<<<<<<< hooks/framebuffer
 manual_add_modules "=drivers/char/agp" "=drivers/gpu" "=ubuntu/i915" \
 	fbcon vesafb vga16fb vboxvideo
 
@@ -41,3 +42,26 @@ for x in "${MODULESDIR}"/initrd/*; do
 
 	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 drm fbdev
+
+	for x in "${MODULESDIR}"/initrd/*; do
+		x=${x##*/}
+		x=${x%.*}
+		case ${x} in
+		'*')
+			break
+			;;
+		*fb)
+			;;
+		esac
+
+		manual_add_modules "${x}"
+	done
+fi
+>>>>>>> hooks/framebuffer