From a8e063874f9b3324fd04cb557c5cd499e43e32ce Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 12 Apr 2021 20:39:24 +0200 Subject: [PATCH] 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 --- FunKey/board/funkey/sw-description | 6 ---- FunKey/board/funkey/update_partition | 32 ++++++++++----------- FunKey/package/FCEUX/FCEUX.mk | 2 +- FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk | 2 +- FunKey/package/PocketSNES/PocketSNES.mk | 2 +- FunKey/package/gnuboy/gnuboy.mk | 2 +- FunKey/package/gpsp/gpsp.mk | 2 +- FunKey/package/mednafen/mednafen.mk | 2 +- FunKey/package/picodrive/picodrive.mk | 4 +-- 9 files changed, 24 insertions(+), 30 deletions(-) diff --git a/FunKey/board/funkey/sw-description b/FunKey/board/funkey/sw-description index f45b552..87f53b8 100644 --- a/FunKey/board/funkey/sw-description +++ b/FunKey/board/funkey/sw-description @@ -13,12 +13,6 @@ software = compressed = "zlib"; } ); - files: ( - { - filename = "funkey_gpio_management"; - path = "/tmp/funkey_gpio_management"; - } - ); scripts: ( { filename = "update_partition"; diff --git a/FunKey/board/funkey/update_partition b/FunKey/board/funkey/update_partition index 1a86c34..a0d646e 100755 --- a/FunKey/board/funkey/update_partition +++ b/FunKey/board/funkey/update_partition @@ -15,15 +15,7 @@ do_preinst() do_postinst() { - ################ - # Fix recovery # - ################ - notif " 2/5 FIX RECOVERY GPIO MANAGER" - rw - cp -a /tmp/funkey_gpio_management /usr/local/sbin/ - chmod +x /usr/local/sbin/funkey_gpio_management - ro - + ################# # Resize Rootfs # ################# @@ -34,9 +26,9 @@ do_postinst() exit 1 fi - ############# - # Copy OPKs # - ############# + ############################## + # SHARED PARTITION PROCESSES # + ############################## notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE" # Mount Rootfs @@ -48,12 +40,10 @@ do_postinst() fi # Copy OPKs - shared_partition=/mnt/ - mkdir -p "$shared_partition" - cp -r ${root_mount}/usr/local/share/OPKs/* "$shared_partition" + cp -r ${root_mount}/usr/local/share/OPKs/* /mnt # Fix PCE opk name if necessary - mv "$shared_partition"/Emulators/pce_mednaefn_funkey-s.opk "$shared_partition"/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1 + mv /mnt/Emulators/pce_mednaefn_funkey-s.opk /mnt/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1 # Unmount Rootfs umount ${root_mount} @@ -62,6 +52,16 @@ do_postinst() exit 1 fi + # Change FunKey config files extension from .cfg to .fkcfg + SAVEIFS=$IFS + IFS=$(echo -en "\n\b") + 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 + for FILE in $(ls /mnt/"${FOLDER}"/*.cfg 2>/dev/null); do + mv "$FILE" "${FILE%.cfg}.fkcfg" + done + done + IFS=$SAVEIFS + ##################### # Erase update file # ##################### diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk index 8ff174c..5591164 100644 --- a/FunKey/package/FCEUX/FCEUX.mk +++ b/FunKey/package/FCEUX/FCEUX.mk @@ -4,7 +4,7 @@ # ################################################################################ -FCEUX_VERSION = fceux-FunKey-1.2.0 +FCEUX_VERSION = 8a54185 FCEUX_SITE_METHOD = git FCEUX_SITE = https://github.com/FunKey-Project/fceux.git FCEUX_LICENSE = GPL-2.0 diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk index 7750a83..57dad9d 100644 --- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk +++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.0 +PCSX_REARMED_VERSION = c2f5d2a PCSX_REARMED_SITE_METHOD = git PCSX_REARMED_SITE = https://github.com/FunKey-Project/pcsx_rearmed.git PCSX_REARMED_LICENSE = GPL-2.0 diff --git a/FunKey/package/PocketSNES/PocketSNES.mk b/FunKey/package/PocketSNES/PocketSNES.mk index fc20e95..e7c568e 100644 --- a/FunKey/package/PocketSNES/PocketSNES.mk +++ b/FunKey/package/PocketSNES/PocketSNES.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCKETSNES_VERSION = PocketSNES-FunKey-1.2.0 +POCKETSNES_VERSION = 09f5c30 POCKETSNES_SITE_METHOD = git POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git POCKETSNES_LICENSE = GPL-2.0 diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk index 3467b27..2f04b8f 100644 --- a/FunKey/package/gnuboy/gnuboy.mk +++ b/FunKey/package/gnuboy/gnuboy.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUBOY_VERSION = gnuboy-FunKey-1.2.0 +GNUBOY_VERSION = 1905515 GNUBOY_SITE_METHOD = git GNUBOY_SITE = https://github.com/FunKey-Project/gnuboy.git GNUBOY_LICENSE = GPL-2.0 diff --git a/FunKey/package/gpsp/gpsp.mk b/FunKey/package/gpsp/gpsp.mk index 1adeb19..2617da8 100644 --- a/FunKey/package/gpsp/gpsp.mk +++ b/FunKey/package/gpsp/gpsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSP_VERSION = gpsp-FunKey-1.2.0 +GPSP_VERSION = 31f430c GPSP_SITE_METHOD = git GPSP_SITE = https://github.com/FunKey-Project/gpsp.git GPSP_LICENSE = GPL-2.0 diff --git a/FunKey/package/mednafen/mednafen.mk b/FunKey/package/mednafen/mednafen.mk index 3f11a43..2788501 100644 --- a/FunKey/package/mednafen/mednafen.mk +++ b/FunKey/package/mednafen/mednafen.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.0 +MEDNAFEN_VERSION = 498e85b MEDNAFEN_SITE_METHOD = git MEDNAFEN_SITE = https://github.com/FunKey-Project/mednafen-git.git MEDNAFEN_LICENSE = GPL-2.0+ diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk index 48d59d1..402e4bf 100644 --- a/FunKey/package/picodrive/picodrive.mk +++ b/FunKey/package/picodrive/picodrive.mk @@ -4,9 +4,9 @@ # ################################################################################ -PICODRIVE_VERSION = picodrive-FunKey-1.2.1 +PICODRIVE_VERSION = 5a161d92 PICODRIVE_SITE_METHOD = git -PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive.git +PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive-irixxxx.git PICODRIVE_LICENSE = MAME PICODRIVE_LICENSE_FILES = COPYING