Merge pull request #2059 from fewtarius/dev

get_settings bug fix
2023-09-14 20:13:45 -04:00 · 2023-09-14 20:13:45 -04:00 · cb49006f63
commit cb49006f63
parent b6b0120452 18737c1dec
7 changed files with 66 additions and 16 deletions
--- a/.github/workflows/build-main.yaml
+++ b/.github/workflows/build-main.yaml
@ -103,7 +103,7 @@ jobs:
            |**Anbernic RG351P/M, ODROID Go Advance, ODROID Go Super**|[JELOS-RK3326.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3326.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3326/)|
            |**Anbernic RG353P/M/V/VS, RG503, Powkiddy RK2023, RGB30**|[JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3566/)|
            |**Anbernic RG552**|[JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3399/)|
-            |**Atari VCS, AOKZOE, Ayaneo, GPD, and other x86_64 devices**|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/AMD64/)|
+            |**Atari VCS, AOKZOE, Ayaneo, Ayn, GPD, and other x86_64 devices**|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/AMD64/)|
            |**Hardkernel ODROID Go Ultra, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/S922X/)|
            |**Orange Pi 5, and Indiedroid Nova**|[JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3588/)|
            |**Powkiddy x55**|[JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/)|
@ -121,7 +121,7 @@ jobs:
            |**Anbernic RG351P/M, ODROID Go Advance, ODROID Go Super**|[JELOS-RK3326.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3326.aarch64-${{ steps.version.outputs.version }}.tar)|
            |**Anbernic RG353P/M/V/VS, RG503, Powkiddy RK2023, RGB30**|[JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar)|
            |**Anbernic RG552**|[JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.tar)|
-            |****Atari VCS, AOKZOE, Ayaneo, GPD, and other x86_64 devices****|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar)|
+            |****Atari VCS, AOKZOE, Ayaneo, Ayn, GPD, and other x86_64 devices****|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar)|
            |**Hardkernel ODROID Go Ultra, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar)|
            |**Orange Pi 5, and Indiedroid Nova**|[JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar)|
            |**Powkiddy x55**|[JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.tar)|
