fix 2

.github/workflows/build.yml

@@ -3,6 +3,19 @@ name: build
 on:
   workflow_dispatch:
     inputs:
+      test_build:
+        description: 'Test build'
+        required: true
+        default: 'false'
+        type: choice
+        options:
+        - true
+        - false
+      target_name:
+        description: 'Target Name'
+        required: false
+        default: 'r3d'
+        type: string
       fake_build:
         description: 'Fake build'
         required: true
@@ -18,11 +31,14 @@ on:
         type: string
 
 env:
-  FAKE_BUILD: ${{ github.event.inputs.fake_build }}
+  TEST_BUILD: ${{ github.event.inputs.test_build == 'true' }}
+  TARGET_NAME: ${{ github.event.inputs.target_name }}
+  FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
+  TAG_SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || github.event.inputs.test_build == 'true' && '-test' || '' }}
   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-
   BUILD_ROOT: ${{ github.workspace }}/openwrt
   DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
   TZ: UTC
@@ -45,6 +61,9 @@ jobs:
       fw_date: ${{ steps.gh.outputs.fw_date }}
       fw_ver: ${{ steps.gh.outputs.fw_ver }}
       is_active: ${{ steps.activity.outputs.is_active }}
+      test_build: ${{ env.TEST_BUILD }}
+      target_name: ${{ env.TARGET_NAME }}
+      fake_build: ${{ env.FAKE_BUILD }}
     steps:
       - name: Get repo data via GH API
         id: gh
@@ -124,6 +143,12 @@ jobs:
           - tuf_ax4200
           - tuf_ax6000
           - zen-bt8
+        isTest:
+          - ${{ needs.check.outputs.test_build == 'true' }}
+        exclude:
+          - { isTest: true }
+        include:
+          - target: ${{ github.event.inputs.target_name }}
     steps:
       - name: Initialization environment
         env:
@@ -159,7 +184,7 @@ jobs:
           rsync -avq --exclude=".*" --exclude="$(basename $BUILD_ROOT)" $BLDROOT/ $BUILD_ROOT/
           cd $BUILD_ROOT
           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: Update OpenWrt packages
         id: update
@@ -193,7 +218,13 @@ jobs:
               exit 41
           fi
           # run build
-          [ "$FAKE_BUILD" != "true" ] && make -j $MAKE_JOBS download world
+          if [ "$FAKE_BUILD" != "true" ]; then
+              if [ "$TEST_BUILD" != "true" ]; then
+                  make -j $MAKE_JOBS download world
+              else
+                  make V=sc download world
+              fi
+          fi
           # process results
           FILE_DATE=$(date --utc +'%y%m%d')
           OUT_DIR=$BUILD_ROOT/bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
@@ -291,8 +322,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG: ${{ needs.check.outputs.tag }}
         with:
-          prerelease: false
+          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
-          tag_name: ${{ needs.check.outputs.tag }}
+          tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
           name: '${{ needs.check.outputs.tag }}'
           body: |
             OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]

_addons.config

@@ -13,16 +13,16 @@ CONFIG_FEED__alpine_fan_control=m
 #GIT_PACKAGE luci-app-temp-status=https://github.com/openwrt-xiaomi/luci-app-temp-status.git master
 
 ### luci-app-disks-info
-#GIT_PACKAGE luci-app-disks-info=https://github.com/openwrt-xiaomi/luci-app-disks-info.git master
+#GIT_PACKAGE luci-app-disks-info=https://github.com/gSpotx2f/luci-app-disks-info.git master
 
 ### luci-app-diskman
-#GIT_PACKAGE luci-app-diskman=https://github.com/openwrt-xiaomi/luci-app-diskman.git master
+#GIT_PACKAGE luci-app-diskman=https://github.com/lisaac/luci-app-diskman.git master
 
 ### luci-theme-argon
-#GIT_PACKAGE luci-theme-argon=https://github.com/openwrt-xiaomi/luci-theme-argon.git master
+#GIT_PACKAGE luci-theme-argon=https://github.com/jerrykuku/luci-theme-argon.git master
 
 ### luci-app-argon-config
-#GIT_PACKAGE luci-app-argon-config=https://github.com/openwrt-xiaomi/luci-app-argon-config.git master
+#GIT_PACKAGE luci-app-argon-config=https://github.com/jerrykuku/luci-app-argon-config.git master
 
 ### luci-app-tn-netports
 #GIT_PACKAGE luci-app-tn-netports=https://github.com/openwrt-xiaomi/luci-app-tn-netports.git master
@@ -46,9 +46,9 @@ CONFIG_FEED__alpine_fan_control=m
 CONFIG_FEED__amneziawg=m
 
 ### Zapret
-#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git zap1
+#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git;zap1
 CONFIG_FEED__zapret=m
-#GIT_FEED _zapret2=https://github.com/remittor/zapret-openwrt.git master
+#GIT_FEED _zapret2=https://github.com/remittor/zapret-openwrt.git;master
 CONFIG_FEED__zapret2=m
 
 ### ruantiblock

xmake.sh

@@ -144,8 +144,29 @@ function build_target {
 		sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
 	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
 		sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
@@ -280,7 +301,7 @@ 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