build: Add make tools and toolchain

build: Add option PACKAGE_DIR
build: Add configure step
2025-12-30 10:33:38 +05:00 · 2025-12-30 08:33:09 +03:00 · 2025-12-30 08:17:47 +03:00 · 2025-12-29 19:22:58 +03:00 · 2025-12-29 12:53:00 +03:00 · 2025-12-28 11:28:07 +03:00
3 changed files with 105 additions and 24 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,24 @@ 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
+      package_dir:
+        description: 'Package Dir'
+        required: false
+        default: ''
+        type: string
      fake_build:
        description: 'Fake build'
        required: true
@@ -18,11 +36,15 @@ on:
        type: string

 env:
-  FAKE_BUILD: ${{ github.event.inputs.fake_build }}
+  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 }}
+  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
-  TAG_PREFIX: v24-
+  REPO_BRANCH: xq-25.12
+  TAG_PREFIX: v25-
  BUILD_ROOT: ${{ github.workspace }}/openwrt
  DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
  TZ: UTC
@@ -45,6 +67,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 +149,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 +190,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
@@ -167,17 +198,15 @@ jobs:
          cd $BUILD_ROOT && ./xupdate.sh -f
          echo "status=success" >> $GITHUB_OUTPUT

-      - name: Build the firmware image
-        id: compile
+      - name: Configure
+        id: configure
        if: steps.update.outputs.status == 'success'
        env: 
          TARGET: ${{ matrix.target }}
          FW_VER: ${{ needs.check.outputs.fw_ver }}
        run: |
-          cd $BUILD_ROOT
-          MAKE_JOBS=$(($(nproc)+1))
-          echo "$MAKE_JOBS thread compile"
-          # init build config
+          cd $BUILD_ROOT && echo "init build config"
+          FILE_DATE=$(date --utc +'%y%m%d')
          ./xmake.sh -I -t $TARGET
          G_DEVICE_NAME=$( grep -so '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' )
          [ -z "$G_DEVICE_NAME" ] && exit 31
@@ -192,10 +221,42 @@ jobs:
          if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
              exit 41
          fi
-          # run build
-          [ "$FAKE_BUILD" != "true" ] && make -j $MAKE_JOBS download world
+          echo "status=success" >> $GITHUB_OUTPUT
+          echo "G_DEVICE_NAME=$G_DEVICE_NAME" >> $GITHUB_ENV
+          echo "G_BOARD_NAME=$G_BOARD_NAME" >> $GITHUB_ENV
+          echo "G_SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
+          echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV
+
+      - name: Dump .config file
+        run: |
+          echo "====== .config ========="
+          cat $BUILD_ROOT/.config
+          echo "========================"
+   
+      - name: Build the firmware image
+        id: compile
+        if: steps.configure.outputs.status == 'success'
+        env: 
+          TARGET: ${{ matrix.target }}
+          FW_VER: ${{ needs.check.outputs.fw_ver }}
+        run: |
+          cd $BUILD_ROOT
+          MAKE_JOBS=$(($(nproc)+1))
+          echo "$MAKE_JOBS thread compile"
+          make tools/install -j$MAKE_JOBS
+          make toolchain/install -j$MAKE_JOBS
+          if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$PACKAGE_DIR" != "" ]; then
+              make $PACKAGE_DIR/compile V=sc BUILD_LOG=1
+              exit 99
+          fi
+          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
          if [ "$FAKE_BUILD" = "true" ]; then
              mkdir -p logs
@@ -218,7 +279,6 @@ jobs:
          echo "SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
          echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
          echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
-          echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV

      - name: Check space usage
        run: df -hT
@@ -291,8 +351,8 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAG: ${{ needs.check.outputs.tag }}
        with:
-          prerelease: false
-          tag_name: ${{ needs.check.outputs.tag }}
+          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
+          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 }}]
--- a/_addons.config
+++ b/_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
--- a/xmake.sh
+++ b/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
Author	SHA1	Message	Date
remittor	979043f064	build: Add make tools and toolchain	2025-12-30 08:33:09 +03:00
remittor	4e7389f304	build: Add option PACKAGE_DIR	2025-12-30 08:17:47 +03:00
remittor	887d928a4b	build: Add configure step	2025-12-29 19:22:58 +03:00
remittor	5167d394e1	build: Add test_build option	2025-12-29 12:53:00 +03:00
remittor	dd3a9395f2	xmake: Downgrade dropbear to 2024.86	2025-12-28 11:28:07 +03:00
remittor	2f112defb4	build: Fix branch name	2025-12-27 19:29:18 +03:00
remittor	9104838c9b	addons: Fix download zapret2 packages	2025-12-27 17:51:09 +03:00
remittor	4e60cabc73	addons: Update sources for packages	2025-12-26 16:32:36 +03:00
remittor	295d495e81	build: Adapt for OpenWrt 25.12	2025-12-26 15:21:00 +03:00
remittor	d147c0c72d	xmake: Adapt fantastic packages for 25.12	2025-12-26 15:17:36 +03:00