Skip to content

Commit a8e0638

Browse files
committed
removed cp of funkey_gpio_manager in update_partition and sw-description, Change FunKey config files extension from .cfg to .fkcfg in update partition, and bumped emulators version for saving funkey configs as .fkcfg
1 parent 853d7e3 commit a8e0638

File tree

9 files changed

+24
-30
lines changed

9 files changed

+24
-30
lines changed

FunKey/board/funkey/sw-description

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ software =
1313
compressed = "zlib";
1414
}
1515
);
16-
files: (
17-
{
18-
filename = "funkey_gpio_management";
19-
path = "/tmp/funkey_gpio_management";
20-
}
21-
);
2216
scripts: (
2317
{
2418
filename = "update_partition";

FunKey/board/funkey/update_partition

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@ do_preinst()
1515

1616
do_postinst()
1717
{
18-
################
19-
# Fix recovery #
20-
################
21-
notif " 2/5 FIX RECOVERY GPIO MANAGER"
22-
rw
23-
cp -a /tmp/funkey_gpio_management /usr/local/sbin/
24-
chmod +x /usr/local/sbin/funkey_gpio_management
25-
ro
26-
18+
2719
#################
2820
# Resize Rootfs #
2921
#################
@@ -34,9 +26,9 @@ do_postinst()
3426
exit 1
3527
fi
3628

37-
#############
38-
# Copy OPKs #
39-
#############
29+
##############################
30+
# SHARED PARTITION PROCESSES #
31+
##############################
4032
notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
4133

4234
# Mount Rootfs
@@ -48,12 +40,10 @@ do_postinst()
4840
fi
4941

5042
# Copy OPKs
51-
shared_partition=/mnt/
52-
mkdir -p "$shared_partition"
53-
cp -r ${root_mount}/usr/local/share/OPKs/* "$shared_partition"
43+
cp -r ${root_mount}/usr/local/share/OPKs/* /mnt
5444

5545
# Fix PCE opk name if necessary
56-
mv "$shared_partition"/Emulators/pce_mednaefn_funkey-s.opk "$shared_partition"/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1
46+
mv /mnt/Emulators/pce_mednaefn_funkey-s.opk /mnt/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1
5747

5848
# Unmount Rootfs
5949
umount ${root_mount}
@@ -62,6 +52,16 @@ do_postinst()
6252
exit 1
6353
fi
6454

55+
# Change FunKey config files extension from .cfg to .fkcfg
56+
SAVEIFS=$IFS
57+
IFS=$(echo -en "\n\b")
58+
for FOLDER in "Atari lynx" "Game Boy" "Game Boy Advance" "Game Boy Color" "Game Gear" "Neo Geo Pocket" "NES" "PCE-TurboGrafx" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan"; do
59+
for FILE in $(ls /mnt/"${FOLDER}"/*.cfg 2>/dev/null); do
60+
mv "$FILE" "${FILE%.cfg}.fkcfg"
61+
done
62+
done
63+
IFS=$SAVEIFS
64+
6565
#####################
6666
# Erase update file #
6767
#####################

FunKey/package/FCEUX/FCEUX.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
FCEUX_VERSION = fceux-FunKey-1.2.0
7+
FCEUX_VERSION = 8a54185
88
FCEUX_SITE_METHOD = git
99
FCEUX_SITE = https://github.com/FunKey-Project/fceux.git
1010
FCEUX_LICENSE = GPL-2.0

FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.0
7+
PCSX_REARMED_VERSION = c2f5d2a
88
PCSX_REARMED_SITE_METHOD = git
99
PCSX_REARMED_SITE = https://github.com/FunKey-Project/pcsx_rearmed.git
1010
PCSX_REARMED_LICENSE = GPL-2.0

FunKey/package/PocketSNES/PocketSNES.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
POCKETSNES_VERSION = PocketSNES-FunKey-1.2.0
7+
POCKETSNES_VERSION = 09f5c30
88
POCKETSNES_SITE_METHOD = git
99
POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git
1010
POCKETSNES_LICENSE = GPL-2.0

FunKey/package/gnuboy/gnuboy.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
GNUBOY_VERSION = gnuboy-FunKey-1.2.0
7+
GNUBOY_VERSION = 1905515
88
GNUBOY_SITE_METHOD = git
99
GNUBOY_SITE = https://github.com/FunKey-Project/gnuboy.git
1010
GNUBOY_LICENSE = GPL-2.0

FunKey/package/gpsp/gpsp.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
GPSP_VERSION = gpsp-FunKey-1.2.0
7+
GPSP_VERSION = 31f430c
88
GPSP_SITE_METHOD = git
99
GPSP_SITE = https://github.com/FunKey-Project/gpsp.git
1010
GPSP_LICENSE = GPL-2.0

FunKey/package/mednafen/mednafen.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.0
7+
MEDNAFEN_VERSION = 498e85b
88
MEDNAFEN_SITE_METHOD = git
99
MEDNAFEN_SITE = https://github.com/FunKey-Project/mednafen-git.git
1010
MEDNAFEN_LICENSE = GPL-2.0+

FunKey/package/picodrive/picodrive.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
################################################################################
66

7-
PICODRIVE_VERSION = picodrive-FunKey-1.2.1
7+
PICODRIVE_VERSION = 5a161d92
88
PICODRIVE_SITE_METHOD = git
9-
PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive.git
9+
PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive-irixxxx.git
1010
PICODRIVE_LICENSE = MAME
1111
PICODRIVE_LICENSE_FILES = COPYING
1212

0 commit comments

Comments
 (0)