xmake: Always try create vermagic-*.list file

xmake: Add check for CONFIG_BUILD_ALL_HOST_TOOLS option
build: Add check for CONFIG_BUILD_ALL_HOST_TOOLS option
2026-02-05 17:07:47 +05:00 · 2026-02-04 12:42:46 +03:00 · 2026-02-04 11:56:44 +03:00 · 2026-02-04 11:56:21 +03:00 · 2026-02-03 19:28:07 +03:00 · 2026-02-03 19:19:08 +03:00
20 changed files with 234 additions and 147 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,8 +63,8 @@ env:
  G_PKG_DIR: ${{ github.event.inputs.package_dir }}
  REPO_URL: https://github.com/openwrt-xiaomi/openwrt
  REPO_LNK: openwrt-xiaomi/openwrt
-  REPO_BRANCH: xq-25.12
-  TAG_PREFIX: v25-
+  REPO_BRANCH: xq-24.10
+  TAG_PREFIX: v24-
  TZ: UTC
  DEVICE_NAME: unknown
  BUILD_DATE: unknown
@@ -244,10 +244,12 @@ jobs:
          rm -rf openwrt  

      - name: Init builder
+        env:
+          TOOLS_SRC_HASH: ${{ hashFiles('tools/**') }}
        run: |
          chmod +x *.sh
-          #wget https://github.com/fantastic-packages/packages/raw/refs/heads/master/keys/apksign/20241123170031.pub
-          wget https://fantastic-packages.github.io/releases/25.12/20241123170031.pub
+          wget https://github.com/fantastic-packages/packages/raw/refs/heads/24.10/keys/usign/53FF2B6672243D28.pub
+          echo "TOOLS_SRC_HASH=$TOOLS_SRC_HASH" >> $GITHUB_ENV

      - name: Update OpenWrt packages
        id: update
@@ -256,71 +258,10 @@ jobs:
          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
        if: steps.update.outputs.status == 'success'
-        env: 
+        env:
          TARGET: ${{ matrix.target }}
          FW_VER: ${{ needs.check.outputs.fw_ver }}
        run: |
@@ -357,6 +298,130 @@ jobs:
          cp -f .config logs/config1
          cp -f .config config1

