xmake: Fix dropbear downgrade

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
       use_cache:
         description: 'Restore cache for host tools'
         required: true
-        default: 'false'
+        default: 'true'
         type: choice
         options:
         - true
@@ -176,7 +176,7 @@ jobs:
           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  gettext git libncurses5-dev libssl-dev python3-setuptools
-          sudo apt-get -qq install  libc6-dev pkg-config
+          sudo apt-get -qq install  libc6-dev pkg-config squashfs-tools
           sudo apt-get -qq autoremove --purge
           sudo apt-get -qq clean
           sudo timedatectl set-timezone "$TZ"
@@ -388,21 +388,6 @@ jobs:
           make target/linux/compile -j$(nproc)
           echo "status=success" >> $GITHUB_OUTPUT
 
-      - name: <<< TEST compile >>>
-        if: false # ${{ steps.kernel.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
-        run: |
-          make buildinfo
-          echo "====== package/utils/lua/host/compile"
-          make package/utils/lua/host/compile
-          echo "====== package/system/apk/host/compile"
-          make package/system/apk/host/compile 
-          cp -f .config logs/config3
-          echo "====== package/feeds/packages/mdio-netlink"
-          make package/feeds/packages/mdio-netlink/compile V=sc
-          # exit 78
-          # make package/feeds/packages/mdio-netlink/compile V=s --debug=j
-          # make package/feeds/packages/mdio-netlink/compile V=sc
-
       - name: Monitor memory 2
         run: |
           echo "Memory and swap:"
@@ -554,7 +539,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG: ${{ needs.check.outputs.tag }}
         with:
-          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
+          prerelease: true
           tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
           name: '${{ needs.check.outputs.tag }}'
           body: |

xmake.sh

@@ -108,6 +108,7 @@ 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 ############
@@ -142,10 +143,13 @@ function build_target {
 	PODKOP_SH=$XDIR/package/feeds/_podkop/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
+		echo ">>> podkop patched !!!"
 	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
 	if [ -f $DROPBEAR_MK ]; then
 		# download dropbear 2024.86 (OpenWrt v24.10)
 		if [ ! -f $TMP_DROPBEAR_DIR/Makefile ]; then
@@ -159,20 +163,22 @@ function build_target {
 			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/
+	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
 
 	make defconfig