From 66735f8db937958f43998fa83f06c8ea7c20fa7a Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Thu, 16 Feb 2023 13:02:12 +0100
Subject: [PATCH] main/postmarketos-mkinitfs: remove references to charging-sdl
 (MR 3872)

As it was dropped in the previous commit.

[ci:skip-build]: already built successfully in CI
---
 main/postmarketos-mkinitfs/APKBUILD          |  6 ++--
 main/postmarketos-mkinitfs/init.sh           |  3 --
 main/postmarketos-mkinitfs/init_functions.sh | 36 --------------------
 3 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD
index d77357892..26c65fff5 100644
--- a/main/postmarketos-mkinitfs/APKBUILD
+++ b/main/postmarketos-mkinitfs/APKBUILD
@@ -2,7 +2,7 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-mkinitfs
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 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
-5f8e4acb19abee32b481f69b50be96ab06b1fea1b27448b9d08dfa13f0868d7808139b39c88d64bd35a3d6b2727e7b71797dbf0e99f6a92157e2755c89a34da4  init.sh
-4c18c7d1078c0fd37623e53d0f6d5660df7d6e53f2340c2b24cf62129cf7c4c5a90856ed6d0254498c927a7e41431e9344c4a6eae236f986e9468f45a7c7f281  init_functions.sh
+2ef30df1d00edc95a8789c20b51d5a5fba29940d0809dbdd46d98023d50077c2a77ee3a767b42e879ea12db1fdb18d12128e33009527bd0d18f74b50b6d13108  init.sh
+43a5240e03183db722a1d2e81b10fe8be0a1d1e6c11783e869adbf605b7886a05208296debafd0dd0b8d0b0be6dd695515114b8bd6716f82e69105c12b225571  init_functions.sh
 "
diff --git a/main/postmarketos-mkinitfs/init.sh b/main/postmarketos-mkinitfs/init.sh
index be7a872de..b2c93223a 100644
--- a/main/postmarketos-mkinitfs/init.sh
+++ b/main/postmarketos-mkinitfs/init.sh
@@ -36,9 +36,6 @@ extract_initramfs_extra /boot/initramfs-extra
 setup_udev
 run_hooks /etc/postmarketos-mkinitfs/hooks-extra
 
-# 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
diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh
index 2154b9ae6..3975fc6df 100644
--- a/main/postmarketos-mkinitfs/init_functions.sh
+++ b/main/postmarketos-mkinitfs/init_functions.sh
@@ -592,42 +592,6 @@ start_unudhcpd() {
 	) &
 }
 
-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
-		lpm_boot=1
-		androidboot.huawei_type=oem_rtc
-		startup=0x00010004
-		lpcharge=1
-		androidboot.bootchg=true
-	"
-
-	# Support devices using KMS
-	# shellcheck disable=SC2154
-	if [ -n "$deviceinfo_mesa_driver" ]; then
-		export SDL_VIDEODRIVER="kmsdrm"
-	fi
-
-	# shellcheck disable=SC2086
-	grep -Eq "$(echo $chargingmodes | tr ' ' '|')" /proc/cmdline || return
-	setup_directfb_tslib
-	# Get the font from osk-sdl config
-	fontpath=$(awk '/^keyboard-font\s=/{print $3}' /etc/osk.conf)
-	# Set up triggerhappy config
-	{
-		echo "KEY_POWER 1 pgrep -x charging-sdl || charging-sdl -pcf $fontpath"
-	} >/etc/triggerhappy.conf
-	# Start it once and then start triggerhappy
-	(
-		charging-sdl -pcf "$fontpath" \
-			|| show_splash "Charging mode failed"
-	) &
-	thd --deviceglob /dev/input/event* --triggers /etc/triggerhappy.conf
-}
-
 # $1: Message to show
 show_splash() {
 	# Skip for non-framebuffer devices