mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
treewide: unbrand LIBREELEC_ARCH to DISTRO_ARCH
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
This commit is contained in:
parent
0cf465a345
commit
868b16b46e
@ -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"
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user