From fd1398b472192a4db15773397165739bab22f413 Mon Sep 17 00:00:00 2001
From: Douglas Teles <dga.teles@gmail.com>
Date: Wed, 24 Jun 2026 10:31:54 -0300
Subject: [PATCH] System Information: corrigir lacunas e adicionar Mesa/Arch
 info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug crítico no autostart: QUIRK_DEVICE vem de /sys/firmware/devicetree
/base/model e quase sempre tem espaços ("Game Console R36S"). O loop
`for QDIR in ${QUIRK_DIRS}` com string concatenada partia esse path em
3 tokens (Game, Console, R36S) e o glob ${QDIR}/* não casava com nada.
Resultado: nenhum quirk device-specific rodava — 001-device_config
nunca escrevia /storage/.config/profile.d/001-device_config, então
DEVICE_TEMP_SENSOR / DEVICE_PWR_LED_GPIO / DEVICE_PLAYBACK_PATH_*
ficavam vazios em todos os processos. O System Information do ES não
mostrava CPU TEMPERATURE, GPU TEMPERATURE, e os start_*.sh dos
emuladores caíam em fallback de áudio.

Fix usa arrays bash com expansão entre aspas:
  QUIRK_DIRS=(...)
  for QDIR in "${QUIRK_DIRS[@]}"; do ...

archr-info ganha 5 melhorias:

- DISTRO FAMILY: lê ID_LIKE de /etc/os-release e renderiza
  "Arch Linux" (título). OPERATING SYSTEM agora mostra "ArchR Linux"
  para deixar a relação com Arch explícita.
- DISK SPACE: detecta quando games-internal e games-external apontam
  para o mesmo device e mostra só "INTERNAL" (a UI repetia a linha
  idêntica quando não havia SD externo).
- MESA VERSION: sniffa libgallium-X.Y.Z.so para mostrar 26.1.3.
- GPU DRIVER: lsmod identifica panfrost (Mesa) ou mali_kbase (legacy
  blob), útil pra debugar quando o user troca via picker.
- info_quirks: protegido contra chamada sem argumento (era o motivo
  do exit 127); usa nullglob + iteração quoted para suportar paths com
  espaços e diretórios info.d/* ausentes.

Game Console R36S/001-device_config: define DEVICE_GPU_TEMP_SENSOR
apontando para thermal_zone1 (gpu-thermal IP). A linha GPU TEMPERATURE
da seção GPU INFORMATION agora aparece no ES.

Saída final no R36S:
  DEVICE: Game Console R36S
  OPERATING SYSTEM: ArchR Linux
  DISTRO FAMILY: Arch Linux
  CPU TEMPERATURE: 54°
  GPU TEMPERATURE: 55°
  MESA VERSION: 26.1.3
  GPU DRIVER: mali_kbase (legacy blob)
  ...

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../packages/archr/sources/scripts/archr-info | 69 ++++++++++++++++---
 .../Game Console R36S/001-device_config       |  3 +
 .../sysutils/autostart/sources/autostart      | 18 +++--
 3 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/projects/ArchR/packages/archr/sources/scripts/archr-info b/projects/ArchR/packages/archr/sources/scripts/archr-info
index 53fe4eae64..2fa97763bc 100755
--- a/projects/ArchR/packages/archr/sources/scripts/archr-info
+++ b/projects/ArchR/packages/archr/sources/scripts/archr-info
@@ -12,11 +12,28 @@ fi
 export QUIRK_DEVICE="$(echo ${QUIRK_DEVICE} | sed -e "s#[/]#-#g")"
 
 info_quirks() {
-  for QUIRK in /usr/lib/autostart/quirks/platforms/"${HW_DEVICE}"/info.d/${1}/* \
-               /usr/lib/autostart/quirks/devices/"${QUIRK_DEVICE}"/info.d/${1}/*
-  do
-    "${QUIRK}" 2>/dev/null
+  # ${1} comes from the caller (the section name); when called with no
+  # argument the glob would collapse to "info.d//*" and bash leaves
+  # the literal pattern in place, then tries to execute it as a
+  # command (exit 127). Bail out early when no section is requested,
+  # and use shopt -s nullglob locally so a non-matching pattern
+  # expands to nothing instead of the literal string. QUIRK_DEVICE
+  # carries spaces ("Game Console R36S"), so the dirs are quoted in
+  # the loop body to avoid word-splitting.
+  [ -n "${1}" ] || return 0
+  local section="${1}"
+  local dirs=(
+    "/usr/lib/autostart/quirks/platforms/${HW_DEVICE}/info.d/${section}"
+    "/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}/info.d/${section}"
+  )
+  shopt -s nullglob
+  for dir in "${dirs[@]}"; do
+    for QUIRK in "${dir}"/*; do
+      [ -x "${QUIRK}" ] || continue
+      "${QUIRK}" 2>/dev/null
+    done
   done
+  shopt -u nullglob
 }
 
 ### short version (for osd)
@@ -104,7 +121,16 @@ esac
 
 echo "SYSTEM INFORMATION:"
 echo "DEVICE: ${QUIRK_DEVICE}"
-echo "OPERATING SYSTEM: ${OS_NAME}"
+echo "OPERATING SYSTEM: ${OS_NAME} Linux"
+# ID_LIKE in /etc/os-release tags ArchR as part of the arch family;
+# expose it so users know which package conventions apply (pacman,
+# AUR-style PKGBUILDs, etc.) without having to cat /etc/os-release.
+# Title-case the value (ID_LIKE is always lowercase per the spec).
+DISTRO_BASE=$(awk -F= '/^ID_LIKE=/ {gsub(/"/, "", $2); print $2; exit}' /etc/os-release 2>/dev/null)
+if [ -n "${DISTRO_BASE}" ]; then
+    DISTRO_BASE_TITLE="$(echo "${DISTRO_BASE}" | awk '{for (i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) substr($i,2)}1')"
+    echo "DISTRO FAMILY: ${DISTRO_BASE_TITLE} Linux"
+fi
 echo "VERSION: ${OS_VERSION} (${OS_BUILD})"
 echo "BUILD ID: ${BUILD_ID:0:7} (${BUILD_BRANCH})"
 echo "KERNEL: ${V_SYSTEM} ($(uname -m))"
@@ -112,8 +138,16 @@ echo "NETWORK INFORMATION:"
 echo "HOST NAME: ${host}"
 echo "IP ADDRESS: ${ip}"
 echo "DISK SPACE:"
-echo "/storage/games-internal: $(df -h /storage/games-internal | awk '/dev/ {print $3"/"$2" ("$5")"}')"
-echo "/storage/games-external: $(df -h /storage/games-external | awk '/dev/ {print $3"/"$2" ("$5")"}')"
+# games-internal lives on /storage. games-external is only a separate
+# device when an SD card is plugged in and merged storage is on; if
+# both resolve to the same filesystem just show one entry to avoid the
+# UI repeating the identical line twice.
+INT_DEV=$(df -P /storage/games-internal 2>/dev/null | awk 'NR==2 {print $1}')
+EXT_DEV=$(df -P /storage/games-external 2>/dev/null | awk 'NR==2 {print $1}')
+echo "INTERNAL: $(df -h /storage/games-internal | awk '/dev/ {print $3"/"$2" ("$5")"}')"
+if [ -n "${EXT_DEV}" ] && [ "${EXT_DEV}" != "${INT_DEV}" ]; then
+    echo "EXTERNAL: $(df -h /storage/games-external | awk '/dev/ {print $3"/"$2" ("$5")"}')"
+fi
 
 if test -n "${BATT}"
 then
@@ -174,11 +208,28 @@ if [ -n "$GPUCUR" ]; then
   if [ -n "${DEVICE_GPU_TEMP_SENSOR}" ]; then
     GTEMPE=$(awk '{total += $1; count++} END {printf "%d", total/count/1000}' ${DEVICE_GPU_TEMP_SENSOR})
     if [ -n "${GTEMPE}" ]; then
-    echo "GPU TEMPERATURE: ${GTEMPE}°"
+      echo "GPU TEMPERATURE: ${GTEMPE}°"
+    fi
   fi
-fi
   echo "GPU CURRENT FREQUENCY: ${GPUCUR} MHz"
   echo "GPU MAXIMUM FREQUENCY: ${GPUMAX} MHz"
+  # Mesa version probed from the libgallium-X.Y.Z.so soname (more
+  # reliable than parsing /usr/share/doc/mesa* which we don't ship).
+  MESA_LIB=$(ls /usr/lib/libgallium-*.so 2>/dev/null | head -1)
+  if [ -n "${MESA_LIB}" ]; then
+    MESA_VER="${MESA_LIB##*libgallium-}"
+    MESA_VER="${MESA_VER%.so}"
+    echo "MESA VERSION: ${MESA_VER}"
+  fi
+  # Active GPU driver (panfrost vs mali/legacy). lsmod tells us what
+  # the kernel actually loaded; the file in /storage/.cache flips the
+  # userspace blob set on next boot, but only the kernel side is
+  # authoritative right now.
+  if lsmod 2>/dev/null | grep -q '^panfrost'; then
+    echo "GPU DRIVER: panfrost (Mesa)"
+  elif lsmod 2>/dev/null | grep -q '^mali_kbase'; then
+    echo "GPU DRIVER: mali_kbase (legacy blob)"
+  fi
 fi
 echo "RAM INFORMATION:"
 echo "RAM AVAILABLE: ${MEMAV} MB"
diff --git a/projects/ArchR/packages/hardware/quirks/devices/Game Console R36S/001-device_config b/projects/ArchR/packages/hardware/quirks/devices/Game Console R36S/001-device_config
index 243906cf13..21855399ad 100755
--- a/projects/ArchR/packages/hardware/quirks/devices/Game Console R36S/001-device_config	
+++ b/projects/ArchR/packages/hardware/quirks/devices/Game Console R36S/001-device_config	
@@ -8,4 +8,7 @@ DEVICE_PLAYBACK_PATH_SPK="HP"
 DEVICE_PLAYBACK_PATH_HP="SPK"
 DEVICE_PWR_LED_GPIO="77"
 DEVICE_TEMP_SENSOR="/sys/devices/virtual/thermal/thermal_zone0/temp"
+# thermal_zone1 is the gpu-thermal IP — System Information shows the
+# GPU temperature alongside the CPU one when this is set.
+DEVICE_GPU_TEMP_SENSOR="/sys/devices/virtual/thermal/thermal_zone1/temp"
 EOF
diff --git a/projects/ArchR/packages/sysutils/autostart/sources/autostart b/projects/ArchR/packages/sysutils/autostart/sources/autostart
index 7ee1ce6165..cf53fc5291 100755
--- a/projects/ArchR/packages/sysutils/autostart/sources/autostart
+++ b/projects/ArchR/packages/sysutils/autostart/sources/autostart
@@ -58,13 +58,21 @@ fi
 ### attributable in /var/log/boot.log; the trace_step marker for slow
 ### debugging picks the LAST-launched script (good enough — if a quirk
 ### hangs we want to know what's still running, not the entry order).
-QUIRK_DIRS=""
-[ -d "/usr/lib/autostart/quirks/platforms/${HW_DEVICE}" ] && QUIRK_DIRS+=" /usr/lib/autostart/quirks/platforms/${HW_DEVICE}"
-[ -d "/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}"  ] && QUIRK_DIRS+=" /usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}"
+QUIRK_DIRS=()
+[ -d "/usr/lib/autostart/quirks/platforms/${HW_DEVICE}" ] && QUIRK_DIRS+=("/usr/lib/autostart/quirks/platforms/${HW_DEVICE}")
+[ -d "/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}" ] && QUIRK_DIRS+=("/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}")
 
-if [ -n "${QUIRK_DIRS}" ]; then
+# QUIRK_DEVICE comes from /sys/firmware/devicetree/base/model and usually
+# carries spaces ("Game Console R36S"). The earlier string-concat +
+# unquoted for-loop split that by whitespace, so the device-specific
+# quirk dir was never iterated and 001-device_config never wrote the
+# DEVICE_TEMP_SENSOR/etc. exports — System Information in ES had no
+# CPU/GPU temperature, no playback path, and the rest of the quirks
+# silently no-op'd. Array iteration with quoted expansion preserves the
+# path verbatim.
+if [ ${#QUIRK_DIRS[@]} -gt 0 ]; then
   tocon "Applying ${HW_DEVICE} / ${QUIRK_DEVICE} quirks..."
-  for QDIR in ${QUIRK_DIRS}; do
+  for QDIR in "${QUIRK_DIRS[@]}"; do
     for script in "${QDIR}"/*; do
       [ -f "${script}" ] || continue
       log "Run ${script}"