postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally (MR 2242)

This replaces the dependency on osk-sdl with a dependency on a
postmarketos-fde-unlocker virt. package

osk-sdl and its dependencies are also added contitionally to the initfs,
based on whether the osk-sdl exe is installed in the rootfs

Also see:
https://gitlab.com/postmarketOS/pmbootstrap/-/merge_requests/2066

main/postmarketos-mkinitfs/APKBUILD

 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-mkinitfs
-pkgver=0.26
-pkgrel=2
+pkgver=0.27
+pkgrel=0
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
 depends="
 	busybox-extras
 	bzip2
-	multipath-tools
 	cryptsetup
 	device-mapper
 	e2fsprogs
@@ -16,8 +15,9 @@ depends="
 	kmod
 	lddtree
 	lz4
-	osk-sdl>=0.64
+	multipath-tools
 	parted
+	postmarketos-fde-unlocker
 	xz
 	"
 replaces="mkinitfs"
@@ -56,6 +56,6 @@ sha512sums="
 1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67  init.sh.in
 393791a7db328d45db7c3b7836ed93208f8b64a6c08a219d31f5a51a167b75ac32407179ae33ef3f72e33fae35c48f676cf526dae190b231d1a766b9a0ad0fb6  init_functions.sh
 54c8ea6c4b5313c0ca82bbc40498a35d4b5cbcdbf950dc01b5025238ea6b8caa2f9a9ee57a269fb78673fbcac186c33243188458ecda45deb3354d5d8a77fdfe  mkinitfs.sh
-d092986d6700ba823d968a576d73db128b1180889fae5f973cd012536c30746141f890b8f05e6a17b49812851e25f3df19ef08c70d4dff6bb1e85b5f4fab6b07  mkinitfs_functions.sh
+6b8de5dc13aef9c8090bc4e307b142887e4e3bf1851fe498845be64f7d1ba65d243c1bcb29fbd1b108be2a5067349be1461838573505c9d23e06a680265a4ec3  mkinitfs_functions.sh
 c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622  mkinitfs_test.sh
 "

main/postmarketos-mkinitfs/mkinitfs_functions.sh

@@ -214,29 +214,34 @@ get_osk_config()
 get_binaries_extra()
 {
 	BINARIES_EXTRA="
-		$(find /usr/lib/directfb-* -name '*.so')
 		/lib/libz.so.1
-		/sbin/cryptsetup
 		/sbin/dmsetup
 		/sbin/e2fsck
-		/usr/bin/osk-sdl
-		/usr/lib/libGL.so.1
-		/usr/lib/libts*
-		/usr/lib/ts/*
 		/usr/sbin/parted
 		/usr/sbin/resize2fs
 		/usr/sbin/resize.f2fs
 	"
 
-	if [ -n "$deviceinfo_mesa_driver" ]; then
+	if [ -x /usr/bin/osk-sdl ]; then
 		BINARIES_EXTRA="
 			$BINARIES_EXTRA
-			/usr/lib/libEGL.so.1
-			/usr/lib/libGLESv2.so.2
-			/usr/lib/libgbm.so.1
-			/usr/lib/libudev.so.1
-			/usr/lib/xorg/modules/dri/${deviceinfo_mesa_driver}_dri.so
+			$(find /usr/lib/directfb-* -name '*.so')
+			/usr/bin/osk-sdl
+			/sbin/cryptsetup
+			/usr/lib/libGL.so.1
+			/usr/lib/libts*
+			/usr/lib/ts/*
 		"
+		if [ -n "$deviceinfo_mesa_driver" ]; then
+			BINARIES_EXTRA="
+				$BINARIES_EXTRA
+				/usr/lib/libEGL.so.1
+				/usr/lib/libGLESv2.so.2
+				/usr/lib/libgbm.so.1
+				/usr/lib/libudev.so.1
+				/usr/lib/xorg/modules/dri/${deviceinfo_mesa_driver}_dri.so
+			"
+		fi
 	fi
 
 	tmp1=$(mktemp /tmp/mkinitfs.XXXXXX)
@@ -497,10 +502,13 @@ generate_initramfs_extra()
 {
 	echo "==> initramfs: creating $1"
 
-	osk_conf="$(get_osk_config)"
-	if [ $? -eq 1 ]; then
-		echo "ERROR: Font specified in /etc/osk.conf does not exist!"
-		exit 1
+	osk_conf=""
+	if [ -x /usr/bin/osk-sdl ]; then
+		osk_conf="$(get_osk_config)"
+		if [ $? -eq 1 ]; then
+			echo "ERROR: Font specified in /etc/osk.conf does not exist!"
+			exit 1
+		fi
 	fi
 
 	# Set up initramfs-extra in temp folder
@@ -509,7 +517,7 @@ generate_initramfs_extra()
 	tmpdir_extra_cpio_img="$tmpdir_extra_cpio/extra.img"
 	mkdir -p "$tmpdir_extra"
 	copy_files "$(get_binaries_extra)" "$tmpdir_extra"
-	copy_files "$osk_conf" "$tmpdir_extra"
+	[ -n "$osk_conf" ] && copy_files "$osk_conf" "$tmpdir_extra"
 	create_cpio_image "$tmpdir_extra" "$tmpdir_extra_cpio_img"
 	rm -rf "$tmpdir_extra"