Skip to content

Commit 1862c4d

Browse files
committed
add fix for funkey_gpio_management in Recovery
Signed-off-by: Michel-FK <[email protected]>
1 parent 7678fca commit 1862c4d

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

FunKey/board/funkey/sw-description

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ software =
1212
installed-directly = true;
1313
compressed = "zlib";
1414
}
15+
files: (
16+
{
17+
filename = "funkey_gpio_management";
18+
path = "/tmp/";
19+
}
1520
);
1621
scripts: (
1722
{

FunKey/board/funkey/update_partition

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,24 @@ root_mount=/tmp/rootfs
99

1010
do_preinst()
1111
{
12-
notif " 1/4 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
12+
notif " 1/5 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
1313
exit 0
1414
}
1515

1616
do_postinst()
1717
{
18-
notif " 2/4 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
18+
notif " 2/5 FIX RECOVERY GPIO MANAGER"
19+
rw
20+
cp -a /tmp/funkey_gpio_management /usr/local/sbin/
21+
chmod +x /usr/local/sbin/funkey_gpio_management
22+
ro
23+
notif " 3/5 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
1924
resize2fs ${root_part}
2025
if [ $? -ne 0 ]; then
2126
notif " CANNOT RESIZE ROOT^FILESYSTEM"
2227
exit 1
2328
fi
24-
notif " 3/4 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
29+
notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
2530
folder_opks_emulators=/mnt/Emulators
2631
if [ ! -d "$folder_opks_emulators" ]; then
2732
mkdir -p "$folder_opks_emulators"
@@ -39,7 +44,7 @@ do_postinst()
3944
fi
4045
fi
4146
for file in $(ls /mnt/FunKey-*.fwu); do
42-
notif " 4/4 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
47+
notif " 5/5 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
4348
rm -f "${file}"
4449
done
4550
exit 0

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,13 @@ update: fun
121121
@mkdir -p tmp
122122
@cp FunKey/board/funkey/sw-description tmp/
123123
@cp FunKey/board/funkey/update_partition tmp/
124+
@cp -a Recovery/output/target/usr/local/sbin/funkey_gpio_management tmp/
124125
@cd FunKey/output/images && \
125126
rm -f rootfs.ext2.gz && \
126127
gzip -k rootfs.ext2 &&\
127128
mv rootfs.ext2.gz ../../../tmp/
128129
@cd tmp && \
129-
echo sw-description rootfs.ext2.gz update_partition | \
130+
echo sw-description rootfs.ext2.gz update_partition funkey_gpio_management | \
130131
tr " " "\n" | \
131132
cpio -o -H crc --quiet > ../images/FunKey-rootfs-$(shell cat FunKey/board/funkey/rootfs-overlay/etc/sw-versions | cut -f 2).fwu
132133
@rm -rf tmp

0 commit comments

Comments
 (0)