build: Disable step "Cache toolchain" and fix host dir

This reverts commit b788e7e165.

.github/workflows/build.yml

@@ -3,21 +3,16 @@ name: build
 on:
   workflow_dispatch:
     inputs:
-      use_cache:
+      first_kernel_compile:
-        description: 'Restore cache for host tools'
+        description: 'First kernel compile'
         required: true
         default: 'true'
         type: choice
         options:
         - true
         - false
-      cache_ver:
-        description: 'Use cache version'
-        required: false
-        default: '0'
-        type: string
       test_build:
-        description: 'Test build (only spec target) '
+        description: 'Test build'
         required: true
         default: 'false'
         type: choice
@@ -25,12 +20,12 @@ on:
         - true
         - false
       target_name:
-        description: 'Target Name for test build'
+        description: 'Target Name'
         required: false
         default: 'r3d'
         type: string
       package_dir:
-        description: 'Package Dir for test build'
+        description: 'Package Dir'
         required: false
         default: ''
         type: string
@@ -49,15 +44,17 @@ on:
         type: string
 
 env:
+  FIRST_KERNEL_COMPILE:  ${{ github.event.inputs.first_kernel_compile == 'true' }}
   TEST_BUILD: ${{ github.event.inputs.test_build == 'true' }}
   FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
   TAG_SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || github.event.inputs.test_build == 'true' && '-test' || '' }}
   TARGET_NAME: ${{ github.event.inputs.target_name }}
-  G_PKG_DIR: ${{ github.event.inputs.package_dir }}
+  PACKAGE_DIR: ${{ github.event.inputs.package_dir }}
   REPO_URL: https://github.com/openwrt-xiaomi/openwrt
   REPO_LNK: openwrt-xiaomi/openwrt
-  REPO_BRANCH: xq-24.10
+  REPO_BRANCH: xq-25.12
-  TAG_PREFIX: v24-
+  TAG_PREFIX: v25-
+  DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
   TZ: UTC
   DEVICE_NAME: unknown
   BUILD_DATE: unknown
@@ -157,9 +154,8 @@ jobs:
           - rt-ax57m
           - rt-ax59u
           - rt-ax89x
-          - tuf-ax4200
+          - tuf_ax4200
-          - tuf-ax4200q
+          - tuf_ax6000
-          - tuf-ax6000
           - zen-bt8
         isTest:
           - ${{ needs.check.outputs.test_build == 'true' }}
@@ -175,9 +171,9 @@ jobs:
           sudo apt-get -qq update
           #sudo apt-get -qq update && sudo apt-get -qq upgrade
           sudo apt-get -qq install  build-essential gawk flex rsync swig unzip zlib1g-dev file wget
-          sudo apt-get -qq install  libc6-dev clang bison g++ gcc-multilib g++-multilib
+          sudo apt-get -qq install  libc6-dev clang flex bison g++ gcc-multilib g++-multilib
           sudo apt-get -qq install  gettext git libncurses5-dev libssl-dev python3-setuptools
-          sudo apt-get -qq install  libc6-dev pkg-config squashfs-tools
+          sudo apt-get -qq install  libc6-dev pkg-config
           sudo apt-get -qq autoremove --purge
           sudo apt-get -qq clean
           sudo timedatectl set-timezone "$TZ"
@@ -190,17 +186,7 @@ jobs:
           remove-haskell: true
           remove-codeql: true
           remove-docker-images: true
-
+        
-      - name: Set fixed workspace
-        env: 
-          GITHUB_WORKSPACE: ${{ github.workspace }}
-        run: |
-          sudo mkdir -p $GITHUB_WORKSPACE/_temp
-          #sudo chown -R $USER:$USER $GITHUB_WORKSPACE
-          echo "GITHUB_WORKSPACE = $GITHUB_WORKSPACE"
-          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE" >> $GITHUB_ENV
-          echo "RUNNER_TEMP=$GITHUB_WORKSPACE/_temp" >> $GITHUB_ENV
-          
       - name: Checkout builder
         uses: actions/checkout@main
 
