Rebrand to HAKT

.github/workflows/main.yml

@@ -63,5 +63,5 @@ jobs:
           sh ./build.sh
     - uses: actions/upload-artifact@v4
       with:
-        name: Update_hotfix_universal
-        path: build/Update_hotfix_universal.bin
+        name: KAHT_BUILD_DEV
+        path: build/

build.sh

@@ -11,6 +11,7 @@
 # Try sudo
 sudo echo
 
+export HAKT_VERSION="v2.0.0-DEV"
 export KT_WITH_UNKNOWN_DEVCODES="1"
 
 # Fall back to the bundled KindleTool if there aren't any in PATH
@@ -128,6 +129,6 @@ echo "* Generating device list"
 #DEVICES="$(echo "$DEVICE_LIST" | xargs | sed "s/ / -d /g")"
 #echo $DEVICES
 
-echo "* Building hotfix"
+echo "* Building HAKT"
 cd ./build_tmp/src
-${KINDLETOOL} create ota2 -d kindle5 -s min -t max -O -C . "../../build/Update_hotfix_universal.bin"
+${KINDLETOOL} create ota2 -d kindle5 -s min -t max -O -C . "../../build/Update_HAKT_${HAKT_VERSION}_install.bin"

src/kmc/hotfix/libhotfixutils

@@ -22,6 +22,7 @@ ARCH="armel"
 if ls /lib | grep ld-linux-armhf.so; then
     ARCH="armhf"
 fi
+FBINK_BIN="${KMC_PERSISTENT_STORAGE}/${ARCH}/bin/fbink"
 ROOTPART="$(rdev | awk '{ print $1; }')" # Hotfix is ran as a booklet, we are ALWAYS running from main
 
 ###
@@ -154,13 +155,16 @@ fi
 
 
 # Adapt the K5 logging calls to the simpler legacy syntax
+_LOGMSG_Y=2
 logmsg()
 {
 	f_log "${1}" "${HACKNAME}" "${2}" "${3}" "${4}"
 	# Add our own echo, like on legacy devices (useful for MRPI logging, since f_log's one is sent to /dev/console)
 	if [ "${1}" != "D" ] ; then
 		echo "system: ${1} ${HACKNAME}:${2}:${3}:${4}"
 	fi
+	${FBINK_BIN} -x 1 -y $_LOGMSG_Y "${1}: ${4}" -S 3
+	_LOGMSG_Y=$(($_LOGMSG_Y + 1))
 }
 
 
@@ -171,7 +175,6 @@ logmsg()
 # Some constants...
 _BLANKET="com.lab126.blanket"
 _OTAMODULE="${_BLANKET}.ota"
-FBINK_BIN="kmc/$ARCH/fbink" # Assume we are running as part of HAKT
 
 # Check if blanket is running
 if pkill -0 blanket ; then

src/libotautils6

@@ -20,7 +20,7 @@ KMC_BACKUP_STORAGE="/mnt/us/kmc"
 MKK_BACKUP_STORAGE="/mnt/us/mkk"
 RP_BACKUP_STORAGE="/mnt/us/rp"
 ARCH="armel"
-# Check if the Kindle ihotfix/s ARMHF or ARMEL
+# Check if the Kindle is ARMHF or ARMEL
 if ls /lib | grep ld-linux-armhf.so; then
     ARCH="armhf"
 fi