From 1965c26108581f4a5a6ddcea9f76c6986ee685db Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 10 Oct 2022 07:40:33 -0400 Subject: [PATCH 01/10] We shouldn't hide any extensions by default. --- .../ui/emulationstation/config/common/es_settings.cfg | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/packages/ui/emulationstation/config/common/es_settings.cfg b/packages/ui/emulationstation/config/common/es_settings.cfg index c29f4c746..6716e08ef 100644 --- a/packages/ui/emulationstation/config/common/es_settings.cfg +++ b/packages/ui/emulationstation/config/common/es_settings.cfg @@ -52,16 +52,6 @@ - - - - - - - - - - From 65f4452796ee042beda4715e348ed9d9d1702f75 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 10 Oct 2022 18:45:08 -0400 Subject: [PATCH 02/10] Fix workflow download links. --- .github/workflows/build-dev.yaml | 2 +- .github/workflows/build-main.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index 3a5d28792..d0000edfe 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -109,7 +109,7 @@ jobs: * Copy the update to your device over the network or to the sdcard's update folder. * Reboot the device, and the update will begin automatically. - Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.tar)] + Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)] ## Documentation * [Home](https://github.com/JustEnoughLinuxOS/distribution/wiki) diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml index c71973fd5..a54bf1403 100644 --- a/.github/workflows/build-main.yaml +++ b/.github/workflows/build-main.yaml @@ -97,7 +97,7 @@ jobs: * Decompress the image. * Write the image to an SDCARD using an imaging tool. Common imaging tools include [Balena Etcher](https://www.balena.io/etcher/), [Raspberry Pi Imager](https://www.raspberrypi.com/software/), and [Win32 Disk Imager](https://sourceforge.net/projects/win32diskimager/). If you're skilled with the command line, dd works fine too. - Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)] + Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)] ## Upgrading * Download and install the update online via the System Settings menu. @@ -108,7 +108,7 @@ jobs: * Copy the update to your device over the network or to the sdcard's update folder. * Reboot the device, and the update will begin automatically. - Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.tar)] + Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.tar)] ## Documentation * [Home](https://github.com/JustEnoughLinuxOS/distribution/wiki) From 02466cf5bd2f3b47c82a174f330ad7601ba276bc Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 10 Oct 2022 20:04:55 -0400 Subject: [PATCH 03/10] Add a simple wait to ES incase mount_games hasn't completed yet. --- packages/jelos/sources/autostart/common/003-mount_games | 6 +++++- packages/ui/emulationstation/sources/es_settings | 5 +++++ packages/ui/emulationstation/sources/start_es.sh | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/jelos/sources/autostart/common/003-mount_games b/packages/jelos/sources/autostart/common/003-mount_games index 9c524824e..047bef261 100755 --- a/packages/jelos/sources/autostart/common/003-mount_games +++ b/packages/jelos/sources/autostart/common/003-mount_games @@ -9,11 +9,14 @@ UPDATE_ROOT="/storage/.update" MOUNT_GAMES=$(get_setting system.automount) GAMES_DEVICE=$(get_setting system.gamesdevice) +touch /storage/.mounting + if [[ ! "${MOUNT_GAMES}" =~ [0-9] ]] then set_setting system.automount 1 elif [[ "${MOUNT_GAMES}" == "0" ]] then + rm /storage/.mounting exit 0 fi @@ -69,4 +72,5 @@ then else find_games fi - +i +rm /storage/.mounting diff --git a/packages/ui/emulationstation/sources/es_settings b/packages/ui/emulationstation/sources/es_settings index 81c5699d2..9ec98f7fc 100755 --- a/packages/ui/emulationstation/sources/es_settings +++ b/packages/ui/emulationstation/sources/es_settings @@ -9,6 +9,11 @@ set_audio alsa export SDL_AUDIODRIVER=alsa +while [ -e "/storage/.mounting" ] +do + sleep .5 +done + TZ=$(get_setting system.timezone) echo -n "TIMEZONE=${TZ}" > /storage/.cache/timezone echo -n "${TZ}" >/storage/.cache/system_timezone diff --git a/packages/ui/emulationstation/sources/start_es.sh b/packages/ui/emulationstation/sources/start_es.sh index fca77d0d3..0d9a4c65e 100755 --- a/packages/ui/emulationstation/sources/start_es.sh +++ b/packages/ui/emulationstation/sources/start_es.sh @@ -9,6 +9,11 @@ set_audio alsa export SDL_AUDIODRIVER=alsa +while [ -e "/storage/.mounting" ] +do + sleep .5 +done + TZ=$(get_setting system.timezone) echo -n "TIMEZONE=${TZ}" > /storage/.cache/timezone echo -n "${TZ}" >/storage/.cache/system_timezone From 7d044a8d7dd434a32f6a660923f59aa98053508d Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 11 Oct 2022 07:34:21 -0400 Subject: [PATCH 04/10] Fix wifi scanning bug. --- packages/jelos/sources/scripts/wifictl | 2 +- packages/ui/emulationstation/package.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jelos/sources/scripts/wifictl b/packages/jelos/sources/scripts/wifictl index f185a662e..777214f4f 100755 --- a/packages/jelos/sources/scripts/wifictl +++ b/packages/jelos/sources/scripts/wifictl @@ -105,7 +105,7 @@ EOF list_wifi | awk '{sub(/\S+=/,"",$0);print}' ;; "scan") - connmanctl scan 2>/dev/null + connmanctl scan wifi 2>/dev/null ;; "scanlist") set_wifi scan 2>/dev/null diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk index 079103cd5..3ab7edd44 100644 --- a/packages/ui/emulationstation/package.mk +++ b/packages/ui/emulationstation/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="emulationstation" -PKG_VERSION="7664fd9" +PKG_VERSION="6844bc8" PKG_GIT_CLONE_BRANCH="main" PKG_REV="1" PKG_ARCH="any" From 6fc3531e1b0b693d23ce39e5af8cc95011c665fc Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 11 Oct 2022 16:55:54 -0400 Subject: [PATCH 05/10] Fix boot delay with devices using the RTL8821CU adapter. --- .../kernel/linux-drivers/RTL8821CU/package.mk | 2 +- .../kernel/linux/udev.d/40-usb_modeswitch.rules | 16 ++++++++++++++++ projects/PC/devices/handheld/options | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 packages/kernel/linux/udev.d/40-usb_modeswitch.rules diff --git a/packages/kernel/linux-drivers/RTL8821CU/package.mk b/packages/kernel/linux-drivers/RTL8821CU/package.mk index a15985996..1f1e23559 100644 --- a/packages/kernel/linux-drivers/RTL8821CU/package.mk +++ b/packages/kernel/linux-drivers/RTL8821CU/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2021-present Fewtarius PKG_NAME="RTL8821CU" -PKG_VERSION="14798a1" +PKG_VERSION="4dfe0bc" PKG_LICENSE="GPL" PKG_SITE="https://github.com/morrownr/8821cu-20210118" PKG_URL="${PKG_SITE}.git" diff --git a/packages/kernel/linux/udev.d/40-usb_modeswitch.rules b/packages/kernel/linux/udev.d/40-usb_modeswitch.rules new file mode 100644 index 000000000..4034ac72b --- /dev/null +++ b/packages/kernel/linux/udev.d/40-usb_modeswitch.rules @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) + +ACTION!="add|change", GOTO="end_modeswitch" + +# Atheros Wireless / Netgear WNDA3200 +ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/usr/bin/eject '/dev/%k'" + +# Realtek RTL8821CU chipset 802.11ac NIC +# initial cdrom mode 0bda:1a2b, wlan mode 0bda:c811 +# Odroid WiFi Module 5B +# initial cdrom mode 0bda:1a2b, wlan mode 0bda:c820 +ATTR{idVendor}=="0bda", ATTR{idProduct}=="1a2b", RUN+="/usr/sbin/usb_modeswitch -K -v 0bda -p 1a2b" +ATTR{idVendor}=="0bda", ATTR{idProduct}=="c811", RUN+="/usr/sbin/usb_modeswitch -K -v 0bda -p c811" + +LABEL="end_modeswitch" diff --git a/projects/PC/devices/handheld/options b/projects/PC/devices/handheld/options index 378981535..8e6643760 100644 --- a/projects/PC/devices/handheld/options +++ b/projects/PC/devices/handheld/options @@ -40,6 +40,7 @@ # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" # ADDITIONAL_DRIVERS="" + ADDITIONAL_DRIVERS="RTL8821CU" # build and install driver addons (yes / no) DRIVER_ADDONS_SUPPORT="no" From 187fe72c160ea8fd6603a917093f66336f4d4df4 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Wed, 12 Oct 2022 16:54:40 -0400 Subject: [PATCH 06/10] Bump mesa, fix run issue, fix missing wireguard on some devices. --- packages/graphics/mesa/package.mk | 3 +-- packages/jelos/sources/scripts/run | 2 +- packages/network/tailscale/package.mk | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 65fc6a3dd..9445f9b0c 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mesa" -PKG_VERSION="d5394296becfc97bc992c82d6f5d013b35b5275a" +PKG_VERSION="f00b54bc9e70e49f546ac2efeceb59540ff4a6fd" PKG_LICENSE="OSS" PKG_SITE="https://gitlab.freedesktop.org/mesa/mesa" PKG_URL="${PKG_SITE}.git" @@ -16,7 +16,6 @@ get_graphicdrivers PKG_MESON_OPTS_TARGET="-Ddri-drivers= \ -Dgallium-drivers=${GALLIUM_DRIVERS// /,} \ -Dgallium-extra-hud=false \ - -Dgallium-xvmc=disabled \ -Dgallium-omx=disabled \ -Dgallium-nine=false \ -Dgallium-opencl=disabled \ diff --git a/packages/jelos/sources/scripts/run b/packages/jelos/sources/scripts/run index 2a1e3218e..b89bbde14 100755 --- a/packages/jelos/sources/scripts/run +++ b/packages/jelos/sources/scripts/run @@ -12,7 +12,7 @@ then else systemctl stop ${UI_SERVICE} clear >/dev/console 2>&1 - "$*" >/dev/console 2>&1 + $* >/dev/console 2>&1 || "$*" clear >/dev/console 2>&1 fi if [ ! "${UI_SERVICE}" = "weston.service" ] diff --git a/packages/network/tailscale/package.mk b/packages/network/tailscale/package.mk index 72bca5736..6851344db 100644 --- a/packages/network/tailscale/package.mk +++ b/packages/network/tailscale/package.mk @@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain wireguard-tools" PKG_SHORTDESC="Zero config VPN. Installs on any device in minutes, manages firewall rules for you, and works from anywhere." PKG_TOOLCHAIN="manual" -case ${TARGET_ARCH} in +case ${DEVICE} in RG351P|RG351V|RG351MP|RG503|RG353P) PKG_DEPENDS_TARGET+=" wireguard-linux-compat" ;; From 428a8fd5ba29a2a0c32733cada2e9ed50ab26064 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Wed, 12 Oct 2022 20:50:22 -0400 Subject: [PATCH 07/10] Revert mesa change. --- packages/graphics/mesa/package.mk | 3 ++- .../kernel/linux/udev.d/40-modeswitch.rules | 17 ----------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 packages/kernel/linux/udev.d/40-modeswitch.rules diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 9445f9b0c..65fc6a3dd 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mesa" -PKG_VERSION="f00b54bc9e70e49f546ac2efeceb59540ff4a6fd" +PKG_VERSION="d5394296becfc97bc992c82d6f5d013b35b5275a" PKG_LICENSE="OSS" PKG_SITE="https://gitlab.freedesktop.org/mesa/mesa" PKG_URL="${PKG_SITE}.git" @@ -16,6 +16,7 @@ get_graphicdrivers PKG_MESON_OPTS_TARGET="-Ddri-drivers= \ -Dgallium-drivers=${GALLIUM_DRIVERS// /,} \ -Dgallium-extra-hud=false \ + -Dgallium-xvmc=disabled \ -Dgallium-omx=disabled \ -Dgallium-nine=false \ -Dgallium-opencl=disabled \ diff --git a/packages/kernel/linux/udev.d/40-modeswitch.rules b/packages/kernel/linux/udev.d/40-modeswitch.rules deleted file mode 100644 index c20097137..000000000 --- a/packages/kernel/linux/udev.d/40-modeswitch.rules +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) - -ACTION!="add|change", GOTO="end_modeswitch" -KERNEL!="sr[0-9]*", GOTO="end_modeswitch" -SUBSYSTEM!="block", GOTO="end_modeswitch" - -# Atheros Wireless / Netgear WNDA3200 -ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/usr/bin/eject '/dev/%k'" - -# Realtek RTL8821CU chipset 802.11ac NIC -# initial cdrom mode 0bda:1a2b, wlan mode 0bda:c811 -# Odroid WiFi Module 5B -# initial cdrom mode 0bda:1a2b, wlan mode 0bda:c820 -ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="1a2b", RUN+="/usr/bin/eject '/dev/%k'" - -LABEL="end_modeswitch" From c30432f824971a2ad1cbb76f86232197e813081b Mon Sep 17 00:00:00 2001 From: fewtarius Date: Fri, 14 Oct 2022 16:51:45 -0400 Subject: [PATCH 08/10] Move automount to a systemd service so dependencies are managed correctly. --- .github/workflows/build-dev.yaml | 2 ++ .github/workflows/build-main.yaml | 2 ++ README.md | 1 + .../sources/autostart/common/011-portmaster | 1 - packages/jelos/package.mk | 2 ++ packages/jelos/sources/post-update | 6 ++++++ .../common/003-mount_games => scripts/automount} | 12 +++++------- packages/jelos/system.d/jelos-automount.service | 13 +++++++++++++ .../sysutils/jslisten}/system.d/jslisten.service | 0 .../sysutils/jslisten}/system.d/jslisten.target | 0 packages/ui/emulationstation/sources/es_settings | 5 ----- packages/ui/emulationstation/sources/start_es.sh | 5 ----- 12 files changed, 31 insertions(+), 18 deletions(-) rename packages/jelos/sources/{autostart/common/003-mount_games => scripts/automount} (87%) create mode 100644 packages/jelos/system.d/jelos-automount.service rename packages/{jelos => tools/sysutils/jslisten}/system.d/jslisten.service (100%) rename packages/{jelos => tools/sysutils/jslisten}/system.d/jslisten.target (100%) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index d0000edfe..cef75d09c 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -102,6 +102,8 @@ jobs: Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)] + > RG353V users, enable "DEVICE IS RG353V" in the system settings menu after flashing. + ## Upgrading * Download and install the update online via the System Settings menu. * If you are unable to update online diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml index a54bf1403..2ada6b635 100644 --- a/.github/workflows/build-main.yaml +++ b/.github/workflows/build-main.yaml @@ -99,6 +99,8 @@ jobs: Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)] + > RG353V users, enable "DEVICE IS RG353V" in the system settings menu after flashing. + ## Upgrading * Download and install the update online via the System Settings menu. ## Upgrading diff --git a/README.md b/README.md index 8e6e49ac1..7628be57d 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ limitations under the License. ## Installation * x86_64 versions of JELOS include an installation tool. This tool may be run from the boot menu or from within JELOS by switching to desktop mode and running "installer" in a terminal. +* RG353V users should use the RG353P image, and select "DEVICE IS RG353V" from the system settings menu in EmulationStation. ## Upgrading * Download and install the update online via the System Settings menu. diff --git a/packages/games/tools/portmaster/sources/autostart/common/011-portmaster b/packages/games/tools/portmaster/sources/autostart/common/011-portmaster index 6818c9921..5a4848058 100755 --- a/packages/games/tools/portmaster/sources/autostart/common/011-portmaster +++ b/packages/games/tools/portmaster/sources/autostart/common/011-portmaster @@ -3,7 +3,6 @@ # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius) # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) - if [ ! -d "/storage/roms/ports/PortMaster" ] then mkdir -p /storage/roms/ports/PortMaster diff --git a/packages/jelos/package.mk b/packages/jelos/package.mk index e59f0c990..35099d54d 100644 --- a/packages/jelos/package.mk +++ b/packages/jelos/package.mk @@ -125,6 +125,7 @@ post_install() { EOF cp ${PKG_DIR}/sources/scripts/* ${INSTALL}/usr/bin + enable_service jelos-automount.service if [ -d "${PKG_DIR}/sources/asound/${DEVICE}" ] then @@ -171,4 +172,5 @@ EOF then sed -i "s#ssh.enabled=0#ssh.enabled=1#g" ${INSTALL}/usr/config/system/configs/system.cfg fi + } diff --git a/packages/jelos/sources/post-update b/packages/jelos/sources/post-update index ce160ac79..750901c43 100644 --- a/packages/jelos/sources/post-update +++ b/packages/jelos/sources/post-update @@ -117,3 +117,9 @@ if [ ! -e "/storage/.config/smb.conf" ] then cp -f /usr/config/smb.conf /storage/.config fi + +# Merge alsa configs on 353P/V +if [[ "${HW_DEVICE}" =~ RG353P ]] +then + cp /usr/config/asound.conf /storage/.config +fi diff --git a/packages/jelos/sources/autostart/common/003-mount_games b/packages/jelos/sources/scripts/automount similarity index 87% rename from packages/jelos/sources/autostart/common/003-mount_games rename to packages/jelos/sources/scripts/automount index 047bef261..49e87b8c9 100755 --- a/packages/jelos/sources/autostart/common/003-mount_games +++ b/packages/jelos/sources/scripts/automount @@ -9,14 +9,11 @@ UPDATE_ROOT="/storage/.update" MOUNT_GAMES=$(get_setting system.automount) GAMES_DEVICE=$(get_setting system.gamesdevice) -touch /storage/.mounting - if [[ ! "${MOUNT_GAMES}" =~ [0-9] ]] then set_setting system.automount 1 elif [[ "${MOUNT_GAMES}" == "0" ]] then - rm /storage/.mounting exit 0 fi @@ -26,6 +23,7 @@ mount_games() { [ -e "${1}" ] && \ [ ! -e "/storage/.please_resize_me" ] then + echo "Mounting ${1} on /storage/roms" mount ${1} /storage/roms >/dev/null 2>&1 /usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/jelos-dirs.conf >/dev/null 2>&1 fi @@ -41,14 +39,16 @@ find_games() { for DEV in $(blkid | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' | sort -r) do ROOTDEV=$(echo ${DEV} | sed -e "s#^/.*/##g" -e "s#p[0-9].*\$##g") - SIZE=$(awk '/'${ROOTDEV}'/ {print $3}' /proc/partitions) - if [ "${SIZE}" -le "8388608" ] + SIZE=$(awk '/'${ROOTDEV}'$/ {print $3}' /proc/partitions) + if (( ${SIZE} <= 8388608 )) then + echo "Device ${ROOTDEV} is too small, ignoring." # We don't want to mount partitions smaller than ~8GB. continue fi if [ -L "/sys/class/block/${ROOTDEV}boot0" ] then + echo "Device ${ROOTDEV} might be Android, ignoring." # Assume this is an android boot device and ignore it. continue fi @@ -72,5 +72,3 @@ then else find_games fi -i -rm /storage/.mounting diff --git a/packages/jelos/system.d/jelos-automount.service b/packages/jelos/system.d/jelos-automount.service new file mode 100644 index 000000000..b3b1b7e2e --- /dev/null +++ b/packages/jelos/system.d/jelos-automount.service @@ -0,0 +1,13 @@ +[Unit] +Description=JELOS user autostart script +Before=autostart.service +After=systemd-tmpfiles-setup.service + +[Service] +Type=oneshot +Environment=HOME=/storage +ExecStart=-/bin/sh -c ". /etc/profile; exec /bin/sh /usr/bin/automount" +RemainAfterExit=yes + +[Install] +WantedBy=jelos.target diff --git a/packages/jelos/system.d/jslisten.service b/packages/tools/sysutils/jslisten/system.d/jslisten.service similarity index 100% rename from packages/jelos/system.d/jslisten.service rename to packages/tools/sysutils/jslisten/system.d/jslisten.service diff --git a/packages/jelos/system.d/jslisten.target b/packages/tools/sysutils/jslisten/system.d/jslisten.target similarity index 100% rename from packages/jelos/system.d/jslisten.target rename to packages/tools/sysutils/jslisten/system.d/jslisten.target diff --git a/packages/ui/emulationstation/sources/es_settings b/packages/ui/emulationstation/sources/es_settings index 9ec98f7fc..81c5699d2 100755 --- a/packages/ui/emulationstation/sources/es_settings +++ b/packages/ui/emulationstation/sources/es_settings @@ -9,11 +9,6 @@ set_audio alsa export SDL_AUDIODRIVER=alsa -while [ -e "/storage/.mounting" ] -do - sleep .5 -done - TZ=$(get_setting system.timezone) echo -n "TIMEZONE=${TZ}" > /storage/.cache/timezone echo -n "${TZ}" >/storage/.cache/system_timezone diff --git a/packages/ui/emulationstation/sources/start_es.sh b/packages/ui/emulationstation/sources/start_es.sh index 0d9a4c65e..fca77d0d3 100755 --- a/packages/ui/emulationstation/sources/start_es.sh +++ b/packages/ui/emulationstation/sources/start_es.sh @@ -9,11 +9,6 @@ set_audio alsa export SDL_AUDIODRIVER=alsa -while [ -e "/storage/.mounting" ] -do - sleep .5 -done - TZ=$(get_setting system.timezone) echo -n "TIMEZONE=${TZ}" > /storage/.cache/timezone echo -n "${TZ}" >/storage/.cache/system_timezone From d2338ef3d4691dc322a6e3712215764370d5bbe2 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Fri, 14 Oct 2022 16:52:49 -0400 Subject: [PATCH 09/10] Revert post-update change. --- packages/jelos/sources/post-update | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/jelos/sources/post-update b/packages/jelos/sources/post-update index 750901c43..ee26b15ee 100644 --- a/packages/jelos/sources/post-update +++ b/packages/jelos/sources/post-update @@ -118,8 +118,3 @@ then cp -f /usr/config/smb.conf /storage/.config fi -# Merge alsa configs on 353P/V -if [[ "${HW_DEVICE}" =~ RG353P ]] -then - cp /usr/config/asound.conf /storage/.config -fi From 6dc9c27ca6eaf3370096f2f3f72ec07c7b205c47 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Sat, 15 Oct 2022 08:02:48 -0400 Subject: [PATCH 10/10] Fix starting PortMaster, ThemeMaster, and JELOSAddOns. --- .../sources/autostart/common/012-jelosaddons | 5 ++--- .../sources/autostart/common/011-portmaster | 5 ++--- packages/jelos/sources/post-update | 16 +++++++++++++--- packages/misc/modules/sources/JelosAddOns.sh | 3 ++- packages/misc/modules/sources/PortMaster.sh | 4 +++- packages/misc/modules/sources/ThemeMaster.sh | 3 ++- .../sources/autostart/common/011-thememaster | 5 ++--- 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/packages/games/tools/jelosaddons/sources/autostart/common/012-jelosaddons b/packages/games/tools/jelosaddons/sources/autostart/common/012-jelosaddons index 4112d5759..bc2b30532 100644 --- a/packages/games/tools/jelosaddons/sources/autostart/common/012-jelosaddons +++ b/packages/games/tools/jelosaddons/sources/autostart/common/012-jelosaddons @@ -8,7 +8,6 @@ then mkdir -p /storage/roms/ports/JelosAddOns rsync -a /usr/share/JelosAddOns/* /storage/roms/ports/JelosAddOns/ chmod -R 755 /storage/roms/ports/JelosAddOns - mv -f /storage/roms/ports/JelosAddOns/JelosAddOns.sh /storage/roms/ports/JelosAddOns fi #Check if gamelist.xml exists, if not create gamelist.xml to hide JelosAddOns by default. @@ -19,7 +18,7 @@ touch /storage/roms/ports/gamelist.xml - /storage/roms/ports/JelosAddOns.sh + /storage/roms/ports/JelosAddOns/JelosAddOns.sh JelosAddOns true @@ -32,7 +31,7 @@ if ! grep -R "JelosAddOns" "/storage/roms/ports/gamelist.xml" then sed -i 's||& \ \ - /storage/roms/ports/JelosAddOns.sh\ + /storage/roms/ports/JelosAddOns/JelosAddOns.sh\ JelosAddOns\ true\ |' /storage/roms/ports/gamelist.xml diff --git a/packages/games/tools/portmaster/sources/autostart/common/011-portmaster b/packages/games/tools/portmaster/sources/autostart/common/011-portmaster index 5a4848058..849f96960 100755 --- a/packages/games/tools/portmaster/sources/autostart/common/011-portmaster +++ b/packages/games/tools/portmaster/sources/autostart/common/011-portmaster @@ -8,7 +8,6 @@ then mkdir -p /storage/roms/ports/PortMaster rsync -a /usr/share/PortMaster/* /storage/roms/ports/PortMaster/ chmod -R 755 /storage/roms/ports/PortMaster - mv -f /storage/roms/ports/PortMaster/PortMaster.sh /storage/roms/ports/PortMaster.sh fi #Check if gamelist.xml exists, if not create gamelist.xml to hide portmaster by default. @@ -19,7 +18,7 @@ touch /storage/roms/ports/gamelist.xml - /storage/roms/ports/PortMaster.sh + /storage/roms/ports/PortMaster/PortMaster.sh PortMaster true @@ -32,7 +31,7 @@ if ! grep -R "PortMaster" "/storage/roms/ports/gamelist.xml" then sed -i 's||& \ \ - /storage/roms/ports/PortMaster.sh\ + /storage/roms/ports/PortMaster/PortMaster.sh\ PortMaster\ true\ |' /storage/roms/ports/gamelist.xml diff --git a/packages/jelos/sources/post-update b/packages/jelos/sources/post-update index ee26b15ee..4eb463fec 100644 --- a/packages/jelos/sources/post-update +++ b/packages/jelos/sources/post-update @@ -47,6 +47,7 @@ then cp /usr/config/ssh/authorized_keys /storage/.ssh fi +### Sync rsync configs rsync --ignore-existing /usr/config/rsync-rules.conf /storage/.config/ rsync --ignore-existing /usr/config/rsync.conf /storage/.config/ @@ -64,31 +65,40 @@ done if [ ! -d "/storage/roms/ports/PortMaster" ] then mkdir -p /storage/roms/ports/PortMaster +else + rm -rf /storage/roms/ports/PortMaster + mkdir -p /storage/roms/ports/PortMaster + rm -f /storage/roms/ports/PortMaster.sh ||: fi rsync -a --delete /usr/share/PortMaster/* /storage/roms/ports/PortMaster/ chmod +x /storage/roms/ports/PortMaster -R -cp -f /storage/roms/ports/PortMaster/PortMaster.sh /storage/roms/ports/PortMaster.sh # Ensure JelosAddOns is in sync if [ ! -d "/storage/roms/ports/JelosAddOns" ] then mkdir -p /storage/roms/ports/JelosAddOns +else + rm -rf /storage/roms/ports/JelosAddOns + mkdir -p /storage/roms/ports/JelosAddOns + rm -f /storage/roms/ports/JelosAddOns.sh ||: fi rsync -a /usr/share/JelosAddOns/* /storage/roms/ports/JelosAddOns/ chmod -R 755 /storage/roms/ports/JelosAddOns -cp -f /storage/roms/ports/JelosAddOns/JelosAddOns.sh /storage/roms/ports/JelosAddOns.sh # Make sure ThemeMaster is in sync if [ ! -d "/storage/roms/ports/ThemeMaster" ] then mkdir -p /storage/roms/ports/ThemeMaster +else + rm -rf /storage/roms/ports/ThemeMaster + mkdir -p /storage/roms/ports/ThemeMaster + rm -f /storage/roms/ports/ThemeMaster.sh ||: fi rsync -a /usr/share/ThemeMaster/* /storage/roms/ports/ThemeMaster/ chmod -R 755 /storage/roms/ports/ThemeMaster -cp -f /storage/roms/ports/ThemeMaster/ThemeMaster /storage/roms/ports/ThemeMaster.sh # Default modules need to be updated to use the new stop/start ui function. rsync -av /usr/config/modules/* /storage/.config/modules/ diff --git a/packages/misc/modules/sources/JelosAddOns.sh b/packages/misc/modules/sources/JelosAddOns.sh index 40ed5549a..6befc55ed 100755 --- a/packages/misc/modules/sources/JelosAddOns.sh +++ b/packages/misc/modules/sources/JelosAddOns.sh @@ -9,4 +9,5 @@ if [ "${UI_SERVICE}" = "weston.service" ] then sed -i -e "s#/dev/tty0#/dev/tty#" /storage/roms/ports/JelosAddOns.sh fi -/storage/roms/ports/JelosAddOns.sh +cd /storage/roms/ports/JelosAddOns +./JelosAddOns.sh diff --git a/packages/misc/modules/sources/PortMaster.sh b/packages/misc/modules/sources/PortMaster.sh index db372d4f2..9a29a54ac 100755 --- a/packages/misc/modules/sources/PortMaster.sh +++ b/packages/misc/modules/sources/PortMaster.sh @@ -10,4 +10,6 @@ if [ "${UI_SERVICE}" = "weston.service" ] then sed -i -e "s#/dev/tty0#/dev/tty#" /storage/roms/ports/PortMaster.sh fi -/storage/roms/ports/PortMaster.sh + +cd /storage/roms/ports/PortMaster +./PortMaster.sh diff --git a/packages/misc/modules/sources/ThemeMaster.sh b/packages/misc/modules/sources/ThemeMaster.sh index f900dc697..db441f55f 100755 --- a/packages/misc/modules/sources/ThemeMaster.sh +++ b/packages/misc/modules/sources/ThemeMaster.sh @@ -11,4 +11,5 @@ then sed -i -e "s#/dev/tty1#/dev/tty#" /storage/roms/ports/ThemeMaster/ThemeMaster fi -/storage/roms/ports/ThemeMaster.sh +cd /storage/roms/ports/ThemeMaster +./ThemeMaster.sh diff --git a/packages/themes/thememaster/sources/autostart/common/011-thememaster b/packages/themes/thememaster/sources/autostart/common/011-thememaster index c7022d018..995c44e16 100755 --- a/packages/themes/thememaster/sources/autostart/common/011-thememaster +++ b/packages/themes/thememaster/sources/autostart/common/011-thememaster @@ -9,7 +9,6 @@ then mkdir -p /storage/roms/ports/ThemeMaster rsync -a /usr/share/ThemeMaster/* /storage/roms/ports/ThemeMaster/ chmod -R 755 /storage/roms/ports/ThemeMaster - mv -f /storage/roms/ports/ThemeMaster/ThemeMaster.sh /storage/roms/ports/ThemeMaster.sh fi #Check if gamelist.xml exists, if not create gamelist.xml to hide ThemeMaster by default. @@ -20,7 +19,7 @@ touch /storage/roms/ports/gamelist.xml - /storage/roms/ports/ThemeMaster.sh + /storage/roms/ports/ThemeMaster/ThemeMaster.sh ThemeMaster true @@ -33,7 +32,7 @@ if ! grep -R "ThemeMaster" "/storage/roms/ports/gamelist.xml" then sed -i 's||& \ \ - /storage/roms/ports/ThemeMaster.sh\ + /storage/roms/ports/ThemeMaster/ThemeMaster.sh\ ThemeMaster\ true\ |' /storage/roms/ports/gamelist.xml