build: Add step "Show host tools stamps"

config: Remove package lm-sensors-detect
Depends on perl and libperl.so
2026-02-02 23:47:48 +05:00 · 2026-02-02 17:09:45 +03:00 · 2026-02-02 17:08:48 +03:00 · 2026-01-29 12:07:32 +03:00 · 2026-01-21 12:16:51 +03:00 · 2026-01-20 17:23:19 +03:00
13 changed files with 135 additions and 35 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,6 +42,14 @@ on:
        options:
        - true
        - false
+      trx_build:
+        description: 'TRX images build'
+        required: true
+        default: 'false'
+        type: choice
+        options:
+        - true
+        - false
      suffix:
        description: 'TAG suffix'
        required: false
@@ -50,7 +58,6 @@ on:

 env:
  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 }}
  G_PKG_DIR: ${{ github.event.inputs.package_dir }}
@@ -204,6 +211,31 @@ jobs:
      - name: Checkout builder
        uses: actions/checkout@main

+      - name: Prepare env params
+        env:
+          INP_FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
+          INP_TRX_BUILD: ${{ github.event.inputs.trx_build == 'true' }}
+          TARGET: ${{ matrix.target }}
+        run: |
+          FAKE_BUILD=$INP_FAKE_BUILD
+          TRX_BUILD=false
+          if [ "$INP_TRX_BUILD" = true ]; then
+              CFG="./_initramfs/$TARGET.config"
+              if [ -f "$CFG" ]; then
+                  TRX_BUILD=true
+                  echo "Start TRX build for $CFG"
+                  echo "OPT_INITRAMFS=-i" >> $GITHUB_ENV
+              else
+                  FAKE_BUILD=true
+                  echo "Start FAKE build for $TARGET"
+                  echo "SKIP_ME=true" >> $GITHUB_ENV
+              fi
+          fi
+          echo "FAKE_BUILD = $FAKE_BUILD"
+          echo "TRX_BUILD  = $TRX_BUILD"
+          echo "FAKE_BUILD=$FAKE_BUILD" >> $GITHUB_ENV
+          echo "TRX_BUILD=$TRX_BUILD" >> $GITHUB_ENV
+
      - name: Download OpenWrt sources
        run: |
          git clone --branch $REPO_BRANCH $REPO_URL.git openwrt
@@ -291,7 +323,7 @@ jobs:
          TARGET: ${{ matrix.target }}
          FW_VER: ${{ needs.check.outputs.fw_ver }}
        run: |
-          ./xmake.sh -I -t $TARGET
+          ./xmake.sh $OPT_INITRAMFS -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
          G_BOARD_NAME=$( grep -so '^CONFIG_TARGET_BOARD=.*' .config | cut -d'"' -f2 )
@@ -337,7 +369,7 @@ jobs:

      - name: Download sources (dl)
        id: download
-        if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
+        if: ${{ steps.configure.outputs.status == 'success' && env.FAKE_BUILD != 'true' }}
        run: |
          make -j$(nproc) download
          echo "status=success" >> $GITHUB_OUTPUT
@@ -354,7 +386,7 @@ jobs:

      - name: Build tools and toolchain
        id: tools
-        if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
+        if: ${{ steps.configure.outputs.status == 'success' && env.FAKE_BUILD != 'true' }}
        run: |
          make toolchain/install -j$(nproc)
          echo "status=success" >> $GITHUB_OUTPUT
@@ -369,6 +401,11 @@ jobs:
            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'
@@ -376,14 +413,14 @@ jobs:
          TARGET: ${{ matrix.target }}
        run: |
          make clean