--- a/packages/jelos/profile.d/001-functions
+++ b/packages/jelos/profile.d/001-functions
@ -27,7 +27,7 @@ function log() {
 }

 function get_setting() {
-  if [ ! -z "${3}" ]
+  if [ -n "${3}" ]
  then
    ### Test to see if we have a game setting.
    VAR="$2\[\"$(echo ${3} | sed 's/\W/\\&/g')\"]\.$1"
@ -47,9 +47,9 @@ function get_setting() {
    fi
  fi

-  if [ -z "${3}" ] && [ ! -z "${2}" ]
+  if [ -z "${3}" ] && [ -n "${2}" ]
  then
-    ### Check to see if we have a system setting.
+    ### Check to see if we have a global setting.
    LOCAL=$(awk -F: '/^'"${2}.${1}"'=/ {  st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF})
    if [ ! -z "${LOCAL}" ]
    then
@ -58,11 +58,20 @@ function get_setting() {
    fi
  fi

-  ### Check to see if we have a global setting and account for legacy "global."
+  ### Check to see if we have a "system." global setting.
+  SYSTEM=$(awk -F: '/^system.'"${1}"='/ { st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF})
+  if [ -n "${SYSTEM}" ]
+  then
+    echo ${SYSTEM}
+    return
+  fi
+
+  ### Check to see if we have a "global." global setting."
  LOCAL=$(awk -F: '/^'"${1}"='/ { st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF})
  if [ -z "${LOCAL}" ]
  then
    awk -F: '/^global.'"${1}"='/ { st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF}
+    return
  else
    echo ${LOCAL}
  fi
--- a/packages/jelos/sources/scripts/runemu.sh
+++ b/packages/jelos/sources/scripts/runemu.sh
@ -336,10 +336,8 @@ else

        ### Set the performance mode for emulation
        PERFORMANCE_MODE=$(get_setting "cpugovernor" "${PLATFORM}" "${ROMNAME##*/}")
-        if [ ! "${PERFORMANCE_MODE}" = "default" ]
-        then
-            ${PERFORMANCE_MODE}
-        fi
+        ${PERFORMANCE_MODE}
+
 	if [[ "${CORE}" =~ "custom" ]] 
 	then
 	RUNTHIS='${EMUPERF} /usr/bin/${RABIN} -L /storage/.config/retroarch/cores/${EMU}.so --config ${RATMPCONF} --appendconfig ${RAAPPENDCONF} "${ROMNAME}"'
@ -414,10 +412,7 @@ $VERBOSE && log $0 "script to execute: ${RUNTHIS}"

 ### Set the performance mode for emulation
 PERFORMANCE_MODE=$(get_setting "cpugovernor" "${PLATFORM}" "${ROMNAME##*/}")
-if [ ! "${PERFORMANCE_MODE}" = "default" ]
-then
-    ${PERFORMANCE_MODE}
-fi
+${PERFORMANCE_MODE}
 # If the rom is a shell script just execute it, useful for DOSBOX and ScummVM scan scripts
 if [[ "${ROMNAME}" == *".sh" ]]; then
 	$VERBOSE && log $0 "Executing shell script ${ROMNAME}"
--- a/packages/kernel/linux-drivers/ayn-platform/package.mk
+++ b/packages/kernel/linux-drivers/ayn-platform/package.mk
@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present Fewtarius
+
+PKG_NAME="ayn-platform"
+PKG_VERSION="3fdfa48"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/ShadowBlip/ayn-platform"
+PKG_URL="${PKG_SITE}.git"
+PKG_ARCH="x86_64 i686"
+PKG_DEPENDS_TARGET="toolchain linux kernel-firmware"
+PKG_NEED_UNPACK="${LINUX_DEPENDS}"
+PKG_LONGDESC="A hwmon interface for PWM control, as well as RGB control and access to temperature sensors provided by the system EC."
+PKG_IS_KERNEL_PKG="yes"
+PKG_TOOLCHAIN="make"
+
+pre_make_target() {
+  unset LDFLAGS
+}
+
+make_target() {
+  make \
+       ARCH=${TARGET_KERNEL_ARCH} \
+       KSRC=$(kernel_path) \
+       CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \
+       TARGET=$(kernel_version) \
+       KERNEL_MODULES=$(get_build_dir linux)/.install_pkg/$(get_full_module_dir) \
+       KERNEL_BUILD=$(get_build_dir linux) modules
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+    cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+}
--- a/packages/kernel/linux-drivers/ayn-platform/patches/001-build.patch
+++ b/packages/kernel/linux-drivers/ayn-platform/patches/001-build.patch
@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 293002e..0990284 100644
+--- a/Makefile
+++ b/Makefile
+@@ -5,8 +5,6 @@ endif
+ # Or specific version
+ #TARGET = 2.6.33.5
+ 
+-KERNEL_MODULES = /lib/modules/$(TARGET)
+-
+ ifneq ("","$(wildcard /usr/src/linux-headers-$(TARGET)/*)")
+ # Ubuntu
+ KERNEL_BUILD = /usr/src/linux-headers-$(TARGET)
--- a/packages/kernel/linux/package.mk
+++ b/packages/kernel/linux/package.mk
@ -8,7 +8,7 @@ PKG_VERSION="6.4.16"
 PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
-PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb initramfs ${KERNEL_EXTRA_DEPENDS_TARGET}"
+PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb ${KERNEL_EXTRA_DEPENDS_TARGET}"
 PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)"
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 PKG_IS_KERNEL_PKG="yes"
--- a/scripts/unpack
+++ b/scripts/unpack
@ -42,7 +42,7 @@ for i in ${BUILD}/${PKG_NAME}-*; do
      if [ ! "${PKG_DEEPHASH}" = "${STAMP_PKG_DEEPHASH}" ] ; then
        ${SCRIPTS}/clean "${PKG_NAME}"
        if [ "${PKG_NAME}" = "linux" ]; then
-          for CLEAN_DEP in ${KERNEL_EXTRA_DEPENDS_TARGET} ${ADDITIONAL_DRIVERS}
+          for CLEAN_DEP in ${KERNEL_EXTRA_DEPENDS_TARGET} ${ADDITIONAL_DRIVERS} initramfs
          do
            ${SCRIPTS}/clean "${CLEAN_DEP}"
            ${SCRIPTS}/unpack "${CLEAN_DEP}"