From 96056d2f5609e60d3d8618103a32641147bdfec5 Mon Sep 17 00:00:00 2001
From: Egor Tsyganchuk <te@solo-lab.ru>
Date: Thu, 4 Dec 2025 14:06:18 +0300
Subject: [PATCH] Some paths have been fixed

---
 build-toolchain.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build-toolchain.sh b/build-toolchain.sh
index 77bda36..a3ee7ad 100755
--- a/build-toolchain.sh
+++ b/build-toolchain.sh
@@ -10,7 +10,8 @@ BUILD_SRC_DIR="${BUILD_DIR}/src"
 INSTALL_DIR="${TOP}/install"
 INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
 KERNEL_SYSROOT_DIR="${INSTALL_DIR}/sysroot"
-KERNEL_HEADERS_DIR="${KERNEL_SYSROOT_DIR}/usr/include"
+KERNEL_SYSROOT_USR_DIR="${KERNEL_SYSROOT_DIR}/usr"
+KERNEL_SYSROOT_USR_INCLUDES_DIR="${KERNEL_SYSROOT_USR_DIR}/include"
 
 CFLAGS_TOOLSET='-O2'
 CFLAGS_TARGET='-Os -mthumb'
@@ -73,7 +74,7 @@ cd build/gcc1
 
 $SRC_GCC/configure \
     --target=${TARGET} \
-    --prefix=${TOP}/install \
+    --prefix=${INSTALL_DIR} \
     --with-arch=${SUBARCH} \
     --with-mode=${SUBMODE} \
     --without-headers \
@@ -105,7 +106,7 @@ cd $SRC_LINUX
 
 PATH=${INSTALL_BIN_DIR}:${PATH} \
 make headers_install ARCH=arm \
-    INSTALL_HDR_PATH=${TOP}/install/sysroot/usr \
+    INSTALL_HDR_PATH=${KERNEL_SYSROOT_USR_DIR} \
     CROSS_COMPILE=${TARGET}- \
     O=${TOP}/build/kernelheader
 
@@ -122,10 +123,10 @@ cd $SRC_UCLIBC
 sed -i '/^KERNEL_HEADERS=/d' .config
 
 # Добавляем новое
-echo "KERNEL_HEADERS=\"${KERNEL_HEADERS_DIR}\"" >> .config
+echo "KERNEL_HEADERS=\"${KERNEL_SYSROOT_USR_INCLUDES_DIR}\"" >> .config
 
 PATH=${TOP}/install/bin:${PATH} make all -j12
-PATH=${TOP}/install/bin:${PATH} make PREFIX=${TOP}/install/sysroot install
+PATH=${TOP}/install/bin:${PATH} make PREFIX=${KERNEL_SYSROOT_DIR} install
 cd ../../..
 
 #######################################
@@ -167,7 +168,7 @@ tar -C install --atime-preserve -cf - . | tar --atime-preserve -xf - -C $WDIR
 find $WDIR -type f -exec strip -p {} \; > /dev/null 2>&1
 find $WDIR -exec install/bin/${TARGET}-strip -p {} \; > /dev/null 2>&1
 
-tar -C $WDIR --atime-preserve -czf toolset-jlv-${SUBARCH}.tgz .
+tar -C "$WDIR" --atime-preserve -cJf "toolset-jlv-${SUBARCH}.tar.xz" .
 
 echo "== Готово =="
 
@@ -176,7 +177,7 @@ echo "== Готово =="
 #######################################
 echo ""
 echo "=== Управление архивами ==="
-echo "Собрана тулчейн: toolset-jlv-${SUBARCH}.tgz"
+echo "Собран тулчейн: toolset-jlv-${SUBARCH}.tar.xz"
 
 read -p "Удалить исходные архивы (*.tar.xz)? (y/N): " -n 1 -r
 echo