From 1fcc9d32475943a126c53e362580adf89c43043c Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 3 May 2019 23:11:21 +0000 Subject: [PATCH] image: drop OPENELEC_ARCH from /etc/os-release Also swaps the necessary variable check in busybox/init to acoomodate OPENELEC_ARCH may or may not exist, while LIBREELEC_ARCH will be assumed to exist. Signed-off-by: Ian Leonard --- packages/sysutils/busybox/scripts/init | 2 +- scripts/image | 1 - scripts/image_st | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 809f71bd79..d3b50cc6ba 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -250,7 +250,7 @@ get_project_arch() { if [ -f /sysroot/etc/os-release ]; then . /sysroot/etc/os-release - echo "${LIBREELEC_ARCH:-${OPENELEC_ARCH}}" + echo "${OPENELEC_ARCH:-${LIBREELEC_ARCH}}" fi umount /sysroot diff --git a/scripts/image b/scripts/image index 93bf4b2719..362f7e5bc7 100755 --- a/scripts/image +++ b/scripts/image @@ -154,7 +154,6 @@ echo -e "PRETTY_NAME=\"$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION\"" >> echo -e "HOME_URL=\"https://libreelec.tv\"" >> $INSTALL/etc/os-release echo -e "BUG_REPORT_URL=\"$ORIGIN_URL\"" >> $INSTALL/etc/os-release echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release -echo -e "OPENELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release echo -e "LIBREELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release echo -e "LIBREELEC_BUILD=\"$LIBREELEC_BUILD\"" >> $INSTALL/etc/os-release echo -e "LIBREELEC_PROJECT=\"$PROJECT\"" >> $INSTALL/etc/os-release diff --git a/scripts/image_st b/scripts/image_st index c2275176e1..0406cdf033 100755 --- a/scripts/image_st +++ b/scripts/image_st @@ -150,7 +150,6 @@ echo -e "PRETTY_NAME=\"$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION\"" >> echo -e "HOME_URL=\"https://libreelec.tv\"" >> $INSTALL/etc/os-release echo -e "BUG_REPORT_URL=\"$ORIGIN_URL\"" >> $INSTALL/etc/os-release echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release -echo -e "OPENELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release echo -e "LIBREELEC_ARCH=\"$LIBREELEC_ARCH\"" >> $INSTALL/etc/os-release echo -e "LIBREELEC_BUILD=\"$LIBREELEC_BUILD\"" >> $INSTALL/etc/os-release echo -e "LIBREELEC_PROJECT=\"$PROJECT\"" >> $INSTALL/etc/os-release