From 88ba4641cc767cddfc2d7c4451da29b6ea344a0c Mon Sep 17 00:00:00 2001
From: Michel-FK <michel.stempin@funkey-project.com>
Date: Sat, 2 Jan 2021 14:20:55 +0100
Subject: [PATCH] use new Instant Play system

Signed-off-by: Michel-FK <michel.stempin@funkey-project.com>
---
 FunKey/board/funkey/rootfs-overlay/root/.profile              | 4 ++++
 .../rootfs-overlay/usr/games/launchers/gamegear_launch.sh     | 3 ---
 .../funkey/rootfs-overlay/usr/games/launchers/gb_launch.sh    | 4 ----
 .../rootfs-overlay/usr/games/launchers/gba_launch_gpsp.sh     | 3 ---
 .../rootfs-overlay/usr/games/launchers/gba_launch_mednafen.sh | 4 ----
 .../funkey/rootfs-overlay/usr/games/launchers/lynx_launch.sh  | 3 ---
 .../usr/games/launchers/mame_launch_mednafen.sh               | 3 ---
 .../rootfs-overlay/usr/games/launchers/megadrive_launch.sh    | 4 ----
 .../funkey/rootfs-overlay/usr/games/launchers/nes_launch.sh   | 4 ----
 .../funkey/rootfs-overlay/usr/games/launchers/ngp_launch.sh   | 3 ---
 .../funkey/rootfs-overlay/usr/games/launchers/pce_launch.sh   | 3 ---
 .../usr/games/launchers/psone_launch_mednafen.sh              | 3 ---
 .../rootfs-overlay/usr/games/launchers/psone_launch_pcsx.sh   | 4 ----
 .../funkey/rootfs-overlay/usr/games/launchers/sms_launch.sh   | 4 ----
 .../funkey/rootfs-overlay/usr/games/launchers/snes_launch.sh  | 4 ----
 .../usr/games/launchers/snes_launch_mednafen.sh               | 4 ----
 .../rootfs-overlay/usr/games/launchers/wonderswan_launch.sh   | 3 ---
 FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk                   | 1 -
 18 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/FunKey/board/funkey/rootfs-overlay/root/.profile b/FunKey/board/funkey/rootfs-overlay/root/.profile
index eb33949..39260e7 100755
--- a/FunKey/board/funkey/rootfs-overlay/root/.profile
+++ b/FunKey/board/funkey/rootfs-overlay/root/.profile
@@ -18,6 +18,10 @@ alias l='ls $LS_OPTIONS -lA'
 # alias cp='cp -i'
 # alias mv='mv -i'
 
+# Relocate HOME into the r/w partition
+export HOME=/mnt/funkey
+mkdir -p ${HOME}
+
 # Resize the console to the terminal dimensions
 resize() {
     if [[ -t 0 && $# -eq 0 ]]; then
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gamegear_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gamegear_launch.sh
index a3a4932..8364468 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gamegear_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gamegear_launch.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gb_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gb_launch.sh
index 2e0a542..4246680 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gb_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gb_launch.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 sdlgnuboy --syncrtc "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_gpsp.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_gpsp.sh
index 3ad3baf..fb4d910 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_gpsp.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_gpsp.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 cd ${HOME}
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_mednafen.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_mednafen.sh
index cb7e912..88dd220 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_mednafen.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_mednafen.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 gpsp "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/lynx_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/lynx_launch.sh
index 1a97211..300941f 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/lynx_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/lynx_launch.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/mame_launch_mednafen.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/mame_launch_mednafen.sh
index 877da04..cca6afe 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/mame_launch_mednafen.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/mame_launch_mednafen.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/megadrive_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/megadrive_launch.sh
index 1ba8664..cf3805a 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/megadrive_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/megadrive_launch.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 PicoDrive "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/nes_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/nes_launch.sh
index 5a419fc..e241779 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/nes_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/nes_launch.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 fceux "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/ngp_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/ngp_launch.sh
index e1808cc..54e6eb9 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/ngp_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/ngp_launch.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/pce_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/pce_launch.sh
index 81b4477..6c3f914 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/pce_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/pce_launch.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_mednafen.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_mednafen.sh
index abf0514..b81a321 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_mednafen.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_mednafen.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 pcsx -frameskip -cdfile "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_pcsx.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_pcsx.sh
index 2db7452..b2a0613 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_pcsx.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_pcsx.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 pcsx -cdfile "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sms_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sms_launch.sh
index 1ba8664..cf3805a 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sms_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sms_launch.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 PicoDrive "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch.sh
index 3e7093a..e0b39cf 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 psnes "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch_mednafen.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch_mednafen.sh
index 3e7093a..e0b39cf 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch_mednafen.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch_mednafen.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
 psnes "$1"&
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/wonderswan_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/wonderswan_launch.sh
index 93fbd91..69f7ca2 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/wonderswan_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/wonderswan_launch.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-export HOME=/tmp/funkey
-mkdir -p ${HOME}
-cd ${HOME}
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
index b07b609..eda2ecf 100644
--- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
+++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 PCSX_REARMED_VERSION = 048e75a
->>>>>>> 8952620d72a1241a93e1059e248631dab455886c
 PCSX_REARMED_SITE_METHOD = git
 PCSX_REARMED_SITE = https://github.com/FunKey-Project/pcsx_rearmed.git
 PCSX_REARMED_LICENSE = GPL-2.0