From 6f669fbb450421c9f53a6a5101c1dae18a53f540 Mon Sep 17 00:00:00 2001
From: Egor Tsyganchuk <te@solo-lab.ru>
Date: Thu, 4 Dec 2025 22:48:42 +0300
Subject: [PATCH] Package names are separated into separate variables

---
 build-toolchain.sh                             | 18 +++++++++++++-----
 ...ig-uclib-1.0.34 => config-uClibc-ng-1.0.34} |  0
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename config/{config-uclib-1.0.34 => config-uClibc-ng-1.0.34} (100%)

diff --git a/build-toolchain.sh b/build-toolchain.sh
index 862d99d..e9d3efc 100755
--- a/build-toolchain.sh
+++ b/build-toolchain.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 set -e
 
+# ==================================================================
+# Названия пакетов
+# ==================================================================
+PKG_BINUTILS="binutils"
+PKG_GCC="gcc"
+PKG_LINUX="linux"
+PKG_UCLIBC="uClibc-ng"
+
 # ==================================================================
 # Версии пакетов
 # ==================================================================
@@ -39,10 +47,10 @@ export CXXFLAGS_FOR_TARGET=$CFLAGS_TARGET
 # ==================================================================
 # Имена распакованных директорий (обычно совпадают с версией)
 # ==================================================================
-SRC_BINUTILS="${BUILD_SRC_DIR}/binutils-${BINUTILS_VER}"
-SRC_GCC="${BUILD_SRC_DIR}/gcc-${GCC_VER}"
-SRC_LINUX="${BUILD_SRC_DIR}/linux-${LINUX_VER}"
-SRC_UCLIBC="${BUILD_SRC_DIR}/uClibc-ng-${UCLIBC_VER}"
+SRC_BINUTILS="${BUILD_SRC_DIR}/${PKG_BINUTILS}-${BINUTILS_VER}"
+SRC_GCC="${BUILD_SRC_DIR}/${PKG_GCC}-${GCC_VER}"
+SRC_LINUX="${BUILD_SRC_DIR}/${PKG_LINUX}-${LINUX_VER}"
+SRC_UCLIBC="${BUILD_SRC_DIR}/${PKG_UCLIBC}-${UCLIBC_VER}"
 
 # ==================================================================
 echo "== Создание директорий =="
@@ -130,7 +138,7 @@ echo "== Сборка uClibc-ng-${UCLIBC_VER} =="
 cd "${SRC_UCLIBC}"
 
 # Подготовка .config перед сборкой uClibc-ng
-CONFIG_SRC_FILE="${CONFIGS_DIR}/config-uclib-${UCLIBC_VER}"
+CONFIG_SRC_FILE="${CONFIGS_DIR}/config-${PKG_UCLIBC}-${UCLIBC_VER}"
 
 # Если в TOP существует .config-<версия uclibc>, копируем его
 if [ -f "${CONFIG_SRC_FILE}" ]; then
diff --git a/config/config-uclib-1.0.34 b/config/config-uClibc-ng-1.0.34
similarity index 100%
rename from config/config-uclib-1.0.34
rename to config/config-uClibc-ng-1.0.34