build: Fix directory name into "Prepare for host tools"

Depends on perl and libperl.so

.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-24.10
-  TAG_PREFIX: v24-
+  REPO_BRANCH: xq-25.12
+  TAG_PREFIX: v25-
   TZ: UTC
   DEVICE_NAME: unknown
   BUILD_DATE: unknown
@@ -248,7 +248,8 @@ jobs:
           TOOLS_SRC_HASH: ${{ hashFiles('tools/**') }}
         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/master/keys/apksign/20241123170031.pub
+          wget https://fantastic-packages.github.io/releases/25.12/20241123170031.pub
           echo "TOOLS_SRC_HASH=$TOOLS_SRC_HASH" >> $GITHUB_ENV
 
       - name: Update OpenWrt packages
@@ -261,7 +262,7 @@ jobs:
       - name: Configure
         id: configure
         if: steps.update.outputs.status == 'success'
-        env:
+        env: 
           TARGET: ${{ matrix.target }}
           FW_VER: ${{ needs.check.outputs.fw_ver }}
         run: |
@@ -281,9 +282,6 @@ jobs:
           if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
               exit 41
           fi
-          echo "::group::disabled_services.lst"
-          cat disabled_services.lst || echo '<<< file disabled_services.lst not found >>>'
-          echo "::endgroup::"
           FILE_DATE=$(date --utc +'%y%m%d')
           echo "status=success" >> $GITHUB_OUTPUT
           echo "FW_VER=$FW_VER" >> $GITHUB_ENV
@@ -311,6 +309,7 @@ jobs:
           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
@@ -332,13 +331,10 @@ jobs:
           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_STG_DIR/bin | awk '{print $9 " -> " $11}' | sort > $HOST_TOOLS_STG_DIR/.prereq-build-list
+          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
-          echo "::group::prereq-build-list"
-          cat $HOST_TOOLS_STG_DIR/.prereq-build-list
-          echo "::endgroup::"
           ########### patch for tools/Makefile ###############
           cat <<'EOF' >> tools/Makefile
           ###
@@ -375,9 +371,6 @@ jobs:
           cp -f $HOST_TOOLS_STG_DIR/.tools_compile_list  logs/tools_compile_list.txt
           TOOLS_COMPILE_CRC=$( cat $HOST_TOOLS_STG_DIR/.tools_compile_list | cksum | awk '{print $1}' )
           echo "TOOLS_COMPILE_CRC=$TOOLS_COMPILE_CRC" >> $GITHUB_ENV
-          echo "::group::tools_compile_list"
-          cat $HOST_TOOLS_STG_DIR/.tools_compile_list
-          echo "::endgroup::"
           #######
           TOOLS_COMPILE_MASK=$( cat $HOST_TOOLS_STG_DIR/.tools_compile_mask )
           cp -f $HOST_TOOLS_STG_DIR/.tools_compile_mask  logs/tools_compile_mask.txt
@@ -467,10 +460,8 @@ jobs:
 
       - name: Show host tools stamps
         run: |
-          if [ -d staging_dir/host/stamp ]; then
-              ls -la staging_dir/host/stamp/
-              ls -la staging_dir/host/stamp/ > logs/host_stamp_dir.txt
-          fi
+          ls -la staging_dir/host/stamp/
+          ls -la staging_dir/host/stamp/ > logs/host_stamp_dir.txt
 
       - name: Configure 2
         id: configure2
@@ -485,9 +476,6 @@ jobs:
           cp -a logs_backup logs
           ./xmake.sh $OPT_INITRAMFS -I -t $TARGET
           cp -f .config logs/config2
-          echo "::group::disabled_services.lst"
-          cat disabled_services.lst || echo '<<< file disabled_services.lst not found >>>'
-          echo "::endgroup::"
 
       - name: Kernel compile
         id: kernel
@@ -527,7 +515,7 @@ jobs:
               fi
           fi
           echo "status=success" >> $GITHUB_OUTPUT
-
+          
       - name: Process out results
         id: install
         if: steps.compile.outputs.status == 'success' || env.FAKE_BUILD == 'true'
