Misc updates.

2022-09-01 17:17:36 -04:00 · 2022-09-01 17:17:36 -04:00 · b37990e4c3
commit b37990e4c3
parent 1758a94dd8
12 changed files with 71 additions and 37 deletions
--- a/config/options
+++ b/config/options
@ -84,13 +84,18 @@ VERBOSE="${VERBOSE:-yes}"
 CCACHE_CACHE_SIZE="20G"

 # read local persistent options from $ROOT if available
-if [ -f "${ROOT}/.coreelec/options" ]; then
-  . "${ROOT}/.coreelec/options"
+if [ -f "${ROOT}/.jelos/options" ]; then
+  . "${ROOT}/.jelos/options"
 fi

 # read global persistent options from $HOME if available
-if [ -f "${HOME}/.coreelec/options" ]; then
-  . "${HOME}/.coreelec/options"
+if [ -f "${HOME}/.jelos/options" ]; then
+  . "${HOME}/.jelos/options"
+fi
+
+# read global persistent options from ${DOCKER_WORK_DIR} if available
+if [ -f "${DOCKER_WORK_DIR}/.jelos/options" ]; then
+  . "${DOCKER_WORK_DIR}/.jelos/options"
 fi

 # overwrite OEM_SUPPORT via commandline
--- a/packages/games/libretro/mame/package.mk
+++ b/packages/games/libretro/mame/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019 Trond Haugland (trondah@gmail.com)

 PKG_NAME="mame"
-PKG_VERSION="08be808a3b1957d07c5d5e43d26e60818feb3738"
-PKG_SHA256="4193d38bec5110d42ce3720b0d3d5be381382c425f18d377ddbb9e3d47fbff5d"
+PKG_VERSION="5526dd0fbf6d312a12261643915b9f489ef7510b"
+PKG_SHA256="3f75a74016e1fa2007d9f1792db0d1d83f2e3ebbcc71673d3f8be76b09bc1241"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame"
--- a/packages/games/libretro/parallel-n64_glide64/package.mk
+++ b/packages/games/libretro/parallel-n64_glide64/package.mk
@ -35,6 +35,9 @@ case ${ARCH} in
      RG503|RG353P)
        PKG_MAKE_OPTS_TARGET+=" platform=RK3566"
      ;;
+      RG552)
+        PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}"
+      ;;
    esac
  ;;
  aarch64)
--- a/packages/games/libretro/parallel-n64_gln64/package.mk
+++ b/packages/games/libretro/parallel-n64_gln64/package.mk
@ -25,22 +25,26 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
 fi

-if [ "${ARCH}" = "arm" ]
-then
-  if [[ "${DEVICE}" =~ RG351 ]]
-  then
-    PKG_MAKE_OPTS_TARGET=" platform=RG351x"
-  elif [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]]
-  then
-    PKG_MAKE_OPTS_TARGET+=" platform=RK3566"
-  else
-    PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}"
-  fi
-else
-  make_target() {
-    :
-  }
-fi
+case ${ARCH} in
+  arm)
+    case ${DEVICE} in
+      RG351P|RG351V|RG351MP)
+        PKG_MAKE_OPTS_TARGET=" platform=RG351x"
+      ;;
+      RG503|RG353P)
+        PKG_MAKE_OPTS_TARGET+=" platform=RK3566"
+      ;;
+      RG552)
+        PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}"
+      ;;
+    esac
+  ;;
+  aarch64)
+    make_target() {
+      :
+    }
+  ;;
+esac

 pre_configure_target() {
  sed -i 's/info->library_name = "ParaLLEl N64";/info->library_name = "ParaLLEl N64 GLN64";/g' ${PKG_BUILD}/libretro/libretro.c
@ -53,12 +57,14 @@ pre_configure_target() {

 makeinstall_target() {
  mkdir -p ${INSTALL}/usr/lib/libretro
-  if [[ "${ARCH}" == "aarch64" ]]
-  then
-    cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_gln64-*/.install_pkg/usr/lib/libretro/parallel_n64_gln64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.so
-    cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.info
-    sed -i 's/ParaLLEl N64/ParaLLEl N64 GLN64/g' ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.info
-  else
-    cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.so
-  fi
+  case ${ARCH} in
+    arm)
+      cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.so
+    ;;
+    *)
+      cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_gln64-*/.install_pkg/usr/lib/libretro/parallel_n64_gln64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.so
+      cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.info
+      sed -i 's/ParaLLEl N64/ParaLLEl N64 Rice/g' ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.info
+   ;;
+  esac
 }
--- a/packages/games/libretro/parallel-n64_rice/package.mk
+++ b/packages/games/libretro/parallel-n64_rice/package.mk
@ -34,6 +34,9 @@ case ${ARCH} in
      RG503|RG353P)
        PKG_MAKE_OPTS_TARGET+=" platform=RK3566"
      ;;
+      RG552)
+        PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}"
+      ;;
    esac
  ;;
  aarch64)