+      - name: Prepare for host tools
+        id: tools_prepare
+        env: 
+          TARGET: ${{ matrix.target }}
+          USE_CACHE: ${{ github.event.inputs.use_cache }}
+          CACHE_VER: ${{ github.event.inputs.cache_ver }}
+        run: |
+          echo USE_CACHE = $USE_CACHE
+          HOST_TOOLS_STG_DIR=staging_dir/host
+          HOST_TOOLS_BLD_DIR=build_dir/host
+          rm -rf staging_dir/
+          rm -rf build_dir/
+          mkdir -p staging_dir/host
+          mkdir -p build_dir/host
+          #############################################
+          CONFIG_BUILD_ALL_HOST_TOOLS=n
+          if grep '^CONFIG_BUILD_ALL_HOST_TOOLS=y' $CFG ; then
+              CONFIG_BUILD_ALL_HOST_TOOLS=y
+          fi
+          ########### check tools Makefile ############
+          if [ "$CONFIG_BUILD_ALL_HOST_TOOLS" != y ]; then
+              if grep -q '(CONFIG_USES_MINOR),y) += yafut' tools/Makefile ; then
+                  echo WARN: file tools/Makefile allowed compile yafut
+                  echo ERROR: yafut compile not supported !!!
+                  exit 51
+              fi
+          fi
+          ########### get hash of dir with tools Makefiles ############
+          TOOLS_SRC_CRC=$( echo $TOOLS_SRC_HASH | cksum | awk '{print $1}' )
+          echo $TOOLS_SRC_CRC > logs/host_tools_sources.crc
+          echo "TOOLS_SRC_CRC=$TOOLS_SRC_CRC" >> $GITHUB_ENV
+          ########### get prereq tools (w/o compile) ############
+          ls -la $HOST_TOOLS_DIR/bin | awk '{print $9 " -> " $11}' | sort > $HOST_TOOLS_STG_DIR/.prereq-build-list
+          TOOLS_PREREQ_CRC=$( cat $HOST_TOOLS_STG_DIR/.prereq-build-list | cksum | awk '{print $1}' )
+          cp -f $HOST_TOOLS_STG_DIR/.prereq-build-list   logs/prereq-build-list.txt
+          echo "TOOLS_PREREQ_CRC=$TOOLS_PREREQ_CRC" >> $GITHUB_ENV
+          ########### patch for tools/Makefile ###############
+          cat <<'EOF' >> tools/Makefile
+          ###
+          ### patch for getinfo
+          ###
+          TOOLS_COMPILE_LIST := $(STAGING_DIR_HOST)/.tools_compile_list
+          define gen_tools_compile_list
+          	@echo "Generating $(TOOLS_COMPILE_LIST)"
+          	@mkdir -p $(STAGING_DIR_HOST)
+          	rm -f $(STAGING_DIR_HOST)/.tools_compile_*
+          	@{ \
+          		TOOLS_STATUS=""; \
+          		for tool in $(sort $(tools-y) $(tools-)); do \
+          			T_STATUS="n"; \
+          			if echo " $(tools-y) " | grep -q " $$tool " ; then T_STATUS="y"; printf "+"; else printf " "; fi; \
+          			TOOLS_STATUS="$${TOOLS_STATUS}$${T_STATUS}" ; \
+          			printf " %s\n" "$$tool"; \
+          		done; \
+          		printf "$$TOOLS_STATUS" > $(STAGING_DIR_HOST)/.tools_compile_mask; \
+          	} > $(TOOLS_COMPILE_LIST)
+          endef
+          
+          $(curdir)/getinfo: .config prereq
+          	$(call gen_tools_compile_list)
+          
+          $(curdir)/prepare: $(curdir)/getinfo
+          EOF
+          ########## end of patch tools/Makefile ############
+          make tools/getinfo
+          if [ ! -f $HOST_TOOLS_STG_DIR/.tools_compile_list ]; then
+              echo ERROR: File $HOST_TOOLS_STG_DIR/.tools_compile_list not found!
+              exit 55
+          fi
+          cp -f $HOST_TOOLS_STG_DIR/.tools_compile_list  logs/tools_compile_list.txt
+          TOOLS_COMPILE_CRC=$( cat $TOOLS_STG_DIR/.tools_compile_list | cksum | awk '{print $1}' )
+          echo "TOOLS_COMPILE_CRC=$TOOLS_COMPILE_CRC" >> $GITHUB_ENV
+          #######
+          TOOLS_COMPILE_MASK=$( cat $TOOLS_STG_DIR/.tools_compile_mask )
+          cp -f $HOST_TOOLS_STG_DIR/.tools_compile_mask  logs/tools_compile_mask.txt
+          touch logs/tools_compile_$TOOLS_COMPILE_MASK
+          echo TOOLS_COMPILE_MASK = $TOOLS_COMPILE_MASK
+          ###################################################
+          if [ "$USE_CACHE" = "true" ]; then
+              echo USE_CACHE = $USE_CACHE
+          fi
+          echo "USE_CACHE=$USE_CACHE" >> $GITHUB_ENV
+          echo "CACHE_VER=$CACHE_VER" >> $GITHUB_ENV
+          echo "HOST_TOOLS_STG_DIR=$HOST_TOOLS_STG_DIR" >> $GITHUB_ENV
+          echo "HOST_TOOLS_BLD_DIR=$HOST_TOOLS_BLD_DIR" >> $GITHUB_ENV
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Restore host tools from cache
+        id: tools_cache_restore
+        if: github.event.inputs.use_cache == 'true'
+        uses: actions/cache/restore@v4
+        with:
+          key: host-tools-${{ env.CACHE_VER }}-${{ env.TOOLS_SRC_CRC }}-${{ env.TOOLS_PREREQ_CRC }}-${{ env.TOOLS_COMPILE_CRC }}
+          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 $HOST_TOOLS_STG_DIR/.prepared
+          touch $HOST_TOOLS_STG_DIR/.prereq-build
+          touch $HOST_TOOLS_STG_DIR/stamp/.* 2>/dev/null
+          find  $HOST_TOOLS_BLD_DIR -name ".prepared*"  -exec touch {} +
+          find  $HOST_TOOLS_BLD_DIR -name ".configured" -exec touch {} +
+          find  $HOST_TOOLS_BLD_DIR -name ".built"      -exec touch {} +
+
+      - name: Inspect restored host tools
+        if: github.event.inputs.use_cache == 'true'
+        run: |
+          echo "====== openwrt-native.txt ======"
+          cat $HOST_TOOLS_BLD_DIR/pkgconf-*/openwrt-native.txt || true
+          echo "====== staging_dir/host ====="
+          du -sh $HOST_TOOLS_STG_DIR || true
+          ls -la $HOST_TOOLS_STG_DIR || true
+          echo "====== staging_dir/host/bin ====="
+          du -sh $HOST_TOOLS_STG_DIR/bin || true
+          ls -1  $HOST_TOOLS_STG_DIR/bin | head -20 || true
+          echo "====== build_dir/host ======="
+          du -sh $HOST_TOOLS_BLD_DIR || true
+          ls -1  $HOST_TOOLS_BLD_DIR | head -20 || true
+          echo "====== path info ========"
+          grep -R "/home/runner" $HOST_TOOLS_BLD_DIR | head
+
      - name: Monitor memory
        run: |
          echo "CPU cores = $(nproc)"