@@ -214,7 +200,16 @@ jobs:
       - name: Init builder
         run: |
           chmod +x *.sh
-          wget https://github.com/fantastic-packages/packages/raw/refs/heads/24.10/keys/usign/53FF2B6672243D28.pub
+          wget https://github.com/fantastic-packages/packages/raw/refs/heads/25.12/keys/usign/53FF2B6672243D28.pub
+
+      - name: Cache downloads (dl)
+        if: false
+        uses: actions/cache@v4
+        with:
+          path: dl
+          key: dl-${{ hashFiles('feeds.conf.default') }}
+          restore-keys: |
+            dl-
 
       - name: Update OpenWrt packages
         id: update
@@ -222,67 +217,6 @@ jobs:
           ./xupdate.sh -f
           mkdir -p logs
           echo "status=success" >> $GITHUB_OUTPUT
-          
-      - name: Prepare for cache
-        id: cache_prepare
-        env: 
-          TARGET: ${{ matrix.target }}
-          USE_CACHE: ${{ github.event.inputs.use_cache }}
-          CACHE_VER: ${{ github.event.inputs.cache_ver }}
-        run: |
-          if [ "$USE_CACHE" = "true" ]; then
-              rm -rf staging_dir/
-              mkdir -p staging_dir/host
-              rm -rf build_dir/
-              mkdir -p build_dir/host
-          fi
-          if [[ " kng_re r3g r3p " == *" $TARGET "* ]]; then
-              CACHE_ARCH=mips
-          else
-              CACHE_ARCH=arm
-          fi
-          echo "CACHE_ARCH = $CACHE_ARCH"
-          echo "USE_CACHE=$USE_CACHE" >> $GITHUB_ENV
-          echo "CACHE_VER=$CACHE_VER" >> $GITHUB_ENV
-          echo "CACHE_ARCH=$CACHE_ARCH" >> $GITHUB_ENV
-          echo "status=success" >> $GITHUB_OUTPUT
-
-      - name: Restore cache for host tools
-        id: tools_cache_restore
-        if: github.event.inputs.use_cache == 'true'
-        uses: actions/cache/restore@v4
-        with:
-          key: host-tools-${{ env.CACHE_VER }}-${{ env.CACHE_ARCH }}-${{ hashFiles('tools/**') }}
-          path: |
-            staging_dir/host
-            build_dir/host
-
-      - name: Fix time stamps into restored dirs
-        if: github.event.inputs.use_cache == 'true' && steps.tools_cache_restore.outputs.cache-hit == 'true'
-        run: |
-          touch staging_dir/host/.prepared
-          touch staging_dir/host/.prereq-build
-          touch staging_dir/host/stamp/.* 2>/dev/null
-          find build_dir/host -name ".prepared*"  -exec touch {} +
-          find build_dir/host -name ".configured" -exec touch {} +
-          find build_dir/host -name ".built"      -exec touch {} +
-
-      - name: Inspect restored host tools
-        if: github.event.inputs.use_cache == 'true'
-        run: |
-          echo "====== openwrt-native.txt ======"
-          cat build_dir/host/pkgconf-*/openwrt-native.txt || true
-          echo "====== staging_dir/host ====="
-          du -sh staging_dir/host || true
-          ls -la staging_dir/host || true
-          echo "====== staging_dir/host/bin ====="
-          du -sh staging_dir/host/bin || true
-          ls -1  staging_dir/host/bin | head -20 || true
-          echo "====== build_dir/host ======="
-          du -sh build_dir/host || true
-          ls -1  build_dir/host | head -20 || true
-          echo "====== path info ========"
-          grep -R "/home/runner" build_dir/host | head
 
       - name: Configure
         id: configure
@@ -321,9 +255,51 @@ jobs:
           echo "====== .config ========="
           cat .config
           echo "========================"
-          cp -f .config logs/config1
-          cp -f .config config1
 