-          ./xmake.sh -I -t $TARGET
+          ./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
-        if: ${{ steps.tools.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
+        if: ${{ steps.tools.outputs.status == 'success' && env.FAKE_BUILD != 'true' }}
        run: |
          make target/linux/compile -j$(nproc)
          echo "status=success" >> $GITHUB_OUTPUT
@@ -418,29 +455,57 @@ jobs:
                  make V=sc world
              fi
          fi
-          # process results
-          OUT_DIR=bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
-          if [ "$FAKE_BUILD" = "true" ]; then
+          echo "status=success" >> $GITHUB_OUTPUT
+          
+      - name: Process out results
+        id: install
+        if: steps.compile.outputs.status == 'success' || env.FAKE_BUILD == 'true'
+        env: 
+          TARGET: ${{ matrix.target }}
+          OUT_DIR: ./bin/targets/${{ env.G_BOARD_NAME }}/${{ env.G_SUBTARGET_NAME }}
+        run: |
+          if [ "$FAKE_BUILD" = true ]; then
              mkdir -p logs
-              mkdir -p $OUT_DIR
-              echo "$G_BOARD_NAME $G_SUBTARGET_NAME $G_DEVICE_NAME" > "$OUT_DIR/$G_DEVICE_NAME.txt"
-              touch "$OUT_DIR/kernel-debug.tar.zst"
+              mkdir -p "$OUT_DIR"
+              cd "$OUT_DIR"
+              echo "$G_BOARD_NAME $G_SUBTARGET_NAME $G_DEVICE_NAME" > "$G_DEVICE_NAME.txt"
+              touch FAKE_BUILD.bin
+              touch kernel-debug.tar.zst
              BLD_VER=$FW_VER
          else
-              BLD_VER=$( cat $OUT_DIR/profiles.json | grep -so '"version_number":"[^"]*' | grep -so '[^"]*$' )
+              if [ ! -d "$OUT_DIR" ]; then
+                  echo "OUT_DIR not found!"
+                  exit 99
+              fi
+              cd "$OUT_DIR"
+              BLD_VER=$( cat profiles.json | grep -so '"version_number":"[^"]*' | grep -so '[^"]*$' )
+          fi
+          if [ "$SKIP_ME" = true ]; then
+              touch FLAG-SKIP_ME
+          fi
+          if [ "$TRX_BUILD" = true ]; then
+              touch FLAG-TRX_BUILD
          fi
          echo "Firmware $BLD_VER [$FILE_DATE] builded!"
-          if [ ! -f $OUT_DIR/kernel-debug.tar.zst ]; then
+          if [ ! -f kernel-debug.tar.zst ]; then
              echo "File kernel-debug.tar.zst not found!"
              exit 100
          fi
+          if [ "$TRX_BUILD" = true ]; then
+              find . -maxdepth 1 -type f ! -name '*-initramfs*' ! -name 'FLAG-*' -delete
+              VER_MAJOR=$( echo "$BLD_VER" | cut -d. -f1 )
+              STD_IMG_DIR="openwrt-initramfs-bin-for-luci"
+              mkdir $STD_IMG_DIR
+              find . -maxdepth 1 -type f -name '*-initramfs*.bin' -exec mv -f {} $STD_IMG_DIR/openwrt-${VER_MAJOR}_${TARGET}_initramfs.bin \;
+              find . -maxdepth 1 -type f -name '*-initramfs*.trx' -exec mv -f {} openwrt-${VER_MAJOR}_${TARGET}_initramfs.trx \;
+          fi
          echo "status=success" >> $GITHUB_OUTPUT
          echo "FW_BUILD_OK=1" >> $GITHUB_ENV
          echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
          echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV

      - name: Mark firmware build failed
-        if: false # steps.compile.outcome == 'failure'
+        if: false # steps.install.outcome == 'failure' || steps.compile.outcome == 'failure'
        run: |
          echo "Firmware build failed, continuing pipeline"
          echo "FW_BUILD_OK=0" >> $GITHUB_ENV
@@ -471,7 +536,7 @@ jobs:
          tar -cJvf logs-$TARGET-$FW_DATE.tar.xz logs

      - name: Cleanup OUT directory 
-        if: steps.compile.outputs.status == 'success'
+        if: steps.install.outputs.status == 'success'
        env:
          OUT_DIR: ${{ env.OUT_DIR }}
        run: |
@@ -491,7 +556,7 @@ jobs:

      - name: Upload OUT directory
        uses: actions/upload-artifact@main
-        if: steps.compile.outputs.status == 'success'
+        if: steps.install.outputs.status == 'success'
        with:
          name: openwrt-${{ env.BLD_VER }}-${{ needs.check.outputs.build_date }}-${{ env.G_DEVICE_NAME }}
          path: ${{ env.OUT_DIR }}
@@ -530,19 +595,52 @@ jobs:
      - name: Put images into zip
        run: |
          mkdir -p public
-          find . -mindepth 1 -type d -name 'openwrt-*' -exec sh -c 'zip -0 ./public/$(basename {}).zip -j {} {}/*' \;
+          for DIR in openwrt-*; do
+              [ -d "$DIR" ] || continue
+              if [ -f "$DIR/FLAG-SKIP_ME" ]; then
+                  echo "Skip $DIR"
+                  continue
+              fi
+              ZIP_SUFFIX=""
+              if [ -f "$DIR/FLAG-TRX_BUILD" ]; then
+                  echo "TRX_BUILD=true" >> $GITHUB_ENV
+                  ZIP_SUFFIX=".trx"
+              fi
+              rm -f "$DIR"/FLAG-*
+              zip_name="./public/$(basename "$DIR")${ZIP_SUFFIX}.zip"
+              echo "Creating $zip_name"
+              ( cd "$DIR"; zip -0 -r "../$zip_name" . )
+          done
+
+      - name: Show all zip files
+        run: |
          ls -lh ./public/*.zip

-      - name: Upload assets
-        uses: andelf/nightly-release@main
+      - name: Generate names
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAG: ${{ needs.check.outputs.tag }}
+          FW_VER: ${{ needs.check.outputs.fw_ver }}
+          FW_DATE: ${{ needs.check.outputs.fw_date }}
+        run: |
+          NAME="$TAG"
+          DESC="OpenWrt $FW_VER [$FW_DATE]"
+          if [ "$TRX_BUILD" = true ]; then
+              NAME="TRX-$TAG"
+              TAG="$TAG-trx"
+              DESC="TRX images based on $DESC"
+          fi
+          echo "REL_TAG=$TAG" >> $GITHUB_ENV
+          echo "REL_NAME=$NAME" >> $GITHUB_ENV
+          echo "REL_DESC=$DESC" >> $GITHUB_ENV
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
        with:
+          draft: ${{ env.TEST_BUILD == 'true' || github.event.inputs.fake_build  == 'true' }}
          prerelease: true
-          tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
-          name: '${{ needs.check.outputs.tag }}'
+          tag_name: ${{ env.REL_TAG }}${{ env.TAG_SUFFIX }}
+          name: '${{ env.REL_NAME }}'
          body: |
-            OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]
+            ${{ env.REL_DESC }}
            author: [remittor](https://github.com/remittor)
          files: ./public/*.zip
--- 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/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
--- 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
@@ -117,12 +117,22 @@ function build_target {
 			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
+
+	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

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