mirrors
/
FunKey-OS
mirror of https://github.com/FunKey-Project/FunKey-OS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
Vincent-FK 2021-04-22 09:39:03 +02:00
parent d36b044b51 fd35689bdf
commit 484d4e6905
28 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FunKey/board/funkey/rootfs-overlay/etc/hwrevision
View File

@ -1 +1 @@
FunKey_S Rev.E
FunKey_S Rev.F

2
FunKey/board/funkey/rootfs-overlay/etc/issue
View File

@ -5,6 +5,6 @@
|___| |_____|__|__||__|\__||_____|___ |
FUN ON A KEYCHAIN |_____|
-----------------------------------------------------
Version 2.1.0
Version 2.2.0
-----------------------------------------------------

10
FunKey/board/funkey/rootfs-overlay/etc/os-release
View File

@ -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

2
FunKey/board/funkey/rootfs-overlay/etc/sw-versions
View File

@ -1 +1 @@
rootfs 2.1.0
rootfs 2.2.0

5
FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher
View File

@ -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

10
FunKey/board/funkey/sw-description
View File

@ -1,8 +1,8 @@
software =
{
version = "2.1.0";
version = "2.2.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";

40
FunKey/board/funkey/update_partition
View File

@ -9,35 +9,27 @@ 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"
exit 1
fi
#############
# Copy OPKs #
#############
notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
##############################
# SHARED PARTITION PROCESSES #
##############################
notif " 3/4 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
# Mount Rootfs
mkdir -p ${root_mount}
@ -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,11 +52,21 @@ 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 #
#####################
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

2
FunKey/configs/funkey_defconfig
View File

@ -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

2
FunKey/package/FCEUX/FCEUX.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
FCEUX_VERSION = fceux-FunKey-1.2.0
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

2
FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.0
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

2
FunKey/package/PocketSNES/PocketSNES.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
POCKETSNES_VERSION = PocketSNES-FunKey-1.2.0
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

2
FunKey/package/commander/commander.mk
View File

@ -3,7 +3,7 @@
# commander
#
#############################################################
COMMANDER_VERSION = 936c912
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

2
FunKey/package/fkgpiod/fkgpiod.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
FKGPIOD_VERSION = 54d1051
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+

2
FunKey/package/gmenu2x/gmenu2x.mk
View File

@ -3,7 +3,7 @@
# gmenu2x
#
#############################################################
GMENU2X_VERSION = gmenu2x-FunKey-1.0.2
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

2
FunKey/package/gnuboy/gnuboy.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GNUBOY_VERSION = gnuboy-FunKey-1.2.0
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

2
FunKey/package/gpsp/gpsp.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GPSP_VERSION = gpsp-FunKey-1.2.0
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

3
FunKey/package/libopk/libopk.mk
View File

@ -3,8 +3,7 @@
# libopk
#
#############################################################
#LIBOPK_VERSION = libopk-FunKey-1.0.1
LIBOPK_VERSION = 43e8380
LIBOPK_VERSION = libopk-FunKey-1.0.2
LIBOPK_SITE_METHOD = git
LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git

2
FunKey/package/mednafen/mednafen.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.0
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+

2
FunKey/package/picodrive/picodrive.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
PICODRIVE_VERSION = picodrive-FunKey-1.2.1
PICODRIVE_VERSION = picodrive-FunKey-1.2.2
PICODRIVE_SITE_METHOD = git
PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive.git
PICODRIVE_LICENSE = MAME

2
FunKey/package/retrofe/retrofe.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
RETROFE_VERSION = RetroFE-FunKey-1.1.0
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

2
README.md
View File

@ -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

2
Recovery/board/funkey/rootfs-overlay/etc/hwrevision
View File

@ -1 +1 @@
FunKey_S Rev.E
FunKey_S Rev.F

4
Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery
View File

@ -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...^^^^^^^^"

2
Recovery/board/funkey/rootfs-overlay/etc/issue
View File

@ -5,6 +5,6 @@
|___| |_____|__|__||__|\__||_____|___ |
FUN ON A KEYCHAIN |_____|
-----------------------------------------------------
Version 2.0.0 (Recovery)
Version 2.1.0 (Recovery)
-----------------------------------------------------

10
Recovery/board/funkey/rootfs-overlay/etc/os-release
View File

@ -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

2
Recovery/board/funkey/rootfs-overlay/etc/sw-versions
View File

@ -1 +1 @@
Recovery 2.0.0
Recovery 2.1.0

6
Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu
View File

@ -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"

2
Recovery/package/fkgpiod/fkgpiod.mk
View File

@ -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+