Merge pull request #1753 from fewtarius/dev

Fix recovery mode on OGU and RGB Max 10.

distributions/JELOS/options

@@ -42,7 +42,7 @@
 
 # Define package sets to clean based on the type of build being executed.
 # This should be updated to be more dynamic in the future.
-  CLEAN_OS_BASE="emulators initramfs system-utils modules quirks autostart splash jelos"
+  CLEAN_OS_BASE="emulators initramfs u-boot-script system-utils modules quirks autostart splash jelos"
   CLEAN_NETWORK="RTL8821CS-firmware"
   CLEAN_EMU_32BIT="lib32 box86 flycast-lr pcsx_rearmed-lr"
 
@@ -50,7 +50,7 @@
 # a BSP kernel and a rotated display when using DEVICE_ROOT.
   if [ -n "${DEVICE_ROOT}" ]
   then
-    CLEAN_DEVICE_ROOT="linux u-boot u-boot-script SDL2 retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa fileman oga_controls"
+    CLEAN_DEVICE_ROOT="linux u-boot SDL2 retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa fileman oga_controls"
   fi
 
 # additional drivers to install:

packages/jelos/sources/scripts/jelos-info

@@ -2,14 +2,14 @@
 
 source /etc/profile
 
-### Load quirks so we can display device specific info when it exists.
+### Apply device quirks
 if [ -e "/sys/firmware/devicetree/base/model" ]
 then
-  QUIRK_DEVICE=$(cat /sys/firmware/devicetree/base/model 2>/dev/null)
+  export QUIRK_DEVICE="$(tr -d '\0' </sys/firmware/devicetree/base/model 2>/dev/null)"
 else
-  QUIRK_DEVICE="$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) $(cat /sys/class/dmi/id/product_name 2>/dev/null)"
+  export QUIRK_DEVICE="$(tr -d '\0' </sys/class/dmi/id/sys_vendor 2>/dev/null) $(tr -d '\0' </sys/class/dmi/id/product_name 2>/dev/null)"
 fi
-QUIRK_DEVICE="$(echo ${QUIRK_DEVICE} | sed -e "s#[/]#-#g")"
+export QUIRK_DEVICE="$(echo ${QUIRK_DEVICE} | sed -e "s#[/]#-#g")"
 
 info_quirks() {
   for QUIRK in /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/info.d/${1}/*
@@ -75,15 +75,15 @@ case ${HW_ARCH} in
         CF+=("CURRENT FREQUENCY:")
         MF+=("MAXIMUM FREQUENCY:")
       fi
-      RELCPUS=$(cat ${CPUFREQ}/related_cpus)
+      RELCPUS=$(cat ${CPUFREQ}/related_cpus 2>/dev/null)
       if [ "${#RELCPUS}" -gt 1 ]
       then
         FIELD="$(cat ${CPUFREQ}/related_cpus 2>/dev/null | awk '{print $1"-"$NF}')"
       else
-        FIELD="$(cat ${CPUFREQ}/related_cpus)"
+        FIELD="$(cat ${CPUFREQ}/related_cpus 2>/dev/null)"
       fi
-      CF+=("THREADS ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_cur_freq | sort | tail -n 1) / 1000))MHz")
-      MF+=("THREADS ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_max_freq | sort | tail -n 1) / 1000))MHz")
+      CF+=("THREADS ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_cur_freq 2>/dev/null | sort | tail -n 1) / 1000))MHz")
+      MF+=("THREADS ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_max_freq 2>/dev/null | sort | tail -n 1) / 1000))MHz")
       CNTR=$(( CNTR + 1 ))
     done
   ;;
@@ -96,6 +96,7 @@ then
   TEMPE=$(cat ${DEVICE_TEMP_SENSOR} 2>/dev/null | sort -rn | head -1 | sed -e s+"[0-9][0-9][0-9]$"++)
 fi
 echo "SYSTEM INFORMATION:"
+echo "DEVICE: ${QUIRK_DEVICE}"
 echo "OPERATING SYSTEM: ${OS_NAME}"
 echo "VERSION: ${OS_VERSION}"
 echo "BUILD ID: ${BUILD_ID:0:7} (${BUILD_BRANCH})"