+      - name: Prepare for use cache of tools and toolchain
+        run: |
+          echo "G_TARGET_ARCH = $G_TARGET_ARCH"
+          mkdir -p staging_dir/host
+          rm -rf /tmp/staging-host
+          mkdir -p /tmp/staging-host
+          cp -a staging_dir/host/* /tmp/staging-host/
+          rm -rf staging_dir/host/*
+    
+      - name: Cache host tools
+        uses: actions/cache@v4
+        with:
+          path: staging_dir/host
+          key: host-tools-${{ runner.os }}-${{ hashFiles('tools/**') }}
+          save-always: true
+          restore-keys: |
+            host-tools-${{ runner.os }}-
+
+      - name: Cache toolchain
+        if: false
+        uses: actions/cache@v4
+        with:
+          path: staging_dir/toolchain-*
+          key: toolchain-${{ env.G_TARGET_ARCH }}-${{ hashFiles('toolchain/**') }}
+          save-always: true
+          restore-keys: |
+            toolchain-${{ env.G_TARGET_ARCH }}-
+
+      - name: Restore saved host staging
+        run: |
+          cp -af /tmp/staging-host/* staging_dir/host
+          rm -rf /tmp/staging-host
+    
+      - name: Increase swap to 16G
+        if: false
+        run: |
+          free -h
+          sudo swapoff -a || true
+          sudo rm -f /swapfile
+          sudo fallocate -l 16G /swapfile
+          sudo chmod 600 /swapfile
+          sudo mkswap /swapfile
+          sudo swapon /swapfile
+    
       - name: Monitor memory
         run: |
           echo "CPU cores = $(nproc)"
@@ -335,23 +311,6 @@ jobs:
           echo "Available storage:"
           sudo df -h
 
-      - name: Download sources (dl)
-        id: download
-        if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
-        run: |
-          make -j$(nproc) download
-          echo "status=success" >> $GITHUB_OUTPUT
-
-      - name: Fix time stamps into restored dirs
-        if: github.event.inputs.use_cache == 'true' && steps.tools_cache_restore.outputs.cache-hit == 'true'
-        run: |
-          touch staging_dir/host/.prepared
-          touch staging_dir/host/.prereq-build
-          touch staging_dir/host/stamp/.* 2>/dev/null
-          find build_dir/host -name ".prepared*"  -exec touch {} +
-          find build_dir/host -name ".configured" -exec touch {} +
-          find build_dir/host -name ".built"      -exec touch {} +
-
       - name: Build tools and toolchain
         id: tools
         if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
@@ -359,31 +318,9 @@ jobs:
           make toolchain/install -j$(nproc)
           echo "status=success" >> $GITHUB_OUTPUT
 
-      - name: Save cache for host tools
-        id: tools_cache_save
-        if: steps.tools.outputs.status == 'success'
-        uses: actions/cache/save@v4
-        with:
-          key: host-tools-${{ env.CACHE_VER }}-${{ env.CACHE_ARCH }}-${{ hashFiles('tools/**') }}
-          path: |
-            staging_dir/host
-            build_dir/host
-
-      - name: Configure 2
-        id: configure2
-        if: steps.tools.outputs.status == 'success'
-        env: 
-          TARGET: ${{ matrix.target }}
-        run: |
-          make clean
-          ./xmake.sh -I -t $TARGET
-          mkdir -p logs
-          cp -f .config logs/config2
-          [ -f config1 ] && cp -f config1 logs/config1
-
       - name: Kernel compile
         id: kernel
-        if: ${{ steps.tools.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
+        if: ${{ steps.tools.outputs.status == 'success' && github.event.inputs.first_kernel_compile == 'true' && github.event.inputs.fake_build != 'true' }}
         run: |
           make target/linux/compile -j$(nproc)
           echo "status=success" >> $GITHUB_OUTPUT
@@ -405,17 +342,15 @@ jobs:
           TARGET: ${{ matrix.target }}
         run: |
           echo "Run $(nproc) thread compile"
-          if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$G_PKG_DIR" != "" ]; then
+          if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$PACKAGE_DIR" != "" ]; then
-              make target/linux/compile -j$(npoc)
+              make $PACKAGE_DIR/compile V=sc BUILD_LOG=1
-              echo "=============== BUILD PACKAGE: $G_PKG_DIR ==============="
-              make $G_PKG_DIR/compile V=sc BUILD_LOG=1
               exit 99
           fi
           if [ "$FAKE_BUILD" != "true" ]; then
               if [ "$TEST_BUILD" != "true" ]; then
-                  make -j$(nproc) world
+                  make -j$(nproc) download world
               else
-                  make V=sc world
+                  make V=sc download world
               fi
           fi
           # process results
@@ -501,7 +436,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: logs-${{ matrix.target }}-${{ needs.check.outputs.fw_date }}
+          name: logs-${{ matrix.target }}-${{ env.FW_DATE }}
           path: logs-*.tar.xz
 
   release:
@@ -539,7 +474,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG: ${{ needs.check.outputs.tag }}
         with:
-          prerelease: true
+          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
           tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
           name: '${{ needs.check.outputs.tag }}'
           body: |

_base.config

@@ -45,8 +45,6 @@ CONFIG_PACKAGE_luci-app-filemanager=y
 CONFIG_PACKAGE_luci-i18n-filemanager-ru=y
 #CONFIG_PACKAGE_atftp=y
 #CONFIG_PACKAGE_atftpd=y
-CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_bind-tools=y
 CONFIG_PACKAGE_facinstall=y
 
 ### Add-on programs
@@ -188,7 +186,6 @@ CONFIG_OPENSSL_WITH_MDC2=y
 CONFIG_OPENSSL_WITH_WHIRLPOOL=y
 
 ### SSL certificates
-CONFIG_PACKAGE_ca-bundle=y 
 CONFIG_PACKAGE_ca-certificates=y
 
 ### Luci

_base_initrd.config

@@ -37,14 +37,12 @@ CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_mtd-utils=y
 CONFIG_PACKAGE_iw=y
 CONFIG_PACKAGE_mc=y
-CONFIG_PACKAGE_rsync=y
 CONFIG_PACKAGE_luci-app-ttyd=y
 CONFIG_PACKAGE_luci-i18n-ttyd-ru=y
 CONFIG_PACKAGE_luci-app-filemanager=y
 CONFIG_PACKAGE_luci-i18n-filemanager-ru=y
 CONFIG_PACKAGE_atftp=y
 #CONFIG_PACKAGE_atftpd=y
-CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_facinstall=y
 
 CONFIG_PACKAGE_kmod-mtd-rw=y
@@ -57,7 +55,6 @@ CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_htop=y
 CONFIG_PACKAGE_nano=y
 CONFIG_PACKAGE_ccrypt=y
-CONFIG_PACKAGE_curl=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_patch=y
 CONFIG_PACKAGE_diffutils=y
@@ -67,10 +64,6 @@ CONFIG_PACKAGE_terminfo=y
 CONFIG_PACKAGE_zlib=y
 CONFIG_PACKAGE_ethtool=y
 
-### SSL certificates
-CONFIG_PACKAGE_ca-bundle=y 
-CONFIG_PACKAGE_ca-certificates=y
-
 ### Luci
 CONFIG_LUCI_LANG_en=y
 CONFIG_LUCI_LANG_ru=y

_initramfs/tuf-ax4200q.config

@@ -1,14 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200q=y
-
-#include _addons.config
-#include _base_initrd.config
-#include _wifi_en.config
-
-
-CONFIG_TARGET_INITRAMFS_FORCE=y
-CONFIG_TARGET_ROOTFS_INITRAMFS=y
-CONFIG_USES_SEPARATE_INITRAMFS=n
-CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
-

_proxy.config

@@ -9,7 +9,12 @@ CONFIG_PACKAGE_luci-i18n-https-dns-proxy-ru=y
 CONFIG_PACKAGE_igmpproxy=y
 
 CONFIG_PACKAGE_zapret=y
+CONFIG_PACKAGE_zapret-tpws=y
+CONFIG_PACKAGE_zapret-mdig=y
+CONFIG_PACKAGE_zapret-ip2net=y
 CONFIG_PACKAGE_luci-app-zapret=y
 
 CONFIG_PACKAGE_zapret2=y
+CONFIG_PACKAGE_zapret2-mdig=y
+CONFIG_PACKAGE_zapret2-ip2net=y
 CONFIG_PACKAGE_luci-app-zapret2=y

tuf-ax4200q.config

@@ -1,44 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200q=y
-
-#include _addons.config
-#include _base.config
-#include _wifi_en.config
-#include _printer.config
-#include _samba.config
-#include _torrents.config
-#include _proxy.config
-#include _argon.config
-#include _vpn.config
-
-### Temp and sensors
-CONFIG_PACKAGE_lm-sensors=y
-CONFIG_PACKAGE_lm-sensors-detect=y
-CONFIG_PACKAGE_luci-app-temp-status=y
-CONFIG_PACKAGE_luci-i18n-temp-status-ru=y
-CONFIG_PACKAGE_collectd-mod-sensors=y
-
-### HDD tools
-CONFIG_PACKAGE_smartmontools=y
-CONFIG_PACKAGE_hdparm=y
-CONFIG_PACKAGE_hd-idle=y
-CONFIG_PACKAGE_luci-app-hd-idle=y
-#CONFIG_PACKAGE_luci-i18n-hd-idle-ru=y
-CONFIG_PACKAGE_luci-app-disks-info=y
-#CONFIG_PACKAGE_luci-i18n-disks-info-ru=y
-CONFIG_PACKAGE_luci-app-diskman=y
-
-### Luci dashboard
-CONFIG_PACKAGE_luci-mod-dashboard=y
-CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### TimeControl
-CONFIG_PACKAGE_luci-app-timecontrol=m
-
-CONFIG_PACKAGE_fantastic-feeds=m
-

xmake.sh

@@ -15,6 +15,7 @@ OPT_FULL_REBUILD=false
 KALLSYMS=false
 TESTING_KERNEL=false
 BUILD_ONLY_INITRAMFS=false
+BUILD_SKIP_INITRAMFS=false
 ONLY_INIT=false
 
 while getopts "j:t:fiskTI" opt; do
@@ -25,6 +26,7 @@ while getopts "j:t:fiskTI" opt; do
 		k) KALLSYMS=true;;
 		T) TESTING_KERNEL=true;;
 		i) BUILD_ONLY_INITRAMFS=true;;
+		s) BUILD_SKIP_INITRAMFS=true;;
 		I) ONLY_INIT=true;;
 	esac
 done
@@ -68,7 +70,7 @@ function build_target {
 	fi
 	inclst=$( get_cfg_inc_lst $CFG )
 	for inc in $inclst; do
-		incfn=$XDIR/_cfginc/$inc
+		incfn=$XDIR/$inc
 		[ ! -f $incfn ] && die "File '$inc' not found!"
 		sed -i "/#include $inc/a <<LF>><<LF>>" $CFG
 		sed -i "s/<<LF>>/\n/g" $CFG
@@ -106,7 +108,6 @@ function build_target {
 		############ change images prefix ############
 		# IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
 		sed -i -e 's/^IMG_PREFIX:=.*/IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(call sanitize,$(VERSION_NUMBER))-'$CURDATE'/g' $XDIR/include/image.mk