@@ -588,37 +576,6 @@ jobs:
           echo "BLD_VER=$FW_VER" >> $GITHUB_ENV
           echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
 
-      - name: Build the TRX image without WiFi activation
-        id: compile_wifi_dis
-        if: steps.install.outputs.status == 'success' && env.TRX_BUILD == 'true' && env.FAKE_BUILD != 'true' && env.TEST_BUILD != 'true'
-        env: 
-          TARGET: ${{ matrix.target }}
-        run: |
-          BLD_OUT_DIR=$OUT_DIR
-          NEW_OUT_DIR=$GITHUB_WORKSPACE/xout
-          mv -f "$OUT_DIR" $NEW_OUT_DIR
-          echo "OUT_DIR=$NEW_OUT_DIR" >> $GITHUB_ENV
-          ./xmake.sh -W -i -t $TARGET
-          if [ ! -d "$BLD_OUT_DIR" ]; then
-              echo "OUT_DIR not found!"
-              exit 99
-          fi
-          cd "$BLD_OUT_DIR"
-          echo "Firmware TRX $BLD_VER [$FILE_DATE] builded!"
-          if [ ! -f kernel-debug.tar.zst ]; then
-              echo "File kernel-debug.tar.zst not found!"
-              exit 100
-          fi
-          find . -maxdepth 1 -type f ! -name '*-initramfs*' -delete
-          VER_MAJOR=$( echo "$BLD_VER" | cut -d. -f1 )
-          WIFIDIS_DIR=$NEW_OUT_DIR/images-WiFi-disabled
-          mkdir -p $WIFIDIS_DIR
-          STD_IMG_DIR="$WIFIDIS_DIR/openwrt-initramfs-bin-for-luci"
-          mkdir -p $STD_IMG_DIR
-          find . -maxdepth 1 -type f -name '*-initramfs*.bin' -exec mv -f {} $STD_IMG_DIR/openwrt-${VER_MAJOR}_${TARGET}_initramfs_nowifi.bin \;
-          find . -maxdepth 1 -type f -name '*-initramfs*.trx' -exec mv -f {} $WIFIDIS_DIR/openwrt-${VER_MAJOR}_${TARGET}_initramfs_nowifi.trx \;
-          echo "status=success" >> $GITHUB_OUTPUT
-
       - name: Check space usage
         run: df -hT
 

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

tuf-ax4200q.config

@@ -39,5 +39,3 @@ CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-CONFIG_PACKAGE_fantastic-feeds=m
-

xmake.sh

@@ -116,7 +116,7 @@ function build_target {
 	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 ] && [ -f $XDIR/vermagic_update.sh ]; then
+	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"
@@ -216,17 +216,40 @@ function build_target {
 		[ "$PODKOP_PATCH" != "" ] && echo ">>> podkop patched !!! $PODKOP_PATCH"
 	fi
 
-	DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
+	DROPBEAR_DIR=$XDIR/package/network/services/dropbear
+	DROPBEAR_MK=$DROPBEAR_DIR/Makefile
+	TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
+	TMP_DROPBEAR_MK=$TMP_DROPBEAR_DIR/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' $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
+		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
 		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
@@ -347,31 +370,32 @@ function build_target {
 		echo "Patch '$(basename $incfn)' result: OK"
 	done
 	
-	OPKG_DIR=$XDIR/files/etc/opkg
-	if [ -d $OPKG_DIR ]; then
-		rm -rf $OPKG_DIR
+	APK_DIR=$XDIR/files/etc/apk
+	if [ -d $APK_DIR ]; then
+		rm -rf $APK_DIR
 	fi
-	FANT_PKG_KEY=$XDIR/53FF2B6672243D28.pub
+	FANT_PKG_KEY=$XDIR/20241123170031.pub
 	if [ -f $FANT_PKG_KEY ]; then
-		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
+		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
 		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/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
-		logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
+		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]"
 	fi
 	if [ $BUILD_ONLY_INITRAMFS = true ]; then
-		rm -f $OPKG_DIR/customfeeds.conf
+		rm -f $APK_DIR/repositories.d/customfeeds.list
 	fi
 
 	SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf