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

no more loop in start_launcher after shutdown

This commit is contained in:
Vincent-FK 2021-01-11 18:51:26 +01:00
parent 8a62ff605e
commit c1fd9e55d6
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,9 @@
#!/bin/sh #!/bin/sh
# Notify system, reboot in progress
REBOOTING_FILE="/run/rebooting"
touch $REBOOTING_FILE
# Notif fullscreen "Shutting down" # Notif fullscreen "Shutting down"
notif_set 0 "^^^^^^^^ SHUTTING DOWN...^^^^^^^^" notif_set 0 "^^^^^^^^ SHUTTING DOWN...^^^^^^^^"
@ -9,6 +13,7 @@ start_audio_amp 0 >/dev/null 2>&1
# Force Read Only # Force Read Only
ro ro
# Unmount writeable partition to force
umount -r /mnt umount -r /mnt
# Poweroff # Poweroff

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

@ -6,6 +6,7 @@
LOCK_FILE="/var/lock/launcher.lock" LOCK_FILE="/var/lock/launcher.lock"
INSTANT_PLAY_FILE="/mnt/instant_play" INSTANT_PLAY_FILE="/mnt/instant_play"
PREVENT_LAUNCHER_FILE="/mnt/prevent_launcher" PREVENT_LAUNCHER_FILE="/mnt/prevent_launcher"
REBOOTING_FILE="/run/rebooting"
if [ -f "${LOCK_FILE}" ]; then if [ -f "${LOCK_FILE}" ]; then
@ -56,12 +57,19 @@ while true; do
wait $! wait $!
erase_pid erase_pid
# Restart ampli audio if necessary
start_audio_amp 1 >/dev/null 2>&1
# In case retrofe quits with errors, clear graphic VT # In case retrofe quits with errors, clear graphic VT
termfix_all termfix_all
fi fi
# WD to prevent 100% CPU
sleep 0.5
# Exit if console rebooting
if [ -f $REBOOTING_FILE ]; then
break
fi
done done
# Remove lock file and exit
rm "${LOCK_FILE}" rm "${LOCK_FILE}"
exit 0 exit 0

2
FunKey/configs/funkey_defconfig
View File

@ -13,7 +13,7 @@ BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/FunKey-Project/FunKey-OS/releases
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_TARGET_OPTIMIZATION="-fno-PIC -march=armv7-a+neon-vfpv4 -mtune=cortex-a7 -mfpu=neon-vfpv4 -mvectorize-with-neon-quad" BR2_TARGET_OPTIMIZATION="-fno-PIC -march=armv7-a+neon-vfpv4 -mtune=cortex-a7 -mfpu=neon-vfpv4 -mvectorize-with-neon-quad -D__ARM_NEON__"
BR2_TARGET_GENERIC_HOSTNAME="FunKey" BR2_TARGET_GENERIC_HOSTNAME="FunKey"
BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the FunKey" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the FunKey"
BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/device_table.txt" BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/device_table.txt"

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

@ -3,7 +3,7 @@
# gmenu2x # gmenu2x
# #
############################################################# #############################################################
GMENU2X_VERSION = ac40292 GMENU2X_VERSION = 168b4be
GMENU2X_SITE_METHOD = git GMENU2X_SITE_METHOD = git
GMENU2X_SITE = https://github.com/FunKey-Project/gmenu2x.git GMENU2X_SITE = https://github.com/FunKey-Project/gmenu2x.git
GMENU2X_LICENSE = GPL-2.0 GMENU2X_LICENSE = GPL-2.0

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

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
RETROFE_VERSION = d07ca9c RETROFE_VERSION = 473e951
RETROFE_SITE_METHOD = git RETROFE_SITE_METHOD = git
RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.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 RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib