Revert "main/postmarketos-mkinitfs: switch to pbsplash (MR 2878)"

This reverts commit e97b61b023.

Breaking all UIs with graphical display managers is not an
acceptable regression.

[ci:skip-vercheck]: CI thinks postmarketos-splash is a new package, but
it isn't really.

main/devicepkg-dev/APKBUILD

@@ -1,10 +1,11 @@
 pkgname=devicepkg-dev
-pkgver=0.14.0
+pkgver=0.14.1
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
 arch="all"
 license="MIT"
+depends="postmarketos-splash"
 source="
 	compiler-gcc.h
 	devicepkg_build.sh
@@ -61,7 +62,7 @@ package() {
 }
 sha512sums="
 d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
-55bf74eca4f2e486ffcc053f937d3c5acc9e5d6ecf8c022c24b400085186e91b775e843aa56c2be73d4d15e76f9f26fc1968e90c065de40e7c1833d376463eee  devicepkg_build.sh
+77dcc7bc4f90bc11f99b7bb88be171f706f7d92921b694ce862d31ab858a4b8850c9e0bdb68299ffce9f934a3c8ab16eb307fd09534085e65f0101334bd68a9d  devicepkg_build.sh
 74c1b9b265a943604d5d538ca66d4b7bcad9adcf40710ab19d795b55aac39669bf1089f7f0ec81aa7a01b537784bef4310e4acc3d7a6ba1f282ab01652bdc4d4  devicepkg_package.sh
 f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe  downstreamkernel_package.sh

main/devicepkg-dev/devicepkg_build.sh

@@ -20,6 +20,49 @@ fi
 # shellcheck disable=SC1090,SC1091
 . "$srcdir/deviceinfo"
 
+# Create splash screens
+generate_splash_screens()
+{
+	splash_config=${SPLASH_CONFIG:-/etc/postmarketos/splash.ini}
+	splash_width=${deviceinfo_screen_width:-720}
+	splash_height=${deviceinfo_screen_height:-1280}
+
+	# Overwrite $@ to easily iterate over the splash screens. Format:
+	# $1: splash_name
+	# $2: text
+	# $3: arguments
+	set -- "splash-loading"          "Loading..." "--center" \
+	       "splash-noboot"           "boot partition not found\\nhttps://postmarketos.org/troubleshooting" "--center" \
+	       "splash-noinitramfsextra" "initramfs-extra not found\\nhttps://postmarketos.org/troubleshooting" "--center" \
+	       "splash-norootfs"         "rootfs not found\\nhttps://postmarketos.org/troubleshooting" "--center" \
+	       "splash-resizefs"         "Loading...\\nResizing file system during initial boot" "--center" \
+	       "splash-mounterror"       "unable to mount root partition\\nhttps://postmarketos.org/troubleshooting" "--center" \
+	       "splash-debug-shell"      "WARNING\\ndebug-shell is active\\nhttps://postmarketos.org/debug-shell" "--center" \
+	       "splash-charging-error"   "CHARGING MODE\\nerror starting charging-sdl\\nhttps://postmarketos.org/troubleshooting" "--center" \
+	       "splash-netboot-waiting"  "Waiting for netboot...\\nhttps://postmarketos.org/netboot" "--center" \
+	       "splash-netboot-error"    "failed to initialize netboot\\nhttps://postmarketos.org/netboot" "--center"
+
+	# Loop through the splash screens definitions
+	while [ $# -gt 2 ]
+	do
+		splash_name=$1
+		splash_text=$2
+		splash_args=$3
+
+		# shellcheck disable=SC2154
+		if [ "${deviceinfo_framebuffer_landscape}" = "true" ]; then
+			splash_args="${splash_args} --landscape"
+		fi
+
+		# shellcheck disable=SC2086
+		pmos-make-splash --text="${splash_text}" $splash_args --config "${splash_config}" \
+				"$splash_width" "$splash_height" "$srcdir/${splash_name}.ppm"
+		gzip "$srcdir/${splash_name}.ppm"
+
+		shift 3 # move to the next 3 arguments
+	done
+}
+
 # Convert an input calibration matrix from pixel coordinates to 0-1 coordinates
 # and echo it for libinput.
 # Parameters:
@@ -75,6 +118,8 @@ generate_machine_info()
 	} > "$srcdir/machine-info"
 }
 
+generate_splash_screens
+
 generate_machine_info
 
 # shellcheck disable=SC2154

main/postmarketos-base/APKBUILD

