main/postmarketos-mkinitfs: disable charging-sdl (MR 2111)

See also #1064

main/postmarketos-mkinitfs/APKBUILD

@@ -1,13 +1,12 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-mkinitfs
 pkgver=0.24
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
 depends="
 	busybox-extras
 	bzip2
-	charging-sdl
 	multipath-tools
 	cryptsetup
 	device-mapper
@@ -19,7 +18,6 @@ depends="
 	lz4
 	osk-sdl
 	parted
-	triggerhappy
 	xz
 	"
 replaces="mkinitfs"
@@ -55,8 +53,8 @@ check() {
 }
 
 sha512sums="4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b5065655457e34f5952126bac6ab45143a91cddb09a8ad2d0a55c5cecd564a0135  00-default.modules
-bafd06286594102b8b3b126c3ae0a77a97f004ab804f03426154310c5107a1acaf3636bdba92626333adfe4fb0df32ff42c6d8d9e7adf35f6da620c6e14407a1  init.sh.in
-b43f5ab4885d46cc0d259ef0ab2e51bfa50d64038553dcc4df9d14e18e04b50b0b21cde94e3f164dcac0b1d70a617282e8d3990aec04af4b46165392357f5848  init_functions.sh
+1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67  init.sh.in
+34d7b0b527a75213b0cbd93305cbe7307da6f447ae9066b7627aa78fb6b88a025bbf4d5d0125f9ec8f4aad3a3c7ecdedf8b05cb4b44cd7e41f5ccef6d3c77c4a  init_functions.sh
 4f74995c52b3fd18ef77347dbbca4b3575d23fd339b62a257c1c4b45a16feb5a95f391d6189f62e94ac00d8da3077d192c678554a5f9b8190e34bf3fa6c86e95  mkinitfs.sh
-ee1af97c53d53229eead55a580fad704891c0dd7b678dd3d56822c5a6d9e983559cf8a271abe4f5c144116e5ba507c182aa02a478e3db82d1b689facc0ac6d6b  mkinitfs_functions.sh
+0152b812bf0cfde0008c750bc5bd707e3849e4e1d20013644e2a576e5e687bcdbb824ffa6b40b1d7fb3faf77abb74527b41b81a47788f278cb40ea34185a0f70  mkinitfs_functions.sh
 c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622  mkinitfs_test.sh"

main/postmarketos-mkinitfs/init.sh.in

@@ -36,7 +36,9 @@ start_udhcpd
 mount_boot_partition /boot
 show_splash_loading
 extract_initramfs_extra @INITRAMFS_EXTRA@
-start_charging_mode
+# charging-sdl does not work properly at the moment, so skip it.
+# See also https://gitlab.com/postmarketOS/pmaports/-/issues/1064
+# start_charging_mode
 wait_root_partition
 delete_old_install_partition
 resize_root_partition

main/postmarketos-mkinitfs/init_functions.sh

@@ -521,6 +521,8 @@ start_onscreen_keyboard() {
 }
 
 start_charging_mode() {
+	# NOTE: To reenable charging-sdl, revert the whole commit,
+	# including the APKBUILD and mkinitfs changes!
 	# Check cmdline for charging mode
 	chargingmodes="
 		androidboot.mode=charger

main/postmarketos-mkinitfs/mkinitfs_functions.sh

@@ -218,7 +218,6 @@ get_binaries_extra()
 		/sbin/cryptsetup
 		/sbin/dmsetup
 		/sbin/e2fsck
-		/usr/bin/charging-sdl
 		/usr/bin/osk-sdl
 		/usr/lib/libGL.so.1
 		/usr/lib/libts*
@@ -226,7 +225,6 @@ get_binaries_extra()
 		/usr/sbin/parted
 		/usr/sbin/resize2fs
 		/usr/sbin/resize.f2fs
-		/usr/sbin/thd
 	"
 
 	if [ -n "$deviceinfo_mesa_driver" ]; then