--- a/packages/jelos/sources/scripts/jelos-info
+++ b/packages/jelos/sources/scripts/jelos-info
@ -47,17 +47,27 @@ declare -a CF MF
 CNTR=0
 for CPUFREQ in /sys/devices/system/cpu/cpufreq/*
 do
+  if [[ "${CPUFREQ}" =~ boost ]]
+  then
+    continue
+  fi
  if [ "${CNTR}" -eq 0 ]
  then
    CF+=("CURRENT FREQUENCY:")
    MF+=("MAXIMUM FREQUENCY:")
  fi
-  CF+=("CORES $(cat ${CPUFREQ}/related_cpus | awk '{print $1"-"$NF}'): $(( $(cat ${CPUFREQ}/scaling_cur_freq  | sort | tail -n 1) / 1000))MHz")
-  MF+=("CORES $(cat ${CPUFREQ}/related_cpus | awk '{print $1"-"$NF}'): $(( $(cat ${CPUFREQ}/scaling_max_freq | sort | tail -n 1) / 1000))MHz")
+  RELCPUS=$(cat ${CPUFREQ}/related_cpus)
+  if [ "${#RELCPUS}" -gt 1 ]
+  then
+    FIELD="$(cat ${CPUFREQ}/related_cpus 2>/dev/null | awk '{print $1"-"$NF}')"
+  else
+    FIELD="$(cat ${CPUFREQ}/related_cpus)"
+  fi
+  CF+=("CORES ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_cur_freq | sort | tail -n 1) / 1000))MHz")
+  MF+=("CORES ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_max_freq | sort | tail -n 1) / 1000))MHz")
  CNTR=$(( CNTR + 1 ))
 done

-
 # temperature
 # Unit: millidegree Celsius
 TEMPE=$(cat /sys/devices/virtual/thermal/thermal_zone*/temp 2>/dev/null | sort -rn | head -1 | sed -e s+"[0-9][0-9][0-9]$"++)
@ -74,13 +84,14 @@ if test -n "${BATT}"
 then
    echo "BATTERY INFORMATION:"
    echo "BATTERY REMAINING: ${BATT}%"
-    if [ -e "/sys/class/power_supply/bat/health" ]
+    BATPATH="/sys/class/power_supply/$(ls /sys/class/power_supply/ | grep -i bat | tail -n 1)"
+    if [ -e "${BATPATH}/health" ]
    then
-      echo "BATTERY HEALTH: $(cat /sys/class/power_supply/bat/health)"
+      echo "BATTERY HEALTH: $(cat ${BATPATH}/health)"
    fi
-    if [ -e "/sys/class/power_supply/bat/status" ]
+    if [ -e "${BATPATH}/status" ]
    then
-      echo "BATTERY STATE: $(cat /sys/class/power_supply/bat/status)"
+      echo "BATTERY STATE: $(cat ${BATPATH}/status)"
    fi
 fi
 echo "CPU INFORMATION:"
--- a/projects/Rockchip/devices/RG351MP/options
+++ b/projects/Rockchip/devices/RG351MP/options
@ -50,6 +50,7 @@
  # Mali GPU family
    MALI_FAMILY="bifrost-g31"
    OPENGLES="libmali"
+    OPENGL="no"
    MALI_VERSION="r13p0"
    GRAPHIC_DRIVERS=""

--- a/projects/Rockchip/devices/RG351P/options
+++ b/projects/Rockchip/devices/RG351P/options
@ -50,6 +50,7 @@
  # Mali GPU family
    MALI_FAMILY="bifrost-g31"
    OPENGLES="libmali"
+    OPENGL="no"
    MALI_VERSION="r13p0"
    GRAPHIC_DRIVERS=""

--- a/projects/Rockchip/devices/RG351V/options
+++ b/projects/Rockchip/devices/RG351V/options
@ -50,6 +50,7 @@
  # Mali GPU family
    MALI_FAMILY="bifrost-g31"
    OPENGLES="libmali"
+    OPENGL="no"
    MALI_VERSION="r13p0"
    GRAPHIC_DRIVERS=""

--- a/projects/Rockchip/devices/RG353P/options
+++ b/projects/Rockchip/devices/RG353P/options
@ -55,6 +55,7 @@
    MALI_FAMILY="bifrost-g52"
    MALI_VERSION="g2p0"
    OPENGLES="libmali"
+    OPENGL="no"
    GRAPHIC_DRIVERS=""


--- a/projects/Rockchip/devices/RG503/options
+++ b/projects/Rockchip/devices/RG503/options
@ -55,6 +55,7 @@
    MALI_FAMILY="bifrost-g52"
    MALI_VERSION="g2p0"
    OPENGLES="libmali"
+    OPENGL="no"
    GRAPHIC_DRIVERS=""


--- a/projects/Rockchip/devices/RG552/options
+++ b/projects/Rockchip/devices/RG552/options
@ -53,6 +53,7 @@
    MALI_FAMILY="midgard-t86x"
    MALI_VERSION="r18p0"
    OPENGLES="libmali"
+    OPENGL="no"
    GRAPHIC_DRIVERS=""

  # kernel serial console