@@ -1,5 +1,5 @@
 pkgname=postmarketos-base
-pkgver=26
+pkgver=26.1
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
@@ -9,7 +9,6 @@ depends="
 	alpine-base
 	eudev
 	openssh
-	postmarketos-bootsplash
 	postmarketos-mkinitfs>=1.5.1-r5
 	postmarketos-mvcfg
 	postmarketos-keys

main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh

@@ -7,7 +7,7 @@ TELNET_PORT=23
 setup_usb_network
 start_unudhcpd
 
-show_splash "WARNING: debug-shell is active\\nhttps://postmarketos.org/debug-shell"
+show_splash /splash-debug-shell.ppm.gz
 
 echo "Create 'pmos_continue_boot' script"
 {

main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD

@@ -1,5 +1,5 @@
 pkgname=postmarketos-mkinitfs-hook-debug-shell
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=0
 pkgdesc="Root shell in the initramfs (security hole, for debugging only)"
 url="https://postmarketos.org"
@@ -18,6 +18,6 @@ package() {
 }
 
 sha512sums="
-c84963c0c38b5d0633f7e7be3b36cfb5f5906509ddbd91b5dcb041a9ac82dc222811b8442ec9da01a9fc475a8e45eb931cf087845469e71d069d3b3525206423  20-debug-shell.sh
+4e464411612933d0639e3ee58e1f05b554ba14983e0596e7220dab16ed9737776646d520b2267e23f1f6822b870e20e8ae9f61b95c4fa8513c579f21da8af9d8  20-debug-shell.sh
 ca37f761c23c7fe7a351a13f535531580e740a14bb627cd65963287200a616d41c76185bed6aff3abeafe6b0ca9c61f15ee9343f1492dfdba0fe3b6d38e1d3e4  20-debug-shell.files
 "

main/postmarketos-mkinitfs-hook-netboot/APKBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Mark <clashclanacc2602@gmail.com>
 pkgname=postmarketos-mkinitfs-hook-netboot
-pkgver=3
+pkgver=3.1
 pkgrel=0
 pkgdesc="Netboot postmarketOS using nbd feature"
 url="https://postmarketos.org"
@@ -21,6 +21,6 @@ package() {
 }
 
 sha512sums="
-c4cbed2148a229df5901feb04633c7b6702a6cd2f519bc92f513923689bf5065f68c2ff86dcc143c5ae425ddd5e439d646d6a673bb98cdc74b8b43f70b966702  netboot.sh
+5c70572944bce9abd4196b4fc8c2df9f90ec7e15d2ff8fce691120ee10f120521fa57f1d2c0edd1d489e113a2b16862d9e02b716e83e6d3251d7525a5152f349  netboot.sh
 3c9c812a6cd25640e6cf4d722cff6c6356d5666ec6009b4c65f89e62211cc406d2cd09e0fdda6b1c1906ee32c3854988ab701cee8811208e3ef666f09e638568  netboot.modules
 "

main/postmarketos-mkinitfs-hook-netboot/netboot.sh

@@ -9,7 +9,7 @@ NBD_BLOCK_SIZE=${deviceinfo_rootfs_image_sector_size:-512}
 setup_usb_network
 start_unudhcpd
 
-show_splash "Waiting for netboot...\\nhttps://postmarketos.org/netboot"
+show_splash /splash-netboot-waiting.ppm.gz
 
 # Attempt to load the kernel module if CONFIG_BLK_DEV_NBD=m
 modprobe nbd
@@ -17,7 +17,7 @@ modprobe nbd
 # Check that we actually have nbd0 available, otherwise show an error screen.
 if [ ! -b /dev/nbd0 ]; then
 	echo "Failed to get /dev/nbd0, stopping."
-	show_splash "ERROR: Failed to initialise netboot\\nhttps://postmarketos.org/netboot"
+	show_splash /splash-netboot-error.ppm.gz
 	pmos_loop_forever
 fi
 

main/postmarketos-mkinitfs/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-mkinitfs
 pkgver=1.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
 depends="
@@ -67,6 +67,6 @@ check() {
 sha512sums="
 eb4af0fd9b5050e792c2ffb5d72e38899d19e623eda8f41e7cfeaa3d6dcae7e0342381cfc12f4969017d1e3b3b5d879614b0bbc3e4cf2d5fd01769e741bea17e  postmarketos-mkinitfs-1.6.1.tar.gz
 20f110337113e8de8999cf2a064a93fea36821d5c216bfa4ba46ec1f83825638262b92fd7be29eee0a85a54a108b7315a96cbe30da8ae4419f54c2ed53bb08c7  00-default.modules
-2ef30df1d00edc95a8789c20b51d5a5fba29940d0809dbdd46d98023d50077c2a77ee3a767b42e879ea12db1fdb18d12128e33009527bd0d18f74b50b6d13108  init.sh
-43a5240e03183db722a1d2e81b10fe8be0a1d1e6c11783e869adbf605b7886a05208296debafd0dd0b8d0b0be6dd695515114b8bd6716f82e69105c12b225571  init_functions.sh
+934e4e3f497dbb7ce96ccdba081bf2117ffe603c8d9d5cd982109d15eff5076b3a06a7eb97653f3aa72ac6223d177c8543f3e6f6d84d22905e1c884550af953d  init.sh
+57d80da86ac0933af783a5de4254e6a92e416d6cdfb9bb0796bda0a687f49f8801a4cbef1b93643e922653fe273f9e15e632392b875689714f0ed04b2cca73cb  init_functions.sh
 "

main/postmarketos-mkinitfs/init.sh

@@ -20,9 +20,8 @@ setup_firmware_path
 
 setup_mdev
 setup_dynamic_partitions "${deviceinfo_super_partitions:=}"
-setup_framebuffer
-show_splash "Loading..."
 mount_subpartitions
+setup_framebuffer
 run_hooks /etc/postmarketos-mkinitfs/hooks
 
 # Always run dhcp daemon/usb networking for now (later this should only
@@ -32,6 +31,7 @@ setup_usb_network
 start_unudhcpd
 
 mount_boot_partition /boot
+show_splash_loading
 extract_initramfs_extra /boot/initramfs-extra
 setup_udev
 run_hooks /etc/postmarketos-mkinitfs/hooks-extra

main/postmarketos-mkinitfs/init_functions.sh

@@ -241,7 +241,7 @@ mount_boot_partition() {
 	partition=$(find_boot_partition)
 	if [ -z "$partition" ]; then
 		echo "ERROR: boot partition not found!"
-		show_splash "ERROR: Boot partition not found\\nhttps://postmarketos.org/troubleshooting"
+		show_splash /splash-noboot.ppm.gz
 		loop_forever
 	fi
 
@@ -278,7 +278,7 @@ extract_initramfs_extra() {
 	initramfs_extra="$1"
 	if [ ! -e "$initramfs_extra" ]; then
 		echo "ERROR: initramfs-extra not found!"
-		show_splash "ERROR: initramfs-extra not found\\nhttps://postmarketos.org/troubleshooting"
+		show_splash /splash-noinitramfsextra.ppm.gz
 		loop_forever
 	fi
 	echo "Extract $initramfs_extra"
@@ -287,7 +287,7 @@ extract_initramfs_extra() {
 
 wait_root_partition() {
 	while [ -z "$(find_root_partition)" ]; do
-		show_splash "ERROR: root partition not found\\nhttps://postmarketos.org/troubleshooting"
+		show_splash /splash-norootfs.ppm.gz
 		echo "Could not find the rootfs."
 		echo "Maybe you need to insert the sdcard, if your device has"
 		echo "any? Trying again in one second..."
@@ -378,8 +378,6 @@ resize_root_partition() {
 unlock_root_partition() {
 	partition="$(find_root_partition)"
 	if cryptsetup isLuks "$partition"; then
-		# Make sure the splash doesn't interfere
-		killall pbsplash 2>/dev/null
 		tried=0
 		until cryptsetup status root | grep -qwi active; do
 			fde-unlock "$partition" "$tried"
@@ -387,13 +385,13 @@ unlock_root_partition() {
 		done
 		ROOT_PARTITION_UNLOCKED=1
 		# Show again the loading splashscreen
-		show_splash "Loading..."
+		show_splash_loading
 	fi
 }
 
 resize_root_filesystem() {
 	if [ "$ROOT_PARTITION_RESIZED" = 1 ]; then
-		show_splash "Resizing filesystem during initial boot..."
+		show_splash /splash-resizefs.ppm.gz
 		partition="$(find_root_partition)"
 		touch /etc/mtab # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673323
 		type="$(get_partition_type "$partition")"
@@ -419,7 +417,7 @@ resize_root_filesystem() {
 				;;
 			*)	echo "WARNING: Can not resize '$type' filesystem ($partition)." ;;
 		esac
-		show_splash "Loading..."
+		show_splash_loading
 	fi
 }
 
@@ -447,7 +445,7 @@ mount_root_partition() {
 	esac
 	if ! [ -e /sysroot/usr ]; then
 		echo "ERROR: unable to mount root partition!"
-		show_splash "ERROR: unable to mount root partition\\nhttps://postmarketos.org/troubleshooting"
+		show_splash /splash-mounterror.ppm.gz
 		loop_forever
 	fi
 }
@@ -592,7 +590,7 @@ start_unudhcpd() {
 	) &
 }
 
-# $1: Message to show
+# $1: path to ppm.gz file
 show_splash() {
 	# Skip for non-framebuffer devices
 	# shellcheck disable=SC2154
@@ -600,20 +598,23 @@ show_splash() {
 		echo "NOTE: Skipping framebuffer splashscreen (deviceinfo_no_framebuffer)"
 		return
 	fi
-
 	# Disable splash
 	if grep -q PMOS_NOSPLASH /proc/cmdline; then
 		return
 	fi
+	echo "IMG_ALIGN=CM" >>/tmp/fbsplash.cfg
+	gzip -c -d "$1" >/tmp/splash.ppm
+	fbsplash -s /tmp/splash.ppm -i /tmp/fbsplash.cfg
+}
 
-	killall pbsplash 2>/dev/null
-
-	while pgrep pbsplash >/dev/null; do
-		sleep 0.01
-	done
-
-	# shellcheck disable=SC2154
-	/usr/bin/pbsplash -s /usr/share/pbsplash/pmos-logo-text.svg -b "Linux $(uname -r) | $deviceinfo_codename" -m "$1 " &
+show_splash_loading() {
+	# Allow overriding the default loading splash screen with a
+	# "splash.ppm.gz" file on the boot partition
+	if [ -e /boot/splash.ppm.gz ]; then
+		show_splash /boot/splash.ppm.gz
+	else
+		show_splash /splash-loading.ppm.gz
+	fi
 }
 
 set_framebuffer_mode() {

main/postmarketos-splash/APKBUILD

@@ -0,0 +1,28 @@
+# Maintainer: Martijn Braam <martijn@brixit.nl>
+pkgname=postmarketos-splash
+pkgver=1.0.0
+pkgrel=3
+pkgdesc="Splash screen for postmarketOS"
+url="https://gitlab.com/postmarketos"
+arch="noarch"
+license="MIT"
+depends="font-dejavu font-droid py3-pillow python3"
+source="https://gitlab.com/postmarketos/postmarketos-splash/-/archive/$pkgver/postmarketos-splash-$pkgver.tar.gz
+	config.ini
+	https://gitlab.com/postmarketOS/artwork/raw/master/logo/pmos.ttf"
+options="!check" # No tests
+
+package() {
+	install -D -m755 make-splash.py \
+		"$pkgdir"/usr/bin/pmos-make-splash
+	install -D -m644 "$srcdir"/config.ini \
+		"$pkgdir"/etc/postmarketos/splash.ini
+	install -D -m644 "$srcdir"/pmos.ttf \
+		"$pkgdir"/usr/share/fonts/ttf-pmos/pmos.ttf
+}
+
+sha512sums="
+20d775f7cfb6e71eaa093ce254086eb64ed720573e94185bd09b9258e5707dd74ad20d593026fc5dd1edd1190e44e726bce74a5093ee991ee5fa5c0c1373817a  postmarketos-splash-1.0.0.tar.gz
+e1388cd336c16e779c7807d790dc75f1a96a74ccf2d50374be0da2f6f234026576d3c95df6e613184dd515370636d3e14086769def0bc352c49611263b7c26bc  config.ini
+81e5df350bf7f435ab5480f7028fc3cabf5a947fa0dff1ed219f6d9ac18a1250f5114887a9f5f270cc699af48cd77f23d14a84578ac8d2d0f3a3e90ec3211c45  pmos.ttf
+"

main/postmarketos-splash/config.ini

@@ -0,0 +1,17 @@
+[background]
+color=#000
+
+[name]
+text=postmarketOS
+font=/usr/share/fonts/droid/DroidSans.ttf
+color=#fff
+
+[logo]
+text=
+font=/usr/share/fonts/ttf-pmos/pmos.ttf
+color=#090
+spacing=1
+
+[text]
+font=/usr/share/fonts/droid/DroidSans.ttf
+color=#999