fix: исправление конфликтов зависимостей

- mesa, lib32-mesa: убрал libglvnd-gles из deps_redos (mesa сама предоставляет mesa-libGLES)
- lib32-llvm18: убрал llvm-libs(x86-32) из provides (конфликт с системным llvm-libs-17)

lib32-llvm18/alr.sh

@@ -1,6 +1,6 @@
 name='lib32-llvm18'
 version='18.1.8'
-release='12'
+release='13'
 desc='32-bit LLVM libraries for Mesa'
 desc_ru='32-битные библиотеки LLVM для Mesa'
 homepage='https://llvm.org/'
@@ -39,7 +39,6 @@ provides=(
 	'lib32-llvm18'
 	'llvm18-libs(x86-32)'
 	'llvm18-devel(x86-32)'
-	'llvm-libs(x86-32)'
 )
 
 conflicts=(

lib32-mesa/alr.sh

@@ -1,6 +1,6 @@
 name='lib32-mesa'
 version='25.3.0'
-release='1'
+release='2'
 epoch='1'
 desc='Open-source OpenGL and Vulkan drivers (32-bit)'
 desc_ru='OpenGL и Vulkan драйверы (32-бит) с открытым исходным кодом'
@@ -67,7 +67,6 @@ deps_redos=(
 	'lib32-libdrm'
 	'elfutils-libelf(x86-32)'
 	'libglvnd(x86-32)'
-	'libglvnd-gles(x86-32)'
 	'libX11(x86-32)'
 	'libxcb(x86-32)'
 	'libXext(x86-32)'

linux-xanmod-bin/alr.sh

@@ -32,8 +32,8 @@ is_url() {
 }
 
 name='linux-xanmod-bin'
-version='6.17.6'
+version='6.17.9'
-release='1'
+release='3'
 branch='main'
 pkgverdl="${version%-*}"
 desc='The Linux kernel, modules and headers with Xanmod patches - Prebuilt version'

linux-xanmod-bin/postinstall.sh

@@ -0,0 +1,88 @@
+#!/bin/bash
+
+set -e
+
+kernel_version=$(ls -1 /usr/lib/modules/ 2>/dev/null | grep -E '\-xanmod[0-9]*$' | sort -V | tail -n 1)
+
+if [ -z "$kernel_version" ]; then
+    echo "Ошибка: Не удалось определить версию ядра"
+    exit 1
+fi
+
+echo "Обнаружено ядро $kernel_version, выполнение системных хуков..."
+
+kernel_path="/boot/vmlinuz-$kernel_version"
+modules_vmlinuz="/usr/lib/modules/$kernel_version/vmlinuz"
+
+if [ ! -f "$kernel_path" ]; then
+    if [ -f "$modules_vmlinuz" ]; then
+        echo "Копирование образа ядра в /boot..."
+        cp "$modules_vmlinuz" "$kernel_path"
+        chmod 755 "$kernel_path"
+    else
+        echo "Ошибка: Образ ядра не найден в /boot или директории модулей"
+        exit 1
+    fi
+fi
+
+if command -v dracut >/dev/null 2>&1; then
+    initramfs_img="/boot/initramfs-$kernel_version.img"
+    echo "Создание initramfs для $kernel_version с помощью dracut..."
+    dracut --force --kmoddir "/usr/lib/modules/$kernel_version" "$initramfs_img" "$kernel_version"
+    echo "Initramfs создан: $initramfs_img"
+fi
+
+if command -v mkinitcpio >/dev/null 2>&1; then
+    echo "Создание initramfs для $kernel_version с помощью mkinitcpio..."
+    mkinitcpio -k "$kernel_version" -g "/boot/initramfs-$kernel_version.img"
+fi
+
+if command -v update-initramfs >/dev/null 2>&1; then
+    echo "Создание initramfs для $kernel_version с помощью update-initramfs..."
+    update-initramfs -c -k "$kernel_version"
+fi
+
+if command -v mkinitfs >/dev/null 2>&1; then
+    echo "Создание initramfs для $kernel_version с помощью mkinitfs..."
+    mkinitfs -o "/boot/initramfs-$kernel_version" "$kernel_version"
+fi
+
+echo "Обновление конфигурации загрузчика..."
+
+if command -v grubby >/dev/null 2>&1; then
+    echo "Добавление ядра в загрузчик с помощью grubby..."
+    initrd_path="/boot/initramfs-$kernel_version.img"
+
+    if grubby --info="$kernel_path" >/dev/null 2>&1; then
+        echo "Ядро уже зарегистрировано в загрузчике"
+    else
+        grubby --add-kernel="$kernel_path" \
+               --initrd="$initrd_path" \
+               --title="Red OS Linux ($kernel_version) - Xanmod" \
+               --copy-default
+        echo "Ядро добавлено в загрузчик"
+    fi
+
+elif command -v update-grub >/dev/null 2>&1; then
+    echo "Обновление конфигурации GRUB..."
+    update-grub
+
+elif command -v grub2-mkconfig >/dev/null 2>&1; then
+    echo "Обновление конфигурации GRUB2..."
+    grub2-mkconfig -o /boot/grub2/grub.cfg
+
+elif command -v grub-mkconfig >/dev/null 2>&1; then
+    echo "Обновление конфигурации GRUB..."
+    grub-mkconfig -o /boot/grub/grub.cfg
+else
+    echo "Предупреждение: Инструмент настройки загрузчика не найден. Обновите загрузчик вручную."
+fi
+
+echo ""
+echo "=========================================="
+echo "Ядро $kernel_version успешно установлено!"
+echo ""
+echo "Для загрузки с этого ядра:"
+echo "1. Перезагрузите систему"
+echo "2. Выберите 'linux-xanmod' в меню GRUB"
+echo "=========================================="

linux-xanmod-bin/postremove.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+if [ "${1:-0}" -ge 1 ]; then
+    echo "Обнаружено обновление пакета, пропуск очистки"
+    exit 0
+fi
+
+kernel_versions=$(ls /boot/vmlinuz-*-xanmod* 2>/dev/null | sed 's|/boot/vmlinuz-||' || true)
+
+if [ -z "$kernel_versions" ]; then
+    echo "Ядра xanmod не найдены в /boot, очистка может быть неполной"
+    exit 0
+fi
+
+for kernel_version in $kernel_versions; do
+    echo "Очистка ядра $kernel_version..."
+
+    kernel_path="/boot/vmlinuz-$kernel_version"
+
+    if command -v grubby >/dev/null 2>&1; then
+        if grubby --info="$kernel_path" >/dev/null 2>&1; then
+            echo "Удаление записи ядра из загрузчика..."
+            grubby --remove-kernel="$kernel_path" || true
+            echo "Ядро удалено из загрузчика"
+        fi
+    fi
+
+    initramfs_img="/boot/initramfs-$kernel_version.img"
+    if [ -f "$initramfs_img" ]; then
+        echo "Удаление initramfs: $initramfs_img"
+        rm -f "$initramfs_img"
+    fi
+
+    if [ -f "$kernel_path" ]; then
+        echo "Удаление образа ядра: $kernel_path"
+        rm -f "$kernel_path"
+    fi
+
+    if [ -f "/boot/System.map-$kernel_version" ]; then
+        echo "Удаление System.map: /boot/System.map-$kernel_version"
+        rm -f "/boot/System.map-$kernel_version"
+    fi
+
+    if [ -d "/usr/lib/modules/$kernel_version" ]; then
+        echo "Удаление модулей: /usr/lib/modules/$kernel_version"
+        rm -rf "/usr/lib/modules/$kernel_version"
+    fi
+
+    echo "Ядро $kernel_version удалено."
+done
+
+if command -v update-grub >/dev/null 2>&1; then
+    echo "Обновление конфигурации GRUB..."
+    update-grub
+elif command -v grub2-mkconfig >/dev/null 2>&1 && ! command -v grubby >/dev/null 2>&1; then
+    echo "Обновление конфигурации GRUB2..."
+    grub2-mkconfig -o /boot/grub2/grub.cfg
+elif command -v grub-mkconfig >/dev/null 2>&1 && ! command -v grubby >/dev/null 2>&1; then
+    echo "Обновление конфигурации GRUB..."
+    grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+echo ""
+echo "Все ядра xanmod удалены."
+echo "Убедитесь, что у вас установлено другое ядро перед перезагрузкой."

linux-xanmode-bin/postinstall.sh

@@ -1,93 +0,0 @@
-#!/bin/bash
-# Post-install script for linux-xanmod-bin
-
-set -e
-
-# Get kernel version from the installed files
-kernel_version=$(basename /usr/lib/modules/*-xanmod1 2>/dev/null | head -n 1)
-
-if [ -z "$kernel_version" ]; then
-    echo "Error: Could not determine kernel version"
-    exit 1
-fi
-
-if [ ! -f "/boot/vmlinuz-$kernel_version" ]; then
-    echo "Error: Kernel image /boot/vmlinuz-$kernel_version not found"
-    exit 1
-fi
-
-echo "Detected kernel $kernel_version, running system hooks..."
-
-# For RedOS/RHEL/Fedora systems with dracut
-if command -v dracut >/dev/null 2>&1; then
-    initramfs_img="/boot/initramfs-$kernel_version.img"
-    echo "Creating initramfs for $kernel_version using dracut..."
-    dracut --force --kmoddir "/usr/lib/modules/$kernel_version" "$initramfs_img" "$kernel_version"
-    echo "Initramfs created: $initramfs_img"
-fi
-
-# For Arch-based systems with mkinitcpio
-if command -v mkinitcpio >/dev/null 2>&1; then
-    echo "Creating initramfs for $kernel_version using mkinitcpio..."
-    mkinitcpio -k "$kernel_version" -g "/boot/initramfs-$kernel_version.img"
-fi
-
-# For Debian-based systems with update-initramfs
-if command -v update-initramfs >/dev/null 2>&1; then
-    echo "Creating initramfs for $kernel_version using update-initramfs..."
-    update-initramfs -c -k "$kernel_version"
-fi
-
-# For Alpine Linux with mkinitfs
-if command -v mkinitfs >/dev/null 2>&1; then
-    echo "Creating initramfs for $kernel_version using mkinitfs..."
-    mkinitfs -o "/boot/initramfs-$kernel_version" "$kernel_version"
-fi
-
-# Update GRUB configuration
-echo "Updating bootloader configuration..."
-
-# For RHEL/Fedora/RedOS with grubby (BLS - Boot Loader Specification)
-if command -v grubby >/dev/null 2>&1; then
-    echo "Adding kernel to bootloader using grubby..."
-    kernel_path="/boot/vmlinuz-$kernel_version"
-    initrd_path="/boot/initramfs-$kernel_version.img"
-
-    # Check if kernel already exists in grubby
-    if grubby --info="$kernel_path" >/dev/null 2>&1; then
-        echo "Kernel already registered in bootloader"
-    else
-        # Add kernel entry
-        grubby --add-kernel="$kernel_path" \
-               --initrd="$initrd_path" \
-               --title="Red OS Linux ($kernel_version) - Xanmod" \
-               --copy-default
-        echo "Kernel added to bootloader"
-    fi
-
-# For Debian/Ubuntu with update-grub
-elif command -v update-grub >/dev/null 2>&1; then
-    echo "Updating GRUB configuration..."
-    update-grub
-
-# For other systems with grub2-mkconfig
-elif command -v grub2-mkconfig >/dev/null 2>&1; then
-    echo "Updating GRUB2 configuration..."
-    grub2-mkconfig -o /boot/grub2/grub.cfg
-
-# For systems with grub-mkconfig
-elif command -v grub-mkconfig >/dev/null 2>&1; then
-    echo "Updating GRUB configuration..."
-    grub-mkconfig -o /boot/grub/grub.cfg
-else
-    echo "Warning: No bootloader configuration tool found. Please update your bootloader manually."
-fi
-
-echo ""
-echo "=========================================="
-echo "Kernel $kernel_version installed successfully!"
-echo ""
-echo "To boot into this kernel:"
-echo "1. Reboot your system"
-echo "2. Select 'linux-xanmod' from the GRUB menu"
-echo "=========================================="

linux-xanmode-bin/postremove.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-# Post-remove script for linux-xanmod-bin
-
-# Get kernel version from boot files (since modules may already be removed)
-kernel_version=$(ls /boot/vmlinuz-*-xanmod1 2>/dev/null | head -n 1 | sed 's|/boot/vmlinuz-||')
-
-if [ -z "$kernel_version" ]; then
-    echo "Kernel version could not be determined, cleanup may be incomplete"
-    exit 0
-fi
-
-echo "Cleaning up after removal of kernel $kernel_version..."
-
-kernel_path="/boot/vmlinuz-$kernel_version"
-
-# Remove from bootloader first
-echo "Removing kernel from bootloader..."
-if command -v grubby >/dev/null 2>&1; then
-    # For RHEL/Fedora/RedOS with grubby
-    if grubby --info="$kernel_path" >/dev/null 2>&1; then
-        echo "Removing kernel entry using grubby..."
-        grubby --remove-kernel="$kernel_path"
-        echo "Kernel removed from bootloader"
-    fi
-fi
-
-# Remove initramfs if it exists
-initramfs_img="/boot/initramfs-$kernel_version.img"
-if [ -f "$initramfs_img" ]; then
-    echo "Removing initramfs: $initramfs_img"
-    rm -f "$initramfs_img"
-fi
-
-# Remove kernel image from /boot if it still exists
-if [ -f "$kernel_path" ]; then
-    echo "Removing kernel image: $kernel_path"
-    rm -f "$kernel_path"
-fi
-
-# Remove System.map if it exists
-if [ -f "/boot/System.map-$kernel_version" ]; then
-    echo "Removing System.map: /boot/System.map-$kernel_version"
-    rm -f "/boot/System.map-$kernel_version"
-fi
-
-# Update GRUB configuration (for non-BLS systems)
-if command -v update-grub >/dev/null 2>&1; then
-    echo "Updating GRUB configuration..."
-    update-grub
-elif command -v grub2-mkconfig >/dev/null 2>&1 && ! command -v grubby >/dev/null 2>&1; then
-    echo "Updating GRUB2 configuration..."
-    grub2-mkconfig -o /boot/grub2/grub.cfg
-elif command -v grub-mkconfig >/dev/null 2>&1 && ! command -v grubby >/dev/null 2>&1; then
-    echo "Updating GRUB configuration..."
-    grub-mkconfig -o /boot/grub/grub.cfg
-fi
-
-echo "Kernel $kernel_version has been removed."
-echo "Please ensure you have another kernel installed before rebooting."

mesa/alr.sh

@@ -1,6 +1,6 @@
 name='mesa'
 version='25.3.0'
-release='1'
+release='2'
 epoch='1'
 desc='Open-source OpenGL and Vulkan drivers'
 desc_ru='OpenGL и Vulkan драйверы с открытым исходным кодом'
@@ -79,7 +79,6 @@ deps_redos=(
 	'libdrm'
 	'elfutils-libelf'
 	'libglvnd'
-	'libglvnd-gles'
 	'libX11'
 	'libxcb'
 	'libXext'