Merge branch 'develop' of fk:FunKey-Project/FunKey-OS into develop

Michel-FK · Michel-FK · commit f7dec069cdc8 · 2021-03-02T09:04:50.000+01:00
diff --git 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.0.0
+ Version 2.0.1
  -----------------------------------------------------
 
diff --git 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.0.0 (Rowdy Rabbit)"
+VERSION="2.0.1 (Defiant Dog)"
 ID=funkey
 ID_LIKE=buildroot
-PRETTY_NAME="FunKey-OS 2.0.0"
-VERSION_ID="2.0.0.0"
+PRETTY_NAME="FunKey-OS 2.0.1"
+VERSION_ID="2.0.1"
 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=Defiant
+UBUNTU_CODENAME=Defiant
diff --git a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions
@@ -1 +1 @@
-rootfs	2.0.0
+rootfs	2.0.1
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf
@@ -1,7 +1,7 @@
 # Uncomment and edit the following line to use a different ROM path.
 list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
 list.includeMissingItems = false
-list.extensions = nes,NES
+list.extensions = nes,NES,fds,FDS
 list.menuSort = yes
 
 launcher = NES
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/SMS.png b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/SMS.png
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/settings.conf
@@ -19,7 +19,7 @@ list.includeMissingItems = true
 ###############################################################################
 # Extensions are comma separated without spaces
 ###############################################################################
-list.extensions = zip,ZIP,md,MD
+list.extensions = zip,ZIP,md,MD,bin,BIN,smd,SMD
 
 ###############################################################################
 # If a menu.xml file exists, it will display the menu alphabetically. To
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/sms.png b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/sms.png
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Master System/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Master System/settings.conf
@@ -19,7 +19,7 @@ list.includeMissingItems = true
 ###############################################################################
 # Extensions are comma separated without spaces
 ###############################################################################
-list.extensions = zip,ZIP,sms,SMS
+list.extensions = zip,ZIP,sms,SMS,bin,BIN
 
 ###############################################################################
 # If a menu.xml file exists, it will display the menu alphabetically. To
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/WonderSwan/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/WonderSwan/settings.conf
@@ -1,7 +1,7 @@
 # Uncomment and edit the following line to use a different ROM path.
 list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
 list.includeMissingItems = false
-list.extensions = zip,ZIP,wsc,WSC
+list.extensions = zip,ZIP,wsc,WSC,ws,WS
 list.menuSort = yes
 
 launcher = wonderswan
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/share/gmenu2x/skins/240x240/Default/skin.conf b/FunKey/board/funkey/rootfs-overlay/usr/share/gmenu2x/skins/240x240/Default/skin.conf
@@ -0,0 +1,12 @@
+font="/usr/share/fonts/truetype/dejavu/DejaVuSansCondensed-Bold.ttf"
+messageBoxBorder=#505050ff
+topBarBg=#ffffff80
+selectionBg=#ffffff80
+messageBoxBg=#00000080
+messageBoxSelection=#fffffff80
+bottomBarBg=#ffffff80
+topBarHeight=50
+bottomBarHeight=21
+linkHeight=56
+linkWidth=78
+fontsize=11
diff --git a/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop b/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop
@@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true
 Categories=emulators;
 selectorbrowser=true
 SelectorDir=/mnt/NES
-SelectorFilter=nes,NES
+SelectorFilter=nes,NES,fds,FDS
diff --git a/FunKey/package/gnuboy/opk/gbc/gbc.funkey-s.desktop b/FunKey/package/gnuboy/opk/gbc/gbc.funkey-s.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Name=GameBoy Col
+Name=GameBoy Color
 Comment=Game Boy Color Emulator
 Icon=gbc
 Exec=/usr/games/launchers/gb_launch.sh %f
diff --git a/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop b/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Name=GameBoy Adv
+Name=GameBoy Advance
 Comment=Game Boy Advance Emulator
 Icon=gba
 Exec=/usr/games/launchers/gba_launch_gpsp.sh %f
diff --git a/FunKey/package/mednafen/opk/wonderswan/wonderswan.funkey-s.desktop b/FunKey/package/mednafen/opk/wonderswan/wonderswan.funkey-s.desktop
@@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true
 Categories=emulators;
 selectorbrowser=true
 SelectorDir=/mnt/WonderSwan
-SelectorFilter=zip,ZIP,wsc,WSC
+SelectorFilter=zip,ZIP,wsc,WSC,ws,WS
diff --git a/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop b/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop
@@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true
 Categories=emulators;
 selectorbrowser=true
 SelectorDir=/mnt/Sega Genesis
-SelectorFilter=zip,ZIP,md,MD
+SelectorFilter=zip,ZIP,md,MD,bin,BIN,smd,SMD
diff --git a/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop b/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=Sega Master System
+Comment=Sega Master System Emulator
+Icon=sms
+Exec=/usr/games/launchers/sms_launch.sh %f
+Terminal=false
+X-OD-NeedsDownscaling=true
+Categories=emulators;
+selectorbrowser=true
+SelectorDir=/mnt/Sega Master System
+SelectorFilter=zip,ZIP,sms,SMS,bin,BIN
diff --git a/FunKey/package/picodrive/opk/sms/sms.png b/FunKey/package/picodrive/opk/sms/sms.png
diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk
@@ -47,6 +47,7 @@ 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
 endef
 PICODRIVE_POST_INSTALL_TARGET_HOOKS += PICODRIVE_CREATE_OPK
 
