From e6d932c8c7e9d804f09b178713c65ca3d2500cc5 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Tue, 13 Apr 2021 16:39:31 +0200 Subject: [PATCH 1/8] remove funkey_gpio_management from update Signed-off-by: Michel-FK --- FunKey/board/funkey/sw-description | 8 +------- FunKey/board/funkey/update_partition | 17 ++++------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/FunKey/board/funkey/sw-description b/FunKey/board/funkey/sw-description index f45b552..28736cb 100644 --- a/FunKey/board/funkey/sw-description +++ b/FunKey/board/funkey/sw-description @@ -2,7 +2,7 @@ software = { version = "2.1.0"; - hardware-compatibility = [ "#RE:^Rev\.[D-E]$" ]; + hardware-compatibility = [ "#RE:^Rev\.[D-F]$" ]; images: ( { @@ -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..9201239 100755 --- a/FunKey/board/funkey/update_partition +++ b/FunKey/board/funkey/update_partition @@ -9,25 +9,16 @@ root_mount=/tmp/rootfs do_preinst() { - notif " 1/5 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE" + notif " 1/4 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE" exit 0 } 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 # ################# - notif " 3/5 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE" + notif " 2/4 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE" resize2fs ${root_part} if [ $? -ne 0 ]; then notif " CANNOT RESIZE ROOT^FILESYSTEM" @@ -37,7 +28,7 @@ do_postinst() ############# # Copy OPKs # ############# - notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE" + notif " 3/4 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE" # Mount Rootfs mkdir -p ${root_mount} @@ -66,7 +57,7 @@ do_postinst() # Erase update file # ##################### for file in $(ls /mnt/FunKey-*.fwu); do - notif " 5/5 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE" + notif " 4/4 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE" rm -f "${file}" done exit 0 From 320c699689c5716ea90562cd7345e67b8322b712 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Tue, 13 Apr 2021 18:38:30 +0200 Subject: [PATCH 2/8] remove update file and reboot in normal mode when update file is corrupted Signed-off-by: Michel-FK --- Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery | 4 ++-- Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery index a76f8df..c023ef2 100755 --- a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery +++ b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery @@ -18,8 +18,8 @@ case "$1" in for file in ${updates} ; do swupdate -i "${file}" if [ $? -ne 0 ]; then - menu & - exit 1 + notif_disp 10 " CORRUPTED^ UPDATE FILE" + rm -f "${file}" fi done notif "^^^^^^^^ RESTARTING...^^^^^^^^" diff --git a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu index 88b8b89..c0571fd 100755 --- a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu +++ b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu @@ -139,8 +139,10 @@ menu_run () { for file in $(ls /mnt/FunKey-*.fwu); do swupdate -i "${file}" if [ $? -ne 0 ]; then - notif "${message}...^CANNOT UPDATE!" - break + notif_disp 10 "${message}...^ CORRUPTED^ UPDATE FILE" + rm -f "${file}" + notif "^^^^^^^^ RESTARTING...^^^^^^^^" + normal_mode fi done message=" USB MOUNT" From 7f5cf7c430bcdb98fc4940f35011cc7c9a277ec2 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Tue, 13 Apr 2021 23:24:02 +0200 Subject: [PATCH 3/8] bump retrofe version Signed-off-by: Michel-FK --- FunKey/package/retrofe/retrofe.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk index 82a9f51..5bcc757 100644 --- a/FunKey/package/retrofe/retrofe.mk +++ b/FunKey/package/retrofe/retrofe.mk @@ -4,7 +4,7 @@ # ################################################################################ -RETROFE_VERSION = RetroFE-FunKey-1.1.0 +RETROFE_VERSION = 152bae7 RETROFE_SITE_METHOD = git RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.git RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib From 6b05f7b8e603168bb5e8e9e6bbc9dd084eca1b2c Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Wed, 14 Apr 2021 23:25:58 +0200 Subject: [PATCH 4/8] bump FCEUX & picodrive version Signed-off-by: Michel-FK --- FunKey/package/FCEUX/FCEUX.mk | 2 +- FunKey/package/picodrive/picodrive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk index 5591164..a679d87 100644 --- a/FunKey/package/FCEUX/FCEUX.mk +++ b/FunKey/package/FCEUX/FCEUX.mk @@ -4,7 +4,7 @@ # ################################################################################ -FCEUX_VERSION = 8a54185 +FCEUX_VERSION = b6af0b2 FCEUX_SITE_METHOD = git FCEUX_SITE = https://github.com/FunKey-Project/fceux.git FCEUX_LICENSE = GPL-2.0 diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk index 402e4bf..55189fd 100644 --- a/FunKey/package/picodrive/picodrive.mk +++ b/FunKey/package/picodrive/picodrive.mk @@ -4,7 +4,7 @@ # ################################################################################ -PICODRIVE_VERSION = 5a161d92 +PICODRIVE_VERSION = 009d007 PICODRIVE_SITE_METHOD = git PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive-irixxxx.git PICODRIVE_LICENSE = MAME From 0b2342ad9d275e49ae12e11e7384e64ab11f9049 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Wed, 14 Apr 2021 23:37:22 +0200 Subject: [PATCH 5/8] bump gmenu2x version Signed-off-by: Michel-FK --- FunKey/package/gmenu2x/gmenu2x.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk index 8f432bd..40ece34 100644 --- a/FunKey/package/gmenu2x/gmenu2x.mk +++ b/FunKey/package/gmenu2x/gmenu2x.mk @@ -3,7 +3,7 @@ # gmenu2x # ############################################################# -GMENU2X_VERSION = gmenu2x-FunKey-1.0.2 +GMENU2X_VERSION = 938ebd0 GMENU2X_SITE_METHOD = git GMENU2X_SITE = https://github.com/FunKey-Project/gmenu2x.git GMENU2X_LICENSE = GPL-2.0 From 7a6ecc55f6a1e1446b0af3e194350c1946e6cccc Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Thu, 15 Apr 2021 13:59:08 +0200 Subject: [PATCH 6/8] bump gnuboy & gpsp version Signed-off-by: Michel-FK --- FunKey/package/gnuboy/gnuboy.mk | 2 +- FunKey/package/gpsp/gpsp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk index 2f04b8f..bf14e8c 100644 --- a/FunKey/package/gnuboy/gnuboy.mk +++ b/FunKey/package/gnuboy/gnuboy.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUBOY_VERSION = 1905515 +GNUBOY_VERSION = 051950a 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 2617da8..a6745e8 100644 --- a/FunKey/package/gpsp/gpsp.mk +++ b/FunKey/package/gpsp/gpsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSP_VERSION = 31f430c +GPSP_VERSION = 643b9eb GPSP_SITE_METHOD = git GPSP_SITE = https://github.com/FunKey-Project/gpsp.git GPSP_LICENSE = GPL-2.0 From bc8f05ea5215f4d4341164e06aa52856e1789ed9 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Thu, 15 Apr 2021 15:55:19 +0200 Subject: [PATCH 7/8] bump mednafen version Signed-off-by: Michel-FK --- FunKey/package/mednafen/mednafen.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/mednafen/mednafen.mk b/FunKey/package/mednafen/mednafen.mk index 2788501..61da2b6 100644 --- a/FunKey/package/mednafen/mednafen.mk +++ b/FunKey/package/mednafen/mednafen.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEDNAFEN_VERSION = 498e85b +MEDNAFEN_VERSION = ba18334 MEDNAFEN_SITE_METHOD = git MEDNAFEN_SITE = https://github.com/FunKey-Project/mednafen-git.git MEDNAFEN_LICENSE = GPL-2.0+ From 750d9e8455375b9681cf85d1be4b2f0761c4c9d3 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Fri, 16 Apr 2021 08:18:26 +0200 Subject: [PATCH 8/8] bump PCSX-ReARMed & PocketSNES version Signed-off-by: Michel-FK --- FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk | 2 +- FunKey/package/PocketSNES/PocketSNES.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk index 57dad9d..6d44bb3 100644 --- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk +++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCSX_REARMED_VERSION = c2f5d2a +PCSX_REARMED_VERSION = 24d02b6 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 e7c568e..0dfa138 100644 --- a/FunKey/package/PocketSNES/PocketSNES.mk +++ b/FunKey/package/PocketSNES/PocketSNES.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCKETSNES_VERSION = 09f5c30 +POCKETSNES_VERSION = 10fb949 POCKETSNES_SITE_METHOD = git POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git POCKETSNES_LICENSE = GPL-2.0