Refactor toolchain packaging process by introducing package-toolchain.sh

- Replaced the packaging logic in build-toolchain.sh with a call to the new package-toolchain.sh script for better organization and maintainability.
- Added package-toolchain.sh to handle the stripping and archiving of the toolchain, including necessary checks for the installation directory and environment script.
- Updated README.md to document the addition of package-toolchain.sh for clarity on the build process.

README.md

@@ -21,6 +21,7 @@
 | OpenSSL      | 3.0.13 | Криптография              |
 | LibVNCServer | 0.9.14 | VNC-сервер                |
 | FreeType     | 2.13.2 | Рендеринг шрифтов         |
+| libnl        | 3.2.0  | Netlink для Linux         |
 
 Все библиотеки собираются статически.
 
@@ -41,6 +42,8 @@
 - cmake
 - wget
 - bzip2
+- bison (или yacc)
+- flex
 - tar
 - стандартные утилиты (grep, sed и т.д.)
 
@@ -48,7 +51,7 @@
 
 ```bash
 sudo apt update
-sudo apt install -y make gcc g++ cmake wget bzip2 tar sed grep xz-utils
+sudo apt install -y make gcc g++ cmake wget bzip2 bison flex tar sed grep xz-utils
 ```
 
 ## Использование
@@ -111,6 +114,7 @@ source ./env.sh
 build-toolchain/
 ├── build-toolchain.sh          # Основной скрипт сборки
 ├── build-libraries.sh          # Сборка дополнительных библиотек
+├── package-toolchain.sh        # Упаковка готового тулчейна
 ├── download_prerequisites.sh   # Загрузка исходников
 ├── scripts/
 │   └── env.sh                  # Настройка окружения (копируется в архив)

build-libraries.sh

@@ -89,6 +89,30 @@ make install
 
 # ==================================================================
 
+cd "${LIB_BUILD_DIR}/libnl-${LIBNL_VER}"
+if ! command -v flex >/dev/null 2>&1; then
+    echo "Ошибка: для сборки libnl нужен flex (пакет flex)."
+    exit 1
+fi
+if ! command -v bison >/dev/null 2>&1; then
+    echo "Ошибка: для сборки libnl нужен bison (byacc не подходит)."
+    exit 1
+fi
+export YACC="bison -y"
+export LEX="flex"
+./configure \
+    --host="${TARGET}" \
+    --prefix="${SYSROOT_USR_DIR}" \
+    --libdir="${SYSROOT_USR_DIR}/lib" \
+    --disable-shared \
+    --enable-static \
+    --disable-cli
+make -j$(nproc)
+make install
+unset YACC LEX
+
+# ==================================================================
+
 OPENSSL_S_SERVER_FILE="${LIB_BUILD_DIR}/openssl-${OPENSSL_VER}/apps/s_server.c"
 if [ -f "${OPENSSL_S_SERVER_FILE}" ] && ! grep -q '^#include <sys/stat.h>$' "${OPENSSL_S_SERVER_FILE}"; then
     echo "== Патч OpenSSL: добавляю <sys/stat.h> в apps/s_server.c =="

build-toolchain.sh

@@ -211,21 +211,8 @@ cd "${TOP}"
 # ==================================================================
 # Strip и упаковка
 # ==================================================================
-echo "== Strip toolchain и упаковка =="
-
 cd "${TOP}"
-WDIR=$(mktemp -d)
+bash ./package-toolchain.sh "${TARGET}" "${SUBARCH}" "${INSTALL_DIR}"
-trap 'rm -rf "$WDIR"' EXIT
-
-ARCHIVE_TOOLCHAIN_DIR="${WDIR}/${TARGET}"
-mkdir -p "${ARCHIVE_TOOLCHAIN_DIR}"
-cp -a "${INSTALL_DIR}"/* "${ARCHIVE_TOOLCHAIN_DIR}/"
-cp -a "${TOP}/scripts/env.sh" "${WDIR}/env.sh"
-
-find "${ARCHIVE_TOOLCHAIN_DIR}" -type f -executable -exec strip -p {} \; 2>/dev/null || true
-
-tar -C "$WDIR" --owner=0 --group=0 -cJf "toolset-jlv-${SUBARCH}-gcc${GCC_VER}-uclibc${UCLIBC_VER}.tar.xz" "${TARGET}" "env.sh"
-echo "Готово: toolset-jlv-${SUBARCH}-gcc${GCC_VER}-uclibc${UCLIBC_VER}.tar.xz"
 
 # ==================================================================
 # Очистка

download_prerequisites.sh

@@ -42,6 +42,7 @@ toolchain_files=(
 
 # Исходники библиотек
 libs_files=(
+    "https://www.infradead.org/~tgr/libnl/files/libnl-${LIBNL_VER}.tar.gz"
     "https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VER}.tar.gz"
     "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${LIBVNCSERVER_VER}.tar.gz"
     "https://www.openssl.org/source/openssl-${OPENSSL_VER}.tar.gz"

package-toolchain.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+
+source "$(dirname "$0")/versions.sh"
+
+TOP="$(pwd)"
+TARGET="${1:-arm-uclinuxfdpiceabi}"
+SUBARCH="${2:-armv7-m}"
+INSTALL_DIR="${3:-${TOP}/build/install}"
+
+if [ ! -d "${INSTALL_DIR}" ]; then
+    echo "Ошибка: директория установки не найдена: ${INSTALL_DIR}"
+    exit 1
+fi
+
+if [ ! -f "${TOP}/scripts/env.sh" ]; then
+    echo "Ошибка: файл окружения не найден: ${TOP}/scripts/env.sh"
+    exit 1
+fi
+
+echo "== Strip toolchain и упаковка =="
+
+WDIR="$(mktemp -d)"
+trap 'rm -rf "$WDIR"' EXIT
+
+ARCHIVE_TOOLCHAIN_DIR="${WDIR}/${TARGET}"
+mkdir -p "${ARCHIVE_TOOLCHAIN_DIR}"
+cp -a "${INSTALL_DIR}"/* "${ARCHIVE_TOOLCHAIN_DIR}/"
+cp -a "${TOP}/scripts/env.sh" "${WDIR}/env.sh"
+
+find "${ARCHIVE_TOOLCHAIN_DIR}" -type f -executable -exec strip -p {} \; 2>/dev/null || true
+
+ARCHIVE_NAME="toolset-jlv-${SUBARCH}-gcc${GCC_VER}-uclibc${UCLIBC_VER}.tar.xz"
+tar -C "${WDIR}" --owner=0 --group=0 -cJf "${ARCHIVE_NAME}" "${TARGET}" "env.sh"
+
+echo "Готово: ${ARCHIVE_NAME}"

versions.sh

@@ -13,3 +13,4 @@ ZLIB_VER="1.2.13"
 OPENSSL_VER="3.0.13"
 LIBVNCSERVER_VER="0.9.14"
 FREETYPE_VER="2.13.2"
+LIBNL_VER="3.2.0"