From 868b16b46e1e951945844d4c6b6f232a53892055 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 7 Apr 2025 11:54:01 +0000
Subject: [PATCH] treewide: unbrand LIBREELEC_ARCH to DISTRO_ARCH

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
 .../service/snapclient/source/bin/snapclient.start     |  2 +-
 packages/addons/tools/system-tools/source/default.py   |  2 +-
 packages/mediacenter/kodi/scripts/pastekodi            |  2 +-
 packages/sysutils/busybox/scripts/init                 |  2 +-
 scripts/image                                          | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/addons/service/snapclient/source/bin/snapclient.start b/packages/addons/service/snapclient/source/bin/snapclient.start
index f46d6f046d..4dc2b52f23 100644
--- a/packages/addons/service/snapclient/source/bin/snapclient.start
+++ b/packages/addons/service/snapclient/source/bin/snapclient.start
@@ -7,7 +7,7 @@
 oe_setup_addon service.snapclient
 
 . /etc/os-release
-case "$LIBREELEC_ARCH" in
+case "$DISTRO_ARCH" in
   RPi*.arm)
     if [ "$sc_a" == "true" ]; then
       ALSA="/proc/asound/ALSA"
diff --git a/packages/addons/tools/system-tools/source/default.py b/packages/addons/tools/system-tools/source/default.py
index 4655d0c679..95c5d81108 100644
--- a/packages/addons/tools/system-tools/source/default.py
+++ b/packages/addons/tools/system-tools/source/default.py
@@ -13,7 +13,7 @@ vars = re.findall(r"^[a-zA-Z0-9_]+=.*$", contents, flags=re.MULTILINE)
 reader = csv.reader(vars, delimiter="=")
 osrelease = dict(reader)
 
-if osrelease['LIBREELEC_ARCH'] == 'x11.x86_64' or osrelease['LIBREELEC_ARCH'] == 'Generic-legacy.x86_64':
+if osrelease['DISTRO_ARCH'] == 'x11.x86_64' or osrelease['DISTRO_ARCH'] == 'Generic-legacy.x86_64':
   yes = xbmcgui.Dialog().yesno('System Tools', 'This is a console-only addon.[CR][CR]Open a terminal window?',nolabel='No',yeslabel='Yes')
   if yes:
     subprocess.Popen(["systemd-run","sh","-c",". /etc/profile;cd;exec st -e sh -l"], shell=False, close_fds=True)
diff --git a/packages/mediacenter/kodi/scripts/pastekodi b/packages/mediacenter/kodi/scripts/pastekodi
index 009c7b9c5c..6d73d27f11 100755
--- a/packages/mediacenter/kodi/scripts/pastekodi
+++ b/packages/mediacenter/kodi/scripts/pastekodi
@@ -54,7 +54,7 @@ while getopts ":hc" opt; do
 done
 
 source /etc/os-release
-SYSTEM_ARCH="${LIBREELEC_ARCH#*.}"
+SYSTEM_ARCH="${DISTRO_ARCH#*.}"
 
 # If running in SAFE mode, send FAILED logs
 if [ "$(cat "/storage/.config/boot.status" 2>/dev/null)" = "SAFE" ]; then
diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 96ee59ff53..0ac85fcb54 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -261,7 +261,7 @@ mount_sysroot() {
 get_project_arch() {
   if [ -f ${1}/etc/os-release ]; then
     . ${1}/etc/os-release
-    echo "${LIBREELEC_ARCH}"
+    echo "${DISTRO_ARCH}"
   fi
 }
 
diff --git a/scripts/image b/scripts/image
index b6b293452e..45d4994a01 100755
--- a/scripts/image
+++ b/scripts/image
@@ -104,14 +104,14 @@ if [ -n "${CUSTOM_VERSION}" ]; then
   DISTRO_VERSION="${CUSTOM_VERSION}"
 fi
 
-LIBREELEC_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}"
-TARGET_VERSION="${LIBREELEC_ARCH}-${DISTRO_VERSION}"
+DISTRO_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}"
+TARGET_VERSION="${DISTRO_ARCH}-${DISTRO_VERSION}"
 
 if [ -n "${CUSTOM_IMAGE_NAME}" ]; then
   IMAGE_NAME="${CUSTOM_IMAGE_NAME}"
 else
   if [ "${DEVEL_VERSION}" = "devel" ]; then
-    IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${DISTRO_VERSION}"
+    IMAGE_NAME="${DISTRONAME}-${DISTRO_ARCH}-${OS_VERSION}-${DISTRO_VERSION}"
   else
     IMAGE_NAME="${DISTRONAME}-${TARGET_VERSION}"
   fi
@@ -173,7 +173,7 @@ PRETTY_NAME="${DISTRONAME} (${LIBREELEC_BUILD}): ${DISTRO_VERSION}"
 HOME_URL="https://libreelec.tv"
 BUG_REPORT_URL="${ORIGIN_URL}"
 BUILD_ID="${GIT_HASH}"
-LIBREELEC_ARCH="${LIBREELEC_ARCH}"
+DISTRO_ARCH="${DISTRO_ARCH}"
 LIBREELEC_BUILD="${LIBREELEC_BUILD}"
 LIBREELEC_PROJECT="${PROJECT}"
 EOF
@@ -188,7 +188,7 @@ ${GREETING1}
 ${GREETING2}
 ${GREETING3}
 ${GREETING4}
-${DISTRONAME} (${LIBREELEC_BUILD}): ${DISTRO_VERSION} (${LIBREELEC_ARCH})
+${DISTRONAME} (${LIBREELEC_BUILD}): ${DISTRO_VERSION} (${DISTRO_ARCH})
 EOF
 
 ln -sf /etc/issue ${INSTALL}/etc/motd