From c755d305b152ace1c6c79d501e897329dbfd5b38 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Sun, 27 Oct 2024 18:31:59 +0100
Subject: [PATCH] [no ci] Scripts: update show_toolchains.sh (#1593)
---
.../configs/gm8135_lite_defconfig | 22 ++++++++++---------
.../configs/gm8136_lite_defconfig | 1 +
general/scripts/show_toolchains.sh | 8 +++----
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig b/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
index cbc664fd..39026749 100644
--- a/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
+++ b/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
@@ -1,16 +1,18 @@
# Architecture
BR2_arm=y
-# Local
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
-BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.3"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
-BR2_GCC_VERSION_13_X=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
+# Toolchain
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_UCLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-uclibcgnueabi"
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
# Kernel
BR2_LINUX_KERNEL=y
diff --git a/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig b/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
index 4752a8fa..03e12163 100644
--- a/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
+++ b/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
@@ -5,6 +5,7 @@ BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_UCLIBC=y
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-uclibcgnueabi"
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3=y
diff --git a/general/scripts/show_toolchains.sh b/general/scripts/show_toolchains.sh
index 0b544f13..aa23949c 100755
--- a/general/scripts/show_toolchains.sh
+++ b/general/scripts/show_toolchains.sh
@@ -10,10 +10,10 @@ THUMB=$(grep -q "THUMB2=y" "$1" && echo _thumb2)
FLOAT=$(grep -qE "VFPV3=y|VFPV4=y" "$1" && ! grep -q "ARM_EABI=y" "$1" && echo _hf)
LINUX=$(grep -oP "HEADERS.+\K\d+.\d+" "$1")
-if grep -q "GLIBC=y" "$1"; then
- LIB=glibc
-elif grep -q "MUSL=y" "$1"; then
+if grep -q "MUSL=y" "$1"; then
LIB=musl
+elif grep -q "UCLIBC=y" "$1"; then
+ LIB=uclibc
fi
-echo "${SOC:-arm926t}${THUMB}${FLOAT}-gcc13-${LIB:-uclibc}-${LINUX}"
+echo "${SOC:-arm926t}${THUMB}${FLOAT}-gcc13-${LIB:-glibc}-${LINUX}"