@@ -375,16 +440,6 @@ jobs:
          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' && env.FAKE_BUILD != 'true' }}
@@ -397,22 +452,29 @@ jobs:
        if: steps.tools.outputs.status == 'success'
        uses: actions/cache/save@v4
        with:
-          key: host-tools-${{ env.CACHE_VER }}-${{ env.CACHE_ARCH }}-${{ hashFiles('tools/**') }}
+          key: host-tools-${{ env.CACHE_VER }}-${{ env.TOOLS_SRC_CRC }}-${{ env.TOOLS_PREREQ_CRC }}-${{ env.TOOLS_COMPILE_CRC }}
          path: |
            staging_dir/host
            build_dir/host

+      - name: Show host tools stamps
+        run: |
+          ls -la staging_dir/host/stamp/
+          ls -la staging_dir/host/stamp/ > logs/host_stamp_dir.txt
+
      - name: Configure 2
        id: configure2
        if: steps.tools.outputs.status == 'success'
        env: 
          TARGET: ${{ matrix.target }}
        run: |
+          rm -rf logs_backup/
+          cp -a logs logs_backup
          make clean
+          rm -rf logs
+          cp -a logs_backup logs
          ./xmake.sh $OPT_INITRAMFS -I -t $TARGET
-          mkdir -p logs
          cp -f .config logs/config2
