jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: unbrand LIBREELEC_ARCH to DISTRO_ARCH

Browse Source 
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
This commit is contained in:
Christian Hewitt 2025-04-07 11:54:01 +00:00
parent 0cf465a345
commit 868b16b46e
No known key found for this signature in database
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/addons/service/snapclient/source/bin/snapclient.start
View File

@ -7,7 +7,7 @@
oe_setup_addon service.snapclient oe_setup_addon service.snapclient
. /etc/os-release . /etc/os-release
case "$LIBREELEC_ARCH" in case "$DISTRO_ARCH" in
RPi*.arm) RPi*.arm)
if [ "$sc_a" == "true" ]; then if [ "$sc_a" == "true" ]; then
ALSA="/proc/asound/ALSA" ALSA="/proc/asound/ALSA"

2
packages/addons/tools/system-tools/source/default.py
View File

@ -13,7 +13,7 @@ vars = re.findall(r"^[a-zA-Z0-9_]+=.*$", contents, flags=re.MULTILINE)
reader = csv.reader(vars, delimiter="=") reader = csv.reader(vars, delimiter="=")
osrelease = dict(reader) 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') yes = xbmcgui.Dialog().yesno('System Tools', 'This is a console-only addon.[CR][CR]Open a terminal window?',nolabel='No',yeslabel='Yes')
if yes: if yes:
subprocess.Popen(["systemd-run","sh","-c",". /etc/profile;cd;exec st -e sh -l"], shell=False, close_fds=True) subprocess.Popen(["systemd-run","sh","-c",". /etc/profile;cd;exec st -e sh -l"], shell=False, close_fds=True)

2
packages/mediacenter/kodi/scripts/pastekodi
View File

@ -54,7 +54,7 @@ while getopts ":hc" opt; do
done done
source /etc/os-release source /etc/os-release
SYSTEM_ARCH="${LIBREELEC_ARCH#*.}" SYSTEM_ARCH="${DISTRO_ARCH#*.}"
# If running in SAFE mode, send FAILED logs # If running in SAFE mode, send FAILED logs
if [ "$(cat "/storage/.config/boot.status" 2>/dev/null)" = "SAFE" ]; then if [ "$(cat "/storage/.config/boot.status" 2>/dev/null)" = "SAFE" ]; then

2
packages/sysutils/busybox/scripts/init
View File

@ -261,7 +261,7 @@ mount_sysroot() {
get_project_arch() { get_project_arch() {
if [ -f ${1}/etc/os-release ]; then if [ -f ${1}/etc/os-release ]; then
. ${1}/etc/os-release . ${1}/etc/os-release
echo "${LIBREELEC_ARCH}" echo "${DISTRO_ARCH}"
fi fi
} }

10
scripts/image
View File

@ -104,14 +104,14 @@ if [ -n "${CUSTOM_VERSION}" ]; then
DISTRO_VERSION="${CUSTOM_VERSION}" DISTRO_VERSION="${CUSTOM_VERSION}"
fi fi
LIBREELEC_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}" DISTRO_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}"
TARGET_VERSION="${LIBREELEC_ARCH}-${DISTRO_VERSION}" TARGET_VERSION="${DISTRO_ARCH}-${DISTRO_VERSION}"
if [ -n "${CUSTOM_IMAGE_NAME}" ]; then if [ -n "${CUSTOM_IMAGE_NAME}" ]; then
IMAGE_NAME="${CUSTOM_IMAGE_NAME}" IMAGE_NAME="${CUSTOM_IMAGE_NAME}"
else else
if [ "${DEVEL_VERSION}" = "devel" ]; then if [ "${DEVEL_VERSION}" = "devel" ]; then
IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${DISTRO_VERSION}" IMAGE_NAME="${DISTRONAME}-${DISTRO_ARCH}-${OS_VERSION}-${DISTRO_VERSION}"
else else
IMAGE_NAME="${DISTRONAME}-${TARGET_VERSION}" IMAGE_NAME="${DISTRONAME}-${TARGET_VERSION}"
fi fi
@ -173,7 +173,7 @@ PRETTY_NAME="${DISTRONAME} (${LIBREELEC_BUILD}): ${DISTRO_VERSION}"
HOME_URL="https://libreelec.tv" HOME_URL="https://libreelec.tv"
BUG_REPORT_URL="${ORIGIN_URL}" BUG_REPORT_URL="${ORIGIN_URL}"
BUILD_ID="${GIT_HASH}" BUILD_ID="${GIT_HASH}"
LIBREELEC_ARCH="${LIBREELEC_ARCH}" DISTRO_ARCH="${DISTRO_ARCH}"
LIBREELEC_BUILD="${LIBREELEC_BUILD}" LIBREELEC_BUILD="${LIBREELEC_BUILD}"
LIBREELEC_PROJECT="${PROJECT}" LIBREELEC_PROJECT="${PROJECT}"
EOF EOF
@ -188,7 +188,7 @@ ${GREETING1}
${GREETING2} ${GREETING2}
${GREETING3} ${GREETING3}
${GREETING4} ${GREETING4}
${DISTRONAME} (${LIBREELEC_BUILD}): ${DISTRO_VERSION} (${LIBREELEC_ARCH}) ${DISTRONAME} (${LIBREELEC_BUILD}): ${DISTRO_VERSION} (${DISTRO_ARCH})
EOF EOF
ln -sf /etc/issue ${INSTALL}/etc/motd ln -sf /etc/issue ${INSTALL}/etc/motd