From a8e063874f9b3324fd04cb557c5cd499e43e32ce Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 12 Apr 2021 20:39:24 +0200 Subject: [PATCH 01/23] 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 From e6d932c8c7e9d804f09b178713c65ca3d2500cc5 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Tue, 13 Apr 2021 16:39:31 +0200 Subject: [PATCH 02/23] 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 03/23] 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 04/23] 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 05/23] 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 06/23] 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 07/23] 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 08/23] 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 1daa9fc38640bc21cf1722004239de636928642e Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Thu, 15 Apr 2021 18:10:34 +0200 Subject: [PATCH 09/23] ugly but working patch to avoid ALSA DMA callback traps on FunKey S --- FunKey/package/picodrive/picodrive.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk index 402e4bf..8ddc6ff 100644 --- a/FunKey/package/picodrive/picodrive.mk +++ b/FunKey/package/picodrive/picodrive.mk @@ -4,7 +4,7 @@ # ################################################################################ -PICODRIVE_VERSION = 5a161d92 +PICODRIVE_VERSION = de8a8a23 PICODRIVE_SITE_METHOD = git PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive-irixxxx.git PICODRIVE_LICENSE = MAME From 750d9e8455375b9681cf85d1be4b2f0761c4c9d3 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Fri, 16 Apr 2021 08:18:26 +0200 Subject: [PATCH 10/23] 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 From 1e1c164aaf1982a976da6c2c0f631ab614844200 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 17 Apr 2021 22:26:33 +0200 Subject: [PATCH 11/23] fix pclose before fgets in init_menu_system Signed-off-by: Michel-FK --- FunKey/package/FCEUX/FCEUX.mk | 2 +- FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk | 2 +- FunKey/package/PocketSNES/PocketSNES.mk | 2 +- FunKey/package/commander/commander.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 | 2 +- FunKey/package/retrofe/retrofe.mk | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk index a679d87..2e70d49 100644 --- a/FunKey/package/FCEUX/FCEUX.mk +++ b/FunKey/package/FCEUX/FCEUX.mk @@ -4,7 +4,7 @@ # ################################################################################ -FCEUX_VERSION = b6af0b2 +FCEUX_VERSION = 5b4a196 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 6d44bb3..90d60af 100644 --- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk +++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCSX_REARMED_VERSION = 24d02b6 +PCSX_REARMED_VERSION = 73b8e1d 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 0dfa138..57bd671 100644 --- a/FunKey/package/PocketSNES/PocketSNES.mk +++ b/FunKey/package/PocketSNES/PocketSNES.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCKETSNES_VERSION = 10fb949 +POCKETSNES_VERSION = dd0b294 POCKETSNES_SITE_METHOD = git POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git POCKETSNES_LICENSE = GPL-2.0 diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk index fcd005f..fc481e1 100644 --- a/FunKey/package/commander/commander.mk +++ b/FunKey/package/commander/commander.mk @@ -3,7 +3,7 @@ # commander # ############################################################# -COMMANDER_VERSION = 936c912 +COMMANDER_VERSION = 0f71985 COMMANDER_SITE_METHOD = git COMMANDER_SITE = https://github.com/FunKey-Project/commander.git COMMANDER_LICENSE = GPL-2.0 diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk index bf14e8c..9f03ce8 100644 --- a/FunKey/package/gnuboy/gnuboy.mk +++ b/FunKey/package/gnuboy/gnuboy.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUBOY_VERSION = 051950a +GNUBOY_VERSION = 7a49260 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 a6745e8..619c01d 100644 --- a/FunKey/package/gpsp/gpsp.mk +++ b/FunKey/package/gpsp/gpsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSP_VERSION = 643b9eb +GPSP_VERSION = d52ad8b 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 61da2b6..75f510b 100644 --- a/FunKey/package/mednafen/mednafen.mk +++ b/FunKey/package/mednafen/mednafen.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEDNAFEN_VERSION = ba18334 +MEDNAFEN_VERSION = ee3cd22 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 55189fd..cdb1089 100644 --- a/FunKey/package/picodrive/picodrive.mk +++ b/FunKey/package/picodrive/picodrive.mk @@ -4,7 +4,7 @@ # ################################################################################ -PICODRIVE_VERSION = 009d007 +PICODRIVE_VERSION = c283d47f PICODRIVE_SITE_METHOD = git PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive-irixxxx.git PICODRIVE_LICENSE = MAME diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk index 5bcc757..f49f536 100644 --- a/FunKey/package/retrofe/retrofe.mk +++ b/FunKey/package/retrofe/retrofe.mk @@ -4,7 +4,7 @@ # ################################################################################ -RETROFE_VERSION = 152bae7 +RETROFE_VERSION = 356fe72 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 4909b67d29a2467079c0a4f39745d96c1c61b19c Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 19 Apr 2021 17:04:06 +0200 Subject: [PATCH 12/23] Set official release versions in mk files --- FunKey/configs/funkey_defconfig | 2 +- FunKey/package/FCEUX/FCEUX.mk | 2 +- FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk | 2 +- FunKey/package/PocketSNES/PocketSNES.mk | 2 +- FunKey/package/commander/commander.mk | 2 +- FunKey/package/gmenu2x/gmenu2x.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 ++-- FunKey/package/retrofe/retrofe.mk | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig index d4a5802..6ec9ebc 100644 --- a/FunKey/configs/funkey_defconfig +++ b/FunKey/configs/funkey_defconfig @@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/rootfs-overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/FunKey-Project/linux/archive/linux-FunKey-1.0.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/FunKey-Project/linux/archive/refs/tags/linux-FunKey-1.0.2.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/linux.config" BR2_LINUX_KERNEL_LZO=y diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk index 2e70d49..8e8d7db 100644 --- a/FunKey/package/FCEUX/FCEUX.mk +++ b/FunKey/package/FCEUX/FCEUX.mk @@ -4,7 +4,7 @@ # ################################################################################ -FCEUX_VERSION = 5b4a196 +FCEUX_VERSION = fceux-FunKey-1.2.1 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 90d60af..d84acce 100644 --- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk +++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCSX_REARMED_VERSION = 73b8e1d +PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.1 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 57bd671..fd90c33 100644 --- a/FunKey/package/PocketSNES/PocketSNES.mk +++ b/FunKey/package/PocketSNES/PocketSNES.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCKETSNES_VERSION = dd0b294 +POCKETSNES_VERSION = PocketSNES-FunKey-1.2.1 POCKETSNES_SITE_METHOD = git POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git POCKETSNES_LICENSE = GPL-2.0 diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk index fc481e1..bb24cd1 100644 --- a/FunKey/package/commander/commander.mk +++ b/FunKey/package/commander/commander.mk @@ -3,7 +3,7 @@ # commander # ############################################################# -COMMANDER_VERSION = 0f71985 +COMMANDER_VERSION = commander-FunKey-1.1.0 COMMANDER_SITE_METHOD = git COMMANDER_SITE = https://github.com/FunKey-Project/commander.git COMMANDER_LICENSE = GPL-2.0 diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk index 40ece34..f4c037b 100644 --- a/FunKey/package/gmenu2x/gmenu2x.mk +++ b/FunKey/package/gmenu2x/gmenu2x.mk @@ -3,7 +3,7 @@ # gmenu2x # ############################################################# -GMENU2X_VERSION = 938ebd0 +GMENU2X_VERSION = gmenu2x-FunKey-1.0.3 GMENU2X_SITE_METHOD = git GMENU2X_SITE = https://github.com/FunKey-Project/gmenu2x.git GMENU2X_LICENSE = GPL-2.0 diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk index 9f03ce8..adda50b 100644 --- a/FunKey/package/gnuboy/gnuboy.mk +++ b/FunKey/package/gnuboy/gnuboy.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUBOY_VERSION = 7a49260 +GNUBOY_VERSION = gnuboy-FunKey-1.2.1 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 619c01d..40b6843 100644 --- a/FunKey/package/gpsp/gpsp.mk +++ b/FunKey/package/gpsp/gpsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSP_VERSION = d52ad8b +GPSP_VERSION = gpsp-FunKey-1.2.1 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 75f510b..8de4762 100644 --- a/FunKey/package/mednafen/mednafen.mk +++ b/FunKey/package/mednafen/mednafen.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEDNAFEN_VERSION = ee3cd22 +MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.1 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 cdb1089..a2a7e50 100644 --- a/FunKey/package/picodrive/picodrive.mk +++ b/FunKey/package/picodrive/picodrive.mk @@ -4,9 +4,9 @@ # ################################################################################ -PICODRIVE_VERSION = c283d47f +PICODRIVE_VERSION = picodrive-FunKey-1.2.2 PICODRIVE_SITE_METHOD = git -PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive-irixxxx.git +PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive.git PICODRIVE_LICENSE = MAME PICODRIVE_LICENSE_FILES = COPYING diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk index f49f536..d896545 100644 --- a/FunKey/package/retrofe/retrofe.mk +++ b/FunKey/package/retrofe/retrofe.mk @@ -4,7 +4,7 @@ # ################################################################################ -RETROFE_VERSION = 356fe72 +RETROFE_VERSION = RetroFE-FunKey-1.1.1 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 7976bcc7c1e6e99dc9d7afec7da08f662e4efc5e Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 19 Apr 2021 17:07:22 +0200 Subject: [PATCH 13/23] removed build badge in README, github actions fails when compilations is too long even thoug it is successful (which is our case) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9d3db06..b35f7fa 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![FunKey-OS Build](https://github.com/FunKey-Project/FunKey-OS/workflows/FunKey-OS%20Build/badge.svg) +#![FunKey-OS Build](https://github.com/FunKey-Project/FunKey-OS/workflows/FunKey-OS%20Build/badge.svg) # FunKey-OS ## Intro From 7408d351423aa15129aef5e605ac5d6635c4d29d Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 19 Apr 2021 17:09:09 +0200 Subject: [PATCH 14/23] removed build badge in README, github actions fails when compilations is too long even thoug it is successful (which is our case) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b35f7fa..1d654ad 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -#![FunKey-OS Build](https://github.com/FunKey-Project/FunKey-OS/workflows/FunKey-OS%20Build/badge.svg) + # FunKey-OS ## Intro From 13201b7f69dc8948655dd77daaa8f2b317c39c42 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 19 Apr 2021 18:45:53 +0200 Subject: [PATCH 15/23] bump retroFe to the latests release --- 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 d896545..1140671 100644 --- a/FunKey/package/retrofe/retrofe.mk +++ b/FunKey/package/retrofe/retrofe.mk @@ -4,7 +4,7 @@ # ################################################################################ -RETROFE_VERSION = RetroFE-FunKey-1.1.1 +RETROFE_VERSION = RetroFE-FunKey-1.1.2 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 8532918f007a92a8e9dc8a7e30f8386bfc1362c5 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Mon, 19 Apr 2021 23:26:29 +0200 Subject: [PATCH 16/23] bump fkgpiod & libopk version Signed-off-by: Michel-FK --- FunKey/package/fkgpiod/fkgpiod.mk | 2 +- FunKey/package/libopk/libopk.mk | 2 +- Recovery/package/fkgpiod/fkgpiod.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk index 7fbabd9..370293e 100644 --- a/FunKey/package/fkgpiod/fkgpiod.mk +++ b/FunKey/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = 54d1051 +FKGPIOD_VERSION = e74f688 FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk index 7d93881..047cd41 100644 --- a/FunKey/package/libopk/libopk.mk +++ b/FunKey/package/libopk/libopk.mk @@ -4,7 +4,7 @@ # ############################################################# #LIBOPK_VERSION = libopk-FunKey-1.0.1 -LIBOPK_VERSION = 43e8380 +LIBOPK_VERSION = d00a04c LIBOPK_SITE_METHOD = git LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git diff --git a/Recovery/package/fkgpiod/fkgpiod.mk b/Recovery/package/fkgpiod/fkgpiod.mk index 7fbabd9..370293e 100644 --- a/Recovery/package/fkgpiod/fkgpiod.mk +++ b/Recovery/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = 54d1051 +FKGPIOD_VERSION = e74f688 FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ From ab7e5ae15848cae03cbbc727c2dc73321d9fe8f8 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Mon, 19 Apr 2021 23:31:23 +0200 Subject: [PATCH 17/23] restore messages in libopk Signed-off-by: Michel-FK --- FunKey/package/libopk/libopk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk index 047cd41..807e63f 100644 --- a/FunKey/package/libopk/libopk.mk +++ b/FunKey/package/libopk/libopk.mk @@ -4,7 +4,7 @@ # ############################################################# #LIBOPK_VERSION = libopk-FunKey-1.0.1 -LIBOPK_VERSION = d00a04c +LIBOPK_VERSION = e8501d9 LIBOPK_SITE_METHOD = git LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git From 52d20491c47ac134a4f7c2cf9c473bc838931855 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 19 Apr 2021 23:39:31 +0200 Subject: [PATCH 18/23] reset default mapping in start_launcher --- .../funkey/rootfs-overlay/usr/local/sbin/start_launcher | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher index d7158d1..ea37a12 100755 --- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher +++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher @@ -60,8 +60,11 @@ while true; do wait $! erase_pid - # In case retrofe quits with errors, clear graphic VT + # In case retrofe/opkrun quits with errors, clear graphic VT termfix_all + + # In case retrofe/opkrun quits with errors, reset default key mapping + keymap reset fi # WD to prevent 100% CPU From de57db21fd72d12690490eefb1f6de2c0f85ff7e Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Mon, 19 Apr 2021 23:47:00 +0200 Subject: [PATCH 19/23] bump libopk version Signed-off-by: Michel-FK --- FunKey/package/libopk/libopk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk index 807e63f..7445da1 100644 --- a/FunKey/package/libopk/libopk.mk +++ b/FunKey/package/libopk/libopk.mk @@ -4,7 +4,7 @@ # ############################################################# #LIBOPK_VERSION = libopk-FunKey-1.0.1 -LIBOPK_VERSION = e8501d9 +LIBOPK_VERSION = 3dd25b6 LIBOPK_SITE_METHOD = git LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git From af757892941a121894670e943f4dda67ec3bae59 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 19 Apr 2021 23:52:33 +0200 Subject: [PATCH 20/23] changed release version for Recovery and FunKey --- FunKey/board/funkey/rootfs-overlay/etc/issue | 2 +- FunKey/board/funkey/rootfs-overlay/etc/os-release | 10 +++++----- FunKey/board/funkey/rootfs-overlay/etc/sw-versions | 2 +- FunKey/board/funkey/sw-description | 2 +- Recovery/board/funkey/rootfs-overlay/etc/issue | 2 +- Recovery/board/funkey/rootfs-overlay/etc/os-release | 10 +++++----- Recovery/board/funkey/rootfs-overlay/etc/sw-versions | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/FunKey/board/funkey/rootfs-overlay/etc/issue b/FunKey/board/funkey/rootfs-overlay/etc/issue index 4e12cc2..d8e1e20 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/issue +++ b/FunKey/board/funkey/rootfs-overlay/etc/issue @@ -5,6 +5,6 @@ |___| |_____|__|__||__|\__||_____|___ | FUN ON A KEYCHAIN |_____| ----------------------------------------------------- - Version 2.1.0 + Version 2.2.0 ----------------------------------------------------- diff --git a/FunKey/board/funkey/rootfs-overlay/etc/os-release b/FunKey/board/funkey/rootfs-overlay/etc/os-release index 4166909..946739f 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/os-release +++ b/FunKey/board/funkey/rootfs-overlay/etc/os-release @@ -1,12 +1,12 @@ NAME="FunKey-OS" -VERSION="2.1.0 (Cruising Chicken)" +VERSION="2.2.0 (Pyromaniac Penguin)" ID=funkey ID_LIKE=buildroot -PRETTY_NAME="FunKey-OS 2.1.0" -VERSION_ID="2.1.0" +PRETTY_NAME="FunKey-OS 2.2.0" +VERSION_ID="2.2.0" HOME_URL="https://www.funkey-project.com/" SUPPORT_URL="https://www.funkey-project.com/" BUG_REPORT_URL="https://www.funkey-project.com/" PRIVACY_POLICY_URL="https://www.funkey-project.com" -VERSION_CODENAME=Cruising -UBUNTU_CODENAME=Cruising +VERSION_CODENAME=Pyromaniac +UBUNTU_CODENAME=Pyromaniac diff --git a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions index dffaffb..0730586 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions +++ b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions @@ -1 +1 @@ -rootfs 2.1.0 +rootfs 2.2.0 diff --git a/FunKey/board/funkey/sw-description b/FunKey/board/funkey/sw-description index 28736cb..0d96bb2 100644 --- a/FunKey/board/funkey/sw-description +++ b/FunKey/board/funkey/sw-description @@ -1,6 +1,6 @@ software = { - version = "2.1.0"; + version = "2.2.0"; hardware-compatibility = [ "#RE:^Rev\.[D-F]$" ]; diff --git a/Recovery/board/funkey/rootfs-overlay/etc/issue b/Recovery/board/funkey/rootfs-overlay/etc/issue index 62edbca..d2e81a5 100644 --- a/Recovery/board/funkey/rootfs-overlay/etc/issue +++ b/Recovery/board/funkey/rootfs-overlay/etc/issue @@ -5,6 +5,6 @@ |___| |_____|__|__||__|\__||_____|___ | FUN ON A KEYCHAIN |_____| ----------------------------------------------------- - Version 2.0.0 (Recovery) + Version 2.1.0 (Recovery) ----------------------------------------------------- diff --git a/Recovery/board/funkey/rootfs-overlay/etc/os-release b/Recovery/board/funkey/rootfs-overlay/etc/os-release index 8a1fa48..b8841f8 100644 --- a/Recovery/board/funkey/rootfs-overlay/etc/os-release +++ b/Recovery/board/funkey/rootfs-overlay/etc/os-release @@ -1,12 +1,12 @@ NAME="FunKey-OS Recovery" -VERSION="2.0.0 (Rowdy Rabbit)" +VERSION="2.1.0 (Hoopy Hawk)" ID=funkey-recovery ID_LIKE=buildroot -PRETTY_NAME="FunKey-OS Recovery 2.0.0" -VERSION_ID="2.0.0" +PRETTY_NAME="FunKey-OS Recovery 2.1.0" +VERSION_ID="2.1.0" HOME_URL="https://www.funkey-project.com/" SUPPORT_URL="https://www.funkey-project.com/" BUG_REPORT_URL="https://www.funkey-project.com/" PRIVACY_POLICY_URL="https://www.funkey-project.com" -VERSION_CODENAME=Rowdy -UBUNTU_CODENAME=Rowdy +VERSION_CODENAME=Hoopy +UBUNTU_CODENAME=Hoopy diff --git a/Recovery/board/funkey/rootfs-overlay/etc/sw-versions b/Recovery/board/funkey/rootfs-overlay/etc/sw-versions index 4455861..175a929 100644 --- a/Recovery/board/funkey/rootfs-overlay/etc/sw-versions +++ b/Recovery/board/funkey/rootfs-overlay/etc/sw-versions @@ -1 +1 @@ -Recovery 2.0.0 +Recovery 2.1.0 From afa336a963a16003daedbd9fc8a3f46f2dc2cd9a Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Mon, 19 Apr 2021 23:56:14 +0200 Subject: [PATCH 21/23] bump fkgpiod version Signed-off-by: Michel-FK --- FunKey/package/fkgpiod/fkgpiod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk index 370293e..4ca8ffb 100644 --- a/FunKey/package/fkgpiod/fkgpiod.mk +++ b/FunKey/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = e74f688 +FKGPIOD_VERSION = fkgpiod-FunKey-1.0.0 FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ From 7155485b412c79d17c41588d38a63bf8634cfdf7 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Tue, 20 Apr 2021 00:03:10 +0200 Subject: [PATCH 22/23] bump hardware revision Signed-off-by: Michel-FK --- FunKey/board/funkey/rootfs-overlay/etc/hwrevision | 2 +- Recovery/board/funkey/rootfs-overlay/etc/hwrevision | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FunKey/board/funkey/rootfs-overlay/etc/hwrevision b/FunKey/board/funkey/rootfs-overlay/etc/hwrevision index 0e1749c..2556686 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/hwrevision +++ b/FunKey/board/funkey/rootfs-overlay/etc/hwrevision @@ -1 +1 @@ -FunKey_S Rev.E +FunKey_S Rev.F diff --git a/Recovery/board/funkey/rootfs-overlay/etc/hwrevision b/Recovery/board/funkey/rootfs-overlay/etc/hwrevision index 0e1749c..2556686 100644 --- a/Recovery/board/funkey/rootfs-overlay/etc/hwrevision +++ b/Recovery/board/funkey/rootfs-overlay/etc/hwrevision @@ -1 +1 @@ -FunKey_S Rev.E +FunKey_S Rev.F From fd35689bdf88caadb101ee955ea4f26cebe7119a Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Tue, 20 Apr 2021 00:08:27 +0200 Subject: [PATCH 23/23] bump libopk version --- FunKey/package/libopk/libopk.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk index 7445da1..53b4bdc 100644 --- a/FunKey/package/libopk/libopk.mk +++ b/FunKey/package/libopk/libopk.mk @@ -3,8 +3,7 @@ # libopk # ############################################################# -#LIBOPK_VERSION = libopk-FunKey-1.0.1 -LIBOPK_VERSION = 3dd25b6 +LIBOPK_VERSION = libopk-FunKey-1.0.2 LIBOPK_SITE_METHOD = git LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git