-		echo ">>> image.mk patched !!!"
 	fi
 	if [ 1 = 1 ]; then
 		############ remove "squashfs" suffix ############
@@ -119,10 +120,10 @@ function build_target {
 		fi
 	fi	
 	
-	RAB_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile
+	AWG_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile
-	if [ -f $RAB_LUCI_MK ]; then
+	if [ -f $AWG_LUCI_MK ]; then
-		if ! grep "PKG_PROVIDES" $RAB_LUCI_MK >/dev/null ; then
+		if ! grep "PKG_PROVIDES" $AWG_LUCI_MK >/dev/null ; then
-			sed -i 's/LUCI_PKGARCH:=all/LUCI_PKGARCH:=all\nPKG_PROVIDES:=luci-app-ruantiblock/g' $RAB_LUCI_MK
+			sed -i 's/LUCI_PKGARCH:=all/LUCI_PKGARCH:=all\nPKG_PROVIDES:=luci-app-ruantiblock/g' $AWG_LUCI_MK
 		fi
 	fi
 
@@ -133,42 +134,38 @@ function build_target {
 		fi
 	fi
 
-	PODKOP_DIR=$XDIR/package/feeds/_podkop
+	PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
-	if [ -d $PODKOP_DIR ]; then
+	if [ -f $PODKOP_MK ]; then
-		PODKOP_PATCH=
+		sed -i 's/+sing-box / /g' $PODKOP_MK
-		PODKOP_MK=$PODKOP_DIR/podkop/Makefile
+		sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK
-		if [ -f $PODKOP_MK ] && grep -q '+sing-box' $PODKOP_MK ; then
+	fi
-			sed -i 's/+sing-box / /g' $PODKOP_MK
+	PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop
-			sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK
+	if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
-			PODKOP_PATCH="$PODKOP_PATCH (del depend sing-box)"
+		sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
-		fi
-		PODKOP_SH=$PODKOP_DIR/podkop/files/usr/bin/podkop
-		if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
-			sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
-			PODKOP_PATCH="$PODKOP_PATCH (status for sing-box)"
-		fi
-		if [ -f $PODKOP_MK ] && grep -q 'PODKOP_VERSION' $PODKOP_MK ; then
-			PKGVERLIST=$( git ls-remote --tags https://github.com/itdoginfo/podkop.git | awk -F/ '{print $3}' | grep -Ev '^v' | sort -V | tail -n 2 )
-			VER_PREV=$( sed -n '1p' <<< "$PKGVERLIST" )
-			VER_LATEST=$( sed -n '2p' <<< "$PKGVERLIST" )
-			[ -z "$VER_LATEST" ] && { echo "ERROR: cannot detect version of podkop!"; exit 1; }
-			sed -i 's/PKG_VERSION :=.*/PKG_VERSION:='$VER_LATEST'/g' $PODKOP_MK
-			PODKOP_PATCH="$PODKOP_PATCH (set ver $VER_LATEST)"
-		fi
-		PODKOP_MK=$PODKOP_DIR/luci-app-podkop/Makefile
-		if [ -f $PODKOP_MK ] && grep -q 'PODKOP_VERSION' $PODKOP_MK ; then
-			PKGVERLIST=$( git ls-remote --tags https://github.com/itdoginfo/podkop.git | awk -F/ '{print $3}' | grep -Ev '^v' | sort -V | tail -n 2 )
-			VER_PREV=$( sed -n '1p' <<< "$PKGVERLIST" )
-			VER_LATEST=$( sed -n '2p' <<< "$PKGVERLIST" )
-			[ -z "$VER_LATEST" ] && { echo "ERROR: cannot detect version of podkop!"; exit 1; }
-			sed -i 's/PKG_VERSION :=.*/PKG_VERSION:='$VER_LATEST'/g' $PODKOP_MK
-			PODKOP_PATCH="$PODKOP_PATCH (Set Ver $VER_LATEST)"
-		fi
-		[ "$PODKOP_PATCH" != "" ] && echo ">>> podkop patched !!! $PODKOP_PATCH"
 	fi
 
-	DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
+	DROPBEAR_DIR=$XDIR/package/network/services/dropbear
+	TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
 	if [ -f $DROPBEAR_MK ]; then
+		# download dropbear 2024.86 (OpenWrt v24.10)
+		if [ ! -f $TMP_DROPBEAR_DIR/Makefile ]; then
+			rm -rf $TMP_DROPBEAR_DIR
+			git clone --depth 1 --filter=blob:none --sparse https://github.com/openwrt/openwrt.git $TMP_DROPBEAR_DIR && (
+				cd $TMP_DROPBEAR_DIR
+				git sparse-checkout set package/network/services/dropbear
+				git checkout a2f0cd35ac1d15e69f4897b35c049e175dd06825 # commit 2024-12-12 https://github.com/openwrt/openwrt/commits/openwrt-25.12/package/network/services/dropbear
+				mv package/network/services/dropbear/* .
+			)
+			rm -rf $TMP_DROPBEAR_DIR/package
+			rm -rf $TMP_DROPBEAR_DIR/.git
+		fi
+		rm -rf $DROPBEAR_DIR/files
+		rm -rf $DROPBEAR_DIR/patches
+	fi
+	DROPBEAR_MK=$DROPBEAR_DIR/Makefile
+	if [ -f $DROPBEAR_MK ]; then
+		# downgrade dropbear to 2024.86 (OpenWrt v24.10)
+		cp -a $TMP_DROPBEAR_DIR/. $DROPBEAR_DIR/
 		# patch: Disable MODERN and enable RSA/DH-SHA1
 		sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
 		sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
@@ -176,7 +173,6 @@ function build_target {
 		sed -i 's/ CONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
 		sed -i 's/DROPBEAR_DH_GROUP14_SHA1,0/ /g' $DROPBEAR_MK
 		sed -i 's/DROPBEAR_SHA1_HMAC,0/ /g' $DROPBEAR_MK
-		echo ">>> dropbear patched !!! (disable MODERN_ONLY)"
 	fi
 
 	make defconfig
@@ -214,10 +210,7 @@ function build_target {
 		echo -e "\nCONFIG_PACKAGE_wpad-openssl=y\n" >> $CFG
 	fi
 
-	DASHBRDPO=$XDIR/feeds/luci/modules/luci-mod-dashboard/po/ru/dashboard.po
+	#DASHBRDPO=$XDIR/feeds/luci/modules/luci-mod-dashboard/po/ru/dashboard.po
-	if [ -f $DASHBRDPO ]; then
-		sed -i 's/msgid "Dashboard"/msgid "__dash_board__"/g' $DASHBRDPO
-	fi
 	DASHBRDPO=$XDIR/package/feeds/luci/luci-mod-dashboard/po/ru/dashboard.po
 	if [ -f $DASHBRDPO ]; then
 		sed -i 's/msgid "Dashboard"/msgid "__dash_board__"/g' $DASHBRDPO
@@ -308,13 +301,10 @@ function build_target {
 		echo "src/gz  fantastic_packages_special   $PKG_LINK/special"   >> $OPKG_CFEED_FN
 		TARGET_ARCH_PACKAGES=$( get_cfg_opt_value $CFG TARGET_ARCH_PACKAGES )
 		[ -z "$TARGET_ARCH_PACKAGES" ] && die "Cannot find TARGET ARCH"
-		sed -i "s/<<VER>>/24.10/g" $OPKG_CFEED_FN
+		sed -i "s/<<VER>>/25.12/g" $OPKG_CFEED_FN
 		sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
 		logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
 	fi
-	if [ $BUILD_ONLY_INITRAMFS = true ]; then
-		rm -f $OPKG_DIR/customfeeds.conf
-	fi
 
 	SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf
 	if [ -f $SYSCTLCONF_FN ]; then
@@ -344,19 +334,13 @@ function build_config {
 	local cfg=$1
 	local cfg_name=$( basename $cfg )
 	local target_name=${cfg_name%.*}
-	local initramfs=false
 	local board=$( get_cfg_board $cfg )
 	local subtarget=$( get_cfg_subtarget $cfg $board )
 	local device=$( get_cfg_dev_lst $cfg $board $subtarget )
 	local outdir=$XDIR/bin/targets/$board/$subtarget	
-
+	echo Start build for target $cfg_name "($board-$subtarget-$device)"
-	if echo "$cfg" | grep -q '_initramfs/' ; then
+	
-		initramfs=true
+	build_target $cfg_name
-		target_name=${target_name}_initramfs
-	fi
-	echo Start build for target $target_name "($board-$subtarget-$device)"
-
-	build_target $cfg
 	
 	if [ ! -f $outdir/kernel-debug.tar.zst ]; then
 		echo "ERROR: cannot build images for target $target_name"
@@ -371,9 +355,6 @@ function build_config {
 
 if [ "$XTARGET" != "*" ]; then
 	TARGETCFG=$XDIR/$XTARGET
-	if [ $BUILD_ONLY_INITRAMFS = true ]; then
-		TARGETCFG=$XDIR/_initramfs/$XTARGET
-	fi
 	XTARGET_EXT="${XTARGET##*.}"
 	[ $XTARGET_EXT != config ] && TARGETCFG=$TARGETCFG.config
 	[ ! -f $TARGETCFG ] && die "File '"`basename $TARGETCFG`"' not found!"
@@ -385,12 +366,7 @@ if [ "$XTARGET" != "*" ]; then
 fi
 
 XOUT=$XDIR/xout
-
+CFG_LIST=$( find $XDIR/* -maxdepth 1 -name '[a-z0-9]*.config' )
-if [ $BUILD_ONLY_INITRAMFS = true ]; then
-	CFG_LIST=$( find $XDIR/_initramfs/* -maxdepth 1 -name '[a-z0-9]*.config' )
-else
-	CFG_LIST=$( find $XDIR/* -maxdepth 1 -name '[a-z0-9]*.config' )
-fi
 
 rm -rf $XOUT
 
@@ -399,16 +375,35 @@ if [ -z "$CFG_LIST" ]; then
 	exit 1
 fi
 
-if [ $BUILD_ONLY_INITRAMFS = true ]; then
+INITRAMFS_COUNT=0
-	echo "Start make initramfs configs!"
-else
-	echo "Start make non initramfs configs!"
-fi	
-	
-clean_all
-
 for CFG in $CFG_LIST; do
-   build_config $CFG
+	if [[ "$CFG" == *"_initramfs"* ]]; then
+		INITRAMFS_COUNT=$(( INITRAMFS_COUNT + 1 ))
+	fi
 done
 
+if [ $INITRAMFS_COUNT = 0 ] && [ $BUILD_ONLY_INITRAMFS = true ]; then
+	echo "ERROR: Cannot found initramfs configs!"
+	exit 1
+fi
+
+if [ $INITRAMFS_COUNT -gt 0 ] && [ $BUILD_SKIP_INITRAMFS != true ]; then
+	echo "Start make initramfs configs!"
+	clean_all
+	for CFG in $CFG_LIST; do
+	   [[ "$CFG" != *"_initramfs"* ]] && continue  # process only initramfs configs
+	   build_config $CFG
+	done
+fi
+
+if [ $BUILD_ONLY_INITRAMFS != true ]; then
+	echo "Start make non initramfs configs!"
+	clean_all
+	for CFG in $CFG_LIST; do
+		[[ "$CFG" == *"_initramfs"* ]] && continue  # skip initramfs configs
+		build_config $CFG
+	done
+fi
+
 echo "All targets was builded!" 
+

xupdate.sh

@@ -4,8 +4,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 export XDIR=$SCRIPT_DIR
 export XADDONSDIR=$XDIR/package/addons
 FEEDSDIR=$XDIR/package/feeds
-ADDONSCFG=$XDIR/_cfginc/_addons.config
+ADDONSCFG=$XDIR/_addons.config
-ADDONSNSS=$XDIR/_cfginc/_addons_nss.config
+ADDONSNSS=$XDIR/_addons_nss.config
 
 . ./xcommon.sh