-          [ -f config1 ] && cp -f config1 logs/config1

      - name: Kernel compile
        id: kernel
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Github All Releases](https://img.shields.io/github/downloads/openwrt-xiaomi/builder/total.svg)](https://github.com/openwrt-xiaomi/builder/releases)
+[![Github Latest Release](https://img.shields.io/github/downloads/openwrt-xiaomi/builder/latest/total.svg)](https://github.com/openwrt-xiaomi/builder/releases)
 [![ViewCount](https://views.whatilearened.today/views/github/openwrt-xiaomi/builder.svg)](https://github.com/openwrt-xiaomi/builder/releases)
-[![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Fopenwrt-xiaomi%2Fbuilder&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://github.com/openwrt-xiaomi/builder/releases)
 [![Donations Page](https://github.com/andry81-cache/gh-content-static-cache/raw/master/common/badges/donate/donate.svg)](https://github.com/remittor/donate)

 # OpenWrt builder
--- a/_cfginc/_base.config
+++ b/_cfginc/_base.config
@@ -123,6 +123,7 @@ CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_luci-proto-relay=y

 ### Luci proto
+CONFIG_PACKAGE_luci-proto-gre=y
 CONFIG_PACKAGE_luci-proto-3g=y
 CONFIG_PACKAGE_luci-proto-ipv6=y

--- a/_initramfs/rt-ax52_initramfs.config
+++ b/_initramfs/rt-ax52_initramfs.config
--- a/_initramfs/rt-ax57m_initramfs.config
+++ b/_initramfs/rt-ax57m_initramfs.config
--- a/_initramfs/rt-ax59u_initramfs.config
+++ b/_initramfs/rt-ax59u_initramfs.config
--- a/_initramfs/rt-ax89x_initramfs.config
+++ b/_initramfs/rt-ax89x_initramfs.config
--- a/_initramfs/tuf-ax4200_initramfs.config
+++ b/_initramfs/tuf-ax4200_initramfs.config
--- a/_initramfs/tuf-ax6000_initramfs.config
+++ b/_initramfs/tuf-ax6000_initramfs.config
--- a/_initramfs/zen-bt8_initramfs.config
+++ b/_initramfs/zen-bt8_initramfs.config
--- a/r3d.config
+++ b/r3d.config
@@ -16,7 +16,6 @@ CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=y

 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y
-CONFIG_PACKAGE_lm-sensors-detect=y
 CONFIG_PACKAGE_alpine-fan-control=y
 CONFIG_PACKAGE_luci-app-alpine-fan-control=y
 CONFIG_PACKAGE_luci-app-temp-status=y
--- a/rt-ax52.config
+++ b/rt-ax52.config
@@ -11,7 +11,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax52=y

 ### 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

--- a/rt-ax57m.config
+++ b/rt-ax57m.config
@@ -11,7 +11,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax57m=y

 ### 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

--- a/rt-ax59u.config
+++ b/rt-ax59u.config
@@ -14,7 +14,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax59u=y

 ### 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
--- a/rt-ax89x.config
+++ b/rt-ax89x.config
@@ -16,7 +16,6 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y

 ### 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
--- a/tuf-ax4200.config
+++ b/tuf-ax4200.config
@@ -14,7 +14,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200=y

 ### 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
--- a/tuf-ax4200q.config
+++ b/tuf-ax4200q.config
@@ -14,7 +14,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200q=y

 ### 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
@@ -40,3 +39,5 @@ CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m

+CONFIG_PACKAGE_fantastic-feeds=m
+
--- a/tuf-ax6000.config
+++ b/tuf-ax6000.config
@@ -14,7 +14,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax6000=y

 ### 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
--- a/xmake.sh
+++ b/xmake.sh
@@ -101,28 +101,74 @@ function build_target {
 		echo "CONFIG_TESTING_KERNEL=y" >> $CFG
 	fi

+	X_VERSION_MK=$XDIR/include/version.mk
+	X_VERSION_NUMBER=$( grep -o -P '(?<=,\$\(VERSION_NUMBER\),).*(?=\))' $X_VERSION_MK 2>/dev/null )
+	[ -z "$X_VERSION_NUMBER" ] && { echo "ERROR: Cannot determine VERSION_NUMBER"; exit 30; }
+	echo "VERSION_NUMBER = $X_VERSION_NUMBER"
+
+	X_BOARD_NAME=$( sed -n 's/^CONFIG_TARGET_\([^_=\n]\+\)=y$/\1/p' $CFG )
+	[ -z "$X_BOARD_NAME" ] && { echo "ERROR: cannot found BOARD_NAME"; exit 31; }
+	X_SUBTARGET_NAME=$( sed -n 's/^CONFIG_TARGET_[^_=\n]\+_\([^_=\n]\+\)=y$/\1/p' $CFG )
+	[ -z "$X_SUBTARGET_NAME" ] && { echo "ERROR: cannot found SUBTARGET"; exit 31; }
+	echo "BOARD_NAME = $X_BOARD_NAME   SUBTARGET = $X_SUBTARGET_NAME"
+	
+	VERMAGIC_FN=$XDIR/vermagic-$X_BOARD_NAME-$X_SUBTARGET_NAME-$X_VERSION_NUMBER.list
+	if [ ! -f $VERMAGIC_FN -a -f $XDIR/vermagic_update.sh ]; then
+		bash $XDIR/vermagic_update.sh $X_BOARD_NAME $X_SUBTARGET_NAME
+		if [ ! -f $VERMAGIC_FN ]; then
+			echo "ERROR: cannot create file $VERMAGIC_FN"
+			exit 41
+		fi 
+	fi
+
 	if [ 1 = 1 ]; then
+		MK_IMAGE=$XDIR/include/image.mk
 		CURDATE=$( date --utc +%y%m%d )
-		############ 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 !!!"
+		if ! grep -q "(VERSION_NUMBER))-$CURDATE" $MK_IMAGE ; then
+			############ 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' $MK_IMAGE
+			echo ">>> image.mk patched !!! (IMG_PREFIX)"
+		fi
 	fi
 	if [ 1 = 1 ]; then
 		############ remove "squashfs" suffix ############
-		#   DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2)
-		sed -i -e 's/.*DEVICE_IMG_NAME =.*/  DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(2)/g' $XDIR/include/image.mk
-		if grep "squashfs-sys" $XDIR/target/linux/mediatek/image/filogic.mk >/dev/null ; then
+		MK_IMAGE=$XDIR/include/image.mk
+		if grep -q 'DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2)' $MK_IMAGE ; then
+			sed -i -e 's/.*DEVICE_IMG_NAME =.*/  DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(2)/g' $MK_IMAGE
+			echo ">>> image.mk patched !!! (DEVICE_IMG_NAME)"
+		fi
+		if grep -q "squashfs-sys" $XDIR/target/linux/mediatek/image/filogic.mk ; then
 			sed -i 's/ squashfs-sys/ sys/g' $XDIR/target/linux/mediatek/image/filogic.mk
 			sed -i 's/ squashfs-sys/ sys/g' $XDIR/target/linux/mediatek/image/mt7622.mk
 			sed -i 's/ squashfs-sys/ sys/g' $XDIR/target/linux/mediatek/image/mt7623.mk
 		fi
-	fi	
+	fi
+	
+	if ! grep '^CONFIG_BUILD_ALL_HOST_TOOLS=y' $CFG ; then
+		MK_HOST_TOOLS=$XDIR/tools/Makefile
+		# tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USES_MINOR),y) += yafut
+		if grep -q '(CONFIG_USES_MINOR),y)' $MK_HOST_TOOLS ; then
+			# disable build yafut - not support devices with yaffs !!!
+			sed -i 's/\$(CONFIG_USES_MINOR),y)/,y)/g' $MK_HOST_TOOLS
+			echo ">>> tools/Makefile patched !!! (disable yafut)"
+		fi
+	fi
+
+	BATADV_DIR=$XDIR/feeds/luci/protocols/luci-proto-batman-adv/htdocs/luci-static/resources/protocol
+	if [ -d $BATADV_DIR ]; then
+		if [ ! -f $BATADV_DIR/batadv_vlan.js ]; then
+			BATADV_VLAN_URL="https://github.com/luminem/luci/raw/4e0612a45e4be8c58de2bbd21c3bffbcf5252be4/protocols/luci-proto-batman-adv/htdocs/luci-static/resources/protocol/batadv_vlan.js"
+			curl -sSL "$BATADV_VLAN_URL" -o "$BATADV_DIR/batadv_vlan.js"
+			echo ">>> batman_adv patched !!!"
+		fi
+	fi
 	
 	RAB_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile
 	if [ -f $RAB_LUCI_MK ]; then
 		if ! grep "PKG_PROVIDES" $RAB_LUCI_MK >/dev/null ; then
 			sed -i 's/LUCI_PKGARCH:=all/LUCI_PKGARCH:=all\nPKG_PROVIDES:=luci-app-ruantiblock/g' $RAB_LUCI_MK
+			echo ">>> ruantiblock patched !!!"
 		fi
 	fi

@@ -167,42 +213,28 @@ function build_target {
 		[ "$PODKOP_PATCH" != "" ] && echo ">>> podkop patched !!! $PODKOP_PATCH"
 	fi

-	DROPBEAR_DIR=$XDIR/package/network/services/dropbear
-	DROPBEAR_MK=$DROPBEAR_DIR/Makefile
-	TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
-	TMP_DROPBEAR_MK=$TMP_DROPBEAR_DIR/Makefile
+	DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
 	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
-	fi
-	if [ -f $TMP_DROPBEAR_MK ] && ! grep -q 'PKG_RELEASE:=0' $TMP_DROPBEAR_MK ; then
 		# patch: Disable MODERN and enable RSA/DH-SHA1
-		sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $TMP_DROPBEAR_MK
-		sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $TMP_DROPBEAR_MK
-		sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $TMP_DROPBEAR_MK
-		sed -i 's/ CONFIG_DROPBEAR_MODERN_ONLY/ /g' $TMP_DROPBEAR_MK
-		sed -i 's/DROPBEAR_DH_GROUP14_SHA1,0/ /g' $TMP_DROPBEAR_MK
-		sed -i 's/DROPBEAR_SHA1_HMAC,0/ /g' $TMP_DROPBEAR_MK
+		sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
+		sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
+		sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
+		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
-	if [ -f $DROPBEAR_MK ]  && [ -f $TMP_DROPBEAR_MK ] && ! cmp -s $DROPBEAR_MK $TMP_DROPBEAR_MK ; then
-		# downgrade dropbear to 2024.86 (OpenWrt v24.10)
-		rm -rf $DROPBEAR_DIR/*
-		cp -a $TMP_DROPBEAR_DIR/. $DROPBEAR_DIR/
-		echo ">>> dropbear downgraded to 2024.86 !!!"
-	fi
+
+	HOST_TOOLS_DIR=$XDIR/staging_dir/host
+	HOST_TOOLS_STAGE=0
+	[ -d $HOST_TOOLS_DIR ] && HOST_TOOLS_STAGE=1

 	make defconfig
+	
+	if [ -d $HOST_TOOLS_DIR -a $HOST_TOOLS_STAGE = 0 ]; then
+		ls -la $HOST_TOOLS_DIR/bin | awk '{print $9 " -> " $11}' | sort > $HOST_TOOLS_DIR/.prereq-build-list
+		#cat $HOST_TOOLS_DIR/.prereq-build-list | cksum | awk '{print $1}' > $HOST_TOOLS_DIR/.prereq-build-list.crc
+	fi

 	NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )
 	if [ "$NSS_DRV_PPPOE_ENABLE" = y ]; then
@@ -312,32 +344,31 @@ function build_target {
 		echo "Patch '$(basename $incfn)' result: OK"
 	done
 	
-	APK_DIR=$XDIR/files/etc/apk
-	if [ -d $APK_DIR ]; then
-		rm -rf $APK_DIR
+	OPKG_DIR=$XDIR/files/etc/opkg
+	if [ -d $OPKG_DIR ]; then
+		rm -rf $OPKG_DIR
 	fi
-	FANT_PKG_KEY=$XDIR/20241123170031.pub
+	FANT_PKG_KEY=$XDIR/53FF2B6672243D28.pub
 	if [ -f $FANT_PKG_KEY ]; then
-		APK_SRC_DIR=$XDIR/package/system/apk/files
-		APK_KEYS_DIR=$APK_DIR/keys
-		mkdir -p $APK_KEYS_DIR
-		cp $FANT_PKG_KEY $APK_KEYS_DIR/fantastic-packages-20241123170031.pem
-		APK_CFEED_FN=$APK_DIR/repositories.d/customfeeds.list
-		mkdir -p $APK_DIR/repositories.d
-		cp $APK_SRC_DIR/customfeeds.list $APK_CFEED_FN
-		PKG_LINK="https://fantastic-packages.github.io/releases/<<VER>>/packages/<<ARCH>>"
-		echo "" >> $APK_CFEED_FN
-		echo "$PKG_LINK/luci/packages.adb"      >> $APK_CFEED_FN
-		echo "$PKG_LINK/packages/packages.adb"  >> $APK_CFEED_FN
-		echo "$PKG_LINK/special/packages.adb"   >> $APK_CFEED_FN
+		OPKG_SRC_DIR=$XDIR/package/system/opkg/files
+		OPKG_KEYS_DIR=$OPKG_DIR/keys
+		mkdir -p $OPKG_KEYS_DIR
+		cp $FANT_PKG_KEY $OPKG_KEYS_DIR/53ff2b6672243d28
+		OPKG_CFEED_FN=$OPKG_DIR/customfeeds.conf
+		cp $OPKG_SRC_DIR/customfeeds.conf $OPKG_CFEED_FN
+		PKG_LINK="https://fantastic-packages.github.io/packages/releases/<<VER>>/packages/<<ARCH>>"
+		echo "" >> $OPKG_CFEED_FN
+		echo "src/gz  fantastic_packages_luci      $PKG_LINK/luci"      >> $OPKG_CFEED_FN
+		echo "src/gz  fantastic_packages_packages  $PKG_LINK/packages"  >> $OPKG_CFEED_FN
+		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>>/25.12/g" $APK_CFEED_FN
-		sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $APK_CFEED_FN
-		logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/releases]"
+		sed -i "s/<<VER>>/24.10/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 $APK_DIR/repositories.d/customfeeds.list
+		rm -f $OPKG_DIR/customfeeds.conf
 	fi

 	SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf
--- a/zen-bt8.config
+++ b/zen-bt8.config
@@ -16,7 +16,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y

 ### 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
Author	SHA1	Message	Date
remittor	4be0aa94a4	xmake: Always try create vermagic-*.list file	2026-02-04 12:42:46 +03:00
remittor	c86f52cdb4	xmake: Add check for CONFIG_BUILD_ALL_HOST_TOOLS option	2026-02-04 11:56:44 +03:00
remittor	e7b3d9673d	build: Add check for CONFIG_BUILD_ALL_HOST_TOOLS option	2026-02-04 11:56:21 +03:00
remittor	ebd2e371f2	build: Add step "Prepare for host tools" and rewrite cache for tools	2026-02-03 19:28:07 +03:00
remittor	d03288513f	xmake: Add patch for tools/Makefile which disable yafut	2026-02-03 19:19:08 +03:00
remittor	f4480242f8	build: Add step "Show host tools stamps"	2026-02-02 17:09:45 +03:00
remittor	80aca373ac	config: Remove package lm-sensors-detect Depends on perl and libperl.so	2026-02-02 17:08:48 +03:00
remittor	56dad16b45	xmake: Add patch for BatMan Adv proto	2026-01-29 12:07:32 +03:00
remittor	a71f68d967	readme: Fix badges	2026-01-21 12:16:51 +03:00
remittor	5b6e495bc8	build: Fix step "Upload assets"	2026-01-20 17:23:19 +03:00
remittor	e4a6502e6f	build: Add support TRX-images	2026-01-20 15:18:56 +03:00
remittor	8c4beac735	base: Add lscpu and bind-tools	2026-01-17 11:21:33 +03:00
remittor	ac0bf84ce1	xmake: Fix patches for podkop	2026-01-10 09:16:06 +03:00
remittor	488be8d6d1	Add support Asus TUF-AX4200q	2026-01-08 17:05:22 +03:00
remittor	0babf26e52	Fix for use new directories	2026-01-08 16:47:23 +03:00
remittor	0aeee17021	Rename base directories	2026-01-08 14:25:42 +03:00
remittor	0fc5ed4afe	config: Rename config files	2026-01-08 14:22:13 +03:00
remittor	1380b0c663	xmake: Add extended log messages	2026-01-07 11:43:05 +03:00
remittor	ff59b05218	build: Sync code with v25 branch	2026-01-07 11:42:26 +03:00
remittor	7afa0202ba	build: Sync code with v25 branch	2026-01-01 22:30:18 +03:00
remittor	ce52956483	proxy: Delete tpws, mdig, ip2set packages	2026-01-01 17:05:28 +03:00
remittor	a1f00666d4	build: Sync code with v25 branch	2026-01-01 16:49:44 +03:00
remittor	c056d7f32a	build: Fix key of cache	2026-01-01 13:37:29 +03:00
remittor	4cf85c12bf	build: Sync code with v25 branch	2026-01-01 11:50:35 +03:00
remittor	88a9ebe300	build: Add step "Monitor memory"	2025-12-31 18:55:52 +03:00
remittor	757b9b3676	build: Sync code with v25 branch	2025-12-31 18:53:05 +03:00
remittor	fc2ca4f2de	addons: Fix download zapret2 packages	2025-12-27 17:51:34 +03:00
remittor	abdae49448	addons: Update sources for packages	2025-12-26 17:03:39 +03:00