From d7a8d0c6ac1fe393515a8b0d4a9fe9b29dfa8018 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Fri, 12 Mar 2021 00:12:17 +0100 Subject: [PATCH] Emulators, Applications and Native games folders for opks, libopk updated to the latest version --- .../usr/local/share/OPKs/Applications/README | 1 + .../usr/local/share/OPKs/Emulators/README | 1 + .../usr/local/share/OPKs/Native games/README | 1 + FunKey/board/funkey/update_partition | 27 ++++++++++++++++--- FunKey/package/FCEUX/FCEUX.mk | 4 +-- FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk | 4 +-- FunKey/package/PocketSNES/PocketSNES.mk | 4 +-- FunKey/package/commander/commander.mk | 4 +-- FunKey/package/gnuboy/gnuboy.mk | 6 ++--- FunKey/package/gpsp/gpsp.mk | 4 +-- FunKey/package/libopk/libopk.mk | 2 +- FunKey/package/mednafen/mednafen.mk | 12 ++++----- .../picodrive/opk/sms/SMS.funkey-s.desktop | 2 +- FunKey/package/picodrive/picodrive.mk | 6 ++--- 14 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/README create mode 100644 FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Emulators/README create mode 100644 FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Native games/README diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/README b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/README new file mode 100644 index 0000000..407a7e4 --- /dev/null +++ b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Applications/README @@ -0,0 +1 @@ +This is the folder where you can put all your standalone applications opks diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Emulators/README b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Emulators/README new file mode 100644 index 0000000..2011058 --- /dev/null +++ b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Emulators/README @@ -0,0 +1 @@ +This is the folder where you can put all your emulators opks diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Native games/README b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Native games/README new file mode 100644 index 0000000..cd7b78b --- /dev/null +++ b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Native games/README @@ -0,0 +1 @@ +This is the folder where you can put all your standalone games opks diff --git a/FunKey/board/funkey/update_partition b/FunKey/board/funkey/update_partition index 2f27063..2e994f5 100755 --- a/FunKey/board/funkey/update_partition +++ b/FunKey/board/funkey/update_partition @@ -15,32 +15,53 @@ 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 # + ################# notif " 3/5 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE" resize2fs ${root_part} if [ $? -ne 0 ]; then notif " CANNOT RESIZE ROOT^FILESYSTEM" exit 1 fi + + ############# + # Copy OPKs # + ############# notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE" - folder_opks_emulators=/mnt/Emulators - mkdir -p "$folder_opks_emulators" + + # Mount Rootfs mkdir -p ${root_mount} mount -t ext4 ${root_part} ${root_mount} if [ $? -ne 0 ]; then notif "CANNOT MOUNT ROOT^FILESYSTEM" exit 1 fi - cp -f ${root_mount}/usr/games/opk/*.opk "$folder_opks_emulators" + + # Copy OPKs + shared_partition=/mnt/ + mkdir -p "$shared_partition" + cp -r ${root_mount}/usr/local/share/OPKs/* "$shared_partition" + + # Unmount Rootfs umount ${root_mount} if [ $? -ne 0 ]; then notif "CANNOT UNMOUNT ROOT^FILESYSTEM" exit 1 fi + + ##################### + # Erase update file # + ##################### for file in $(ls /mnt/FunKey-*.fwu); do notif " 5/5 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE" rm -f "${file}" diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk index d0186d8..8ff174c 100644 --- a/FunKey/package/FCEUX/FCEUX.mk +++ b/FunKey/package/FCEUX/FCEUX.mk @@ -48,8 +48,8 @@ define FCEUX_INSTALL_TARGET_CMDS endef define FCEUX_CREATE_OPK - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk - $(HOST_DIR)/usr/bin/mksquashfs $(FCEUX_PKGDIR)/opk/nes $(TARGET_DIR)/usr/games/opk/nes_fceux_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators + $(HOST_DIR)/usr/bin/mksquashfs $(FCEUX_PKGDIR)/opk/nes $(TARGET_DIR)/usr/local/share/OPKs/Emulators/nes_fceux_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef FCEUX_POST_INSTALL_TARGET_HOOKS += FCEUX_CREATE_OPK diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk index 8c6a520..7750a83 100644 --- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk +++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk @@ -48,8 +48,8 @@ define PCSX_REARMED_INSTALL_TARGET_CMDS endef define PCSX_REARMED_CREATE_OPK - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk - $(HOST_DIR)/usr/bin/mksquashfs $(PCSX_REARMED_PKGDIR)/opk/ps1 $(TARGET_DIR)/usr/games/opk/ps1_pcsx_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators + $(HOST_DIR)/usr/bin/mksquashfs $(PCSX_REARMED_PKGDIR)/opk/ps1 $(TARGET_DIR)/usr/local/share/OPKs/Emulators/ps1_pcsx_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef PCSX_REARMED_POST_INSTALL_TARGET_HOOKS += PCSX_REARMED_CREATE_OPK diff --git a/FunKey/package/PocketSNES/PocketSNES.mk b/FunKey/package/PocketSNES/PocketSNES.mk index 9f805ea..fc20e95 100644 --- a/FunKey/package/PocketSNES/PocketSNES.mk +++ b/FunKey/package/PocketSNES/PocketSNES.mk @@ -54,8 +54,8 @@ define POCKETSNES_INSTALL_TARGET_CMDS endef define POCKETSNES_CREATE_OPK - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk - $(HOST_DIR)/usr/bin/mksquashfs $(POCKETSNES_PKGDIR)/opk/snes $(TARGET_DIR)/usr/games/opk/snes_pocketsnes_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators + $(HOST_DIR)/usr/bin/mksquashfs $(POCKETSNES_PKGDIR)/opk/snes $(TARGET_DIR)/usr/local/share/OPKs/Emulators/snes_pocketsnes_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef POCKETSNES_POST_INSTALL_TARGET_HOOKS += POCKETSNES_CREATE_OPK diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk index 0da510b..7e526e7 100644 --- a/FunKey/package/commander/commander.mk +++ b/FunKey/package/commander/commander.mk @@ -17,7 +17,7 @@ define COMMANDER_INSTALL_CMDS endef define COMMANDER_CREATE_OPK - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Applications cd $(@D); \ $(HOST_DIR)/usr/bin/mksquashfs \ opkg/default.funkey-s.desktop \ @@ -33,7 +33,7 @@ define COMMANDER_CREATE_OPK res/Fiery_Turk.ttf \ res/FreeSans.ttf \ $(TARGET_DIR)/usr/bin/commander \ - $(TARGET_DIR)/usr/games/opk/commander-funkey-s.opk \ + $(TARGET_DIR)/usr/local/share/OPKs/Applications/commander-funkey-s.opk \ -all-root -noappend -no-exports -no-xattrs -noappend; \ rm -rf $(TARGET_DIR)/usr/bin/commander endef diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk index 7a3e44e..3467b27 100644 --- a/FunKey/package/gnuboy/gnuboy.mk +++ b/FunKey/package/gnuboy/gnuboy.mk @@ -26,9 +26,9 @@ GNUBOY_CONF_OPTS += --without-fb \ GNUBOY_CONF_ENV += SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" define GNUBOY_CREATE_OPK - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk - $(HOST_DIR)/usr/bin/mksquashfs $(GNUBOY_PKGDIR)/opk/gb $(TARGET_DIR)/usr/games/opk/gb_gnuboy_funkey-s.opk -all-root -noappend -no-exports -no-xattrs - $(HOST_DIR)/usr/bin/mksquashfs $(GNUBOY_PKGDIR)/opk/gbc $(TARGET_DIR)/usr/games/opk/gbc_gnuboy_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators + $(HOST_DIR)/usr/bin/mksquashfs $(GNUBOY_PKGDIR)/opk/gb $(TARGET_DIR)/usr/local/share/OPKs/Emulators/gb_gnuboy_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(HOST_DIR)/usr/bin/mksquashfs $(GNUBOY_PKGDIR)/opk/gbc $(TARGET_DIR)/usr/local/share/OPKs/Emulators/gbc_gnuboy_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef GNUBOY_POST_INSTALL_TARGET_HOOKS += GNUBOY_CREATE_OPK diff --git a/FunKey/package/gpsp/gpsp.mk b/FunKey/package/gpsp/gpsp.mk index 705fb90..1adeb19 100644 --- a/FunKey/package/gpsp/gpsp.mk +++ b/FunKey/package/gpsp/gpsp.mk @@ -41,8 +41,8 @@ define GPSP_INSTALL_TARGET_CMDS endef define GPSP_CREATE_OPK - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk - $(HOST_DIR)/usr/bin/mksquashfs $(GPSP_PKGDIR)/opk/gba $(TARGET_DIR)/usr/games/opk/gba_gpsp_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators + $(HOST_DIR)/usr/bin/mksquashfs $(GPSP_PKGDIR)/opk/gba $(TARGET_DIR)/usr/local/share/OPKs/Emulators/gba_gpsp_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef GPSP_POST_INSTALL_TARGET_HOOKS += GPSP_CREATE_OPK diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk index 7f767a7..e96cafe 100644 --- a/FunKey/package/libopk/libopk.mk +++ b/FunKey/package/libopk/libopk.mk @@ -3,7 +3,7 @@ # libopk # ############################################################# -LIBOPK_VERSION = libopk-FunKey-1.0.0 +LIBOPK_VERSION = libopk-FunKey-1.0.1 LIBOPK_SITE_METHOD = git LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git diff --git a/FunKey/package/mednafen/mednafen.mk b/FunKey/package/mednafen/mednafen.mk index 76f9f26..f9b51d2 100644 --- a/FunKey/package/mednafen/mednafen.mk +++ b/FunKey/package/mednafen/mednafen.mk @@ -30,12 +30,12 @@ MEDNAFEN_CONF_OPTS += --disable-ss --disable-ssfplay --disable-fancy-scalers MEDNAFEN_CONF_ENV += SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" define MEDNAFEN_CREATE_OPK - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk - $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/gamegear $(TARGET_DIR)/usr/games/opk/gamegear_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs - $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/lynx $(TARGET_DIR)/usr/games/opk/lynx_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs - $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/ngp $(TARGET_DIR)/usr/games/opk/ngp_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs - $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/pce $(TARGET_DIR)/usr/games/opk/pce_mednaefn_funkey-s.opk -all-root -noappend -no-exports -no-xattrs - $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/wonderswan $(TARGET_DIR)/usr/games/opk/wonderswan_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators + $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/gamegear $(TARGET_DIR)/usr/local/share/OPKs/Emulators/gamegear_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/lynx $(TARGET_DIR)/usr/local/share/OPKs/Emulators/lynx_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/ngp $(TARGET_DIR)/usr/local/share/OPKs/Emulators/ngp_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/pce $(TARGET_DIR)/usr/local/share/OPKs/Emulators/pce_mednaefn_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/wonderswan $(TARGET_DIR)/usr/local/share/OPKs/Emulators/wonderswan_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef MEDNAFEN_POST_INSTALL_TARGET_HOOKS += MEDNAFEN_CREATE_OPK diff --git a/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop b/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop index 75da2de..d848ba6 100644 --- a/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop +++ b/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Name=Sega Master System +Name=Master System Comment=Sega Master System Emulator Icon=sms Exec=/usr/games/launchers/sms_launch.sh %f diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk index 95d9357..f955b78 100644 --- a/FunKey/package/picodrive/picodrive.mk +++ b/FunKey/package/picodrive/picodrive.mk @@ -45,9 +45,9 @@ define PICODRIVE_INSTALL_TARGET_CMDS endef define PICODRIVE_CREATE_OPK - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk - $(HOST_DIR)/usr/bin/mksquashfs $(PICODRIVE_PKGDIR)/opk/megadrive $(TARGET_DIR)/usr/games/opk/megadrive_picodrive_funkey-s.opk -all-root -noappend -no-exports -no-xattrs - $(HOST_DIR)/usr/bin/mksquashfs $(PICODRIVE_PKGDIR)/opk/sms $(TARGET_DIR)/usr/games/opk/sms_picodrive_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators + $(HOST_DIR)/usr/bin/mksquashfs $(PICODRIVE_PKGDIR)/opk/megadrive $(TARGET_DIR)/usr/local/share/OPKs/Emulators/megadrive_picodrive_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(HOST_DIR)/usr/bin/mksquashfs $(PICODRIVE_PKGDIR)/opk/sms $(TARGET_DIR)/usr/local/share/OPKs/Emulators/sms_picodrive_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef PICODRIVE_POST_INSTALL_TARGET_HOOKS += PICODRIVE_CREATE_OPK