build: Add step "Show host tools stamps"

Depends on perl and libperl.so

.github/workflows/build.yml

@@ -3,16 +3,21 @@ name: build
 on:
   workflow_dispatch:
     inputs:
-      first_kernel_compile:
+      use_cache:
-        description: 'First kernel compile'
+        description: 'Restore cache for host tools'
         required: true
         default: 'true'
         type: choice
         options:
         - true
         - false
+      cache_ver:
+        description: 'Use cache version'
+        required: false
+        default: '0'
+        type: string
       test_build:
-        description: 'Test build'
+        description: 'Test build (only spec target) '
         required: true
         default: 'false'
         type: choice
@@ -20,12 +25,12 @@ on:
         - true
         - false
       target_name:
-        description: 'Target Name'
+        description: 'Target Name for test build'
         required: false
         default: 'r3d'
         type: string
       package_dir:
-        description: 'Package Dir'
+        description: 'Package Dir for test build'
         required: false
         default: ''
         type: string
@@ -37,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
@@ -44,17 +57,14 @@ on:
         type: string
 
 env:
-  FIRST_KERNEL_COMPILE:  ${{ github.event.inputs.first_kernel_compile == 'true' }}
   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 }}
+  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-
-  DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
   TZ: UTC
   DEVICE_NAME: unknown
   BUILD_DATE: unknown
@@ -154,8 +164,9 @@ jobs:
           - rt-ax57m
           - rt-ax59u
           - rt-ax89x
-          - tuf_ax4200
+          - tuf-ax4200
-          - tuf_ax6000
+          - tuf-ax4200q
+          - tuf-ax6000
           - zen-bt8
         isTest:
           - ${{ needs.check.outputs.test_build == 'true' }}
@@ -171,9 +182,9 @@ jobs:
           sudo apt-get -qq update
           #sudo apt-get -qq update && sudo apt-get -qq upgrade
           sudo apt-get -qq install  build-essential gawk flex rsync swig unzip zlib1g-dev file wget
-          sudo apt-get -qq install  libc6-dev clang flex bison g++ gcc-multilib g++-multilib
+          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"
@@ -186,10 +197,45 @@ jobs:
           remove-haskell: true
           remove-codeql: true
           remove-docker-images: true
-        
+
+      - name: Set fixed workspace
+        env: 
+          GITHUB_WORKSPACE: ${{ github.workspace }}
+        run: |
+          sudo mkdir -p $GITHUB_WORKSPACE/_temp
+          #sudo chown -R $USER:$USER $GITHUB_WORKSPACE
+          echo "GITHUB_WORKSPACE = $GITHUB_WORKSPACE"
+          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE" >> $GITHUB_ENV
+          echo "RUNNER_TEMP=$GITHUB_WORKSPACE/_temp" >> $GITHUB_ENV
+          
       - 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
@@ -202,21 +248,73 @@ jobs:
           chmod +x *.sh
           wget https://github.com/fantastic-packages/packages/raw/refs/heads/24.10/keys/usign/53FF2B6672243D28.pub
 
-      - name: Cache downloads (dl)
-        if: false
-        uses: actions/cache@v4
-        with:
-          path: dl
-          key: dl-${{ hashFiles('feeds.conf.default') }}
-          restore-keys: |
-            dl-
-
       - name: Update OpenWrt packages
         id: update
         run: |
           ./xupdate.sh -f
           mkdir -p logs
           echo "status=success" >> $GITHUB_OUTPUT
+          
+      - name: Prepare for cache
+        id: cache_prepare
+        env: 
+          TARGET: ${{ matrix.target }}
+          USE_CACHE: ${{ github.event.inputs.use_cache }}
+          CACHE_VER: ${{ github.event.inputs.cache_ver }}
+        run: |
+          if [ "$USE_CACHE" = "true" ]; then
+              rm -rf staging_dir/
+              mkdir -p staging_dir/host
+              rm -rf build_dir/
+              mkdir -p build_dir/host
+          fi
+          if [[ " kng_re r3g r3p " == *" $TARGET "* ]]; then
+              CACHE_ARCH=mips
+          else
+              CACHE_ARCH=arm
+          fi
+          echo "CACHE_ARCH = $CACHE_ARCH"
+          echo "USE_CACHE=$USE_CACHE" >> $GITHUB_ENV
+          echo "CACHE_VER=$CACHE_VER" >> $GITHUB_ENV
+          echo "CACHE_ARCH=$CACHE_ARCH" >> $GITHUB_ENV
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Restore cache for host tools
+        id: tools_cache_restore
+        if: github.event.inputs.use_cache == 'true'
+        uses: actions/cache/restore@v4
+        with:
+          key: host-tools-${{ env.CACHE_VER }}-${{ env.CACHE_ARCH }}-${{ hashFiles('tools/**') }}
+          path: |
+            staging_dir/host
+            build_dir/host
+
+      - name: Fix time stamps into restored dirs
+        if: github.event.inputs.use_cache == 'true' && steps.tools_cache_restore.outputs.cache-hit == 'true'
+        run: |
+          touch staging_dir/host/.prepared
+          touch staging_dir/host/.prereq-build
+          touch staging_dir/host/stamp/.* 2>/dev/null
+          find build_dir/host -name ".prepared*"  -exec touch {} +
+          find build_dir/host -name ".configured" -exec touch {} +
+          find build_dir/host -name ".built"      -exec touch {} +
+
+      - name: Inspect restored host tools
+        if: github.event.inputs.use_cache == 'true'
+        run: |
+          echo "====== openwrt-native.txt ======"
+          cat build_dir/host/pkgconf-*/openwrt-native.txt || true
+          echo "====== staging_dir/host ====="
+          du -sh staging_dir/host || true
+          ls -la staging_dir/host || true
+          echo "====== staging_dir/host/bin ====="
+          du -sh staging_dir/host/bin || true
+          ls -1  staging_dir/host/bin | head -20 || true
+          echo "====== build_dir/host ======="
+          du -sh build_dir/host || true
+          ls -1  build_dir/host | head -20 || true
+          echo "====== path info ========"
+          grep -R "/home/runner" build_dir/host | head
 
       - name: Configure
         id: configure
@@ -225,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 )
@@ -255,66 +353,87 @@ jobs:
           echo "====== .config ========="
           cat .config
           echo "========================"
-
+          cp -f .config logs/config1
-      - name: Prepare for use cache of tools and toolchain
+          cp -f .config config1
-        run: |
-          echo "G_TARGET_ARCH = $G_TARGET_ARCH"
-          rm -rf staging_dir/
-          rm -rf build_dir/
-
-      - name: Cache host tools
-        uses: actions/cache@v4
-        with:
-          path: staging_dir/host
-          key: host-tools-${{ runner.os }}-${{ hashFiles('tools/**') }}
-          restore-keys: |
-            host-tools-${{ runner.os }}-
-
-      - name: Cache toolchain
-        uses: actions/cache@v4
-        with:
-          path: staging_dir/toolchain-*
-          key: toolchain-${{ env.G_TARGET_ARCH }}-${{ hashFiles('toolchain/**') }}
-          restore-keys: |
-            toolchain-${{ env.G_TARGET_ARCH }}-
 
       - name: Monitor memory
         run: |
-          free -h
+          echo "CPU cores = $(nproc)"
-          cat /proc/meminfo
+          echo "Memory and swap:"
-    
+          sudo free -h
+          echo
+          sudo swapon --show
+          echo
+          echo "Available storage:"
+          sudo df -h
+
+      - name: Download sources (dl)
+        id: download
+        if: ${{ steps.configure.outputs.status == 'success' && env.FAKE_BUILD != 'true' }}
+        run: |
+          make -j$(nproc) download
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Fix time stamps into restored dirs
+        if: github.event.inputs.use_cache == 'true' && steps.tools_cache_restore.outputs.cache-hit == 'true'
+        run: |
+          touch staging_dir/host/.prepared
+          touch staging_dir/host/.prereq-build
+          touch staging_dir/host/stamp/.* 2>/dev/null
+          find build_dir/host -name ".prepared*"  -exec touch {} +
+          find build_dir/host -name ".configured" -exec touch {} +
+          find build_dir/host -name ".built"      -exec touch {} +
+
       - 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
 
       - name: Save cache for host tools
-        if: ${{ steps.tools.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
+        id: tools_cache_save
-        uses: actions/cache@v4
+        if: steps.tools.outputs.status == 'success'
+        uses: actions/cache/save@v4
         with:
-          path: staging_dir/host
+          key: host-tools-${{ env.CACHE_VER }}-${{ env.CACHE_ARCH }}-${{ hashFiles('tools/**') }}
-          key: host-tools-${{ runner.os }}-${{ hashFiles('tools/**') }}
+          path: |
+            staging_dir/host
+            build_dir/host
 
-      - name: Save cache for toolchain
+      - name: Show host tools stamps
-        if: ${{ steps.tools.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
+        run: |
-        uses: actions/cache@v4
+          ls -la staging_dir/host/stamp/
-        with:
+          ls -la staging_dir/host/stamp/ > logs/host_stamp_dir.txt
-          path: staging_dir/toolchain-*
+
-          key: toolchain-${{ env.G_TARGET_ARCH }}-${{ hashFiles('toolchain/**') }}
+      - name: Configure 2
+        id: configure2
+        if: steps.tools.outputs.status == 'success'
+        env: 
+          TARGET: ${{ matrix.target }}
+        run: |
+          make clean
+          ./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.first_kernel_compile == 'true' && 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
 
       - name: Monitor memory 2
         run: |
-          free -h
+          echo "Memory and swap:"
-          cat /proc/meminfo
+          sudo free -h
+          echo
+          sudo swapon --show
+          echo
+          echo "Available storage:"
+          sudo df -h
 
       - name: Build the firmware image
         id: compile
@@ -323,40 +442,70 @@ jobs:
           TARGET: ${{ matrix.target }}
         run: |
           echo "Run $(nproc) thread compile"
-          if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$PACKAGE_DIR" != "" ]; then
+          if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$G_PKG_DIR" != "" ]; then
-              make $PACKAGE_DIR/compile V=sc BUILD_LOG=1
+              make target/linux/compile -j$(npoc)
+              echo "=============== BUILD PACKAGE: $G_PKG_DIR ==============="
+              make $G_PKG_DIR/compile V=sc BUILD_LOG=1
               exit 99
           fi
           if [ "$FAKE_BUILD" != "true" ]; then
               if [ "$TEST_BUILD" != "true" ]; then
-                  make -j$(nproc) download world
+                  make -j$(nproc) world
               else
-                  make V=sc download world
+                  make V=sc world
               fi
           fi
-          # process results
+          echo "status=success" >> $GITHUB_OUTPUT
-          OUT_DIR=bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
+          
-          if [ "$FAKE_BUILD" = "true" ]; then
+      - 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
+              mkdir -p "$OUT_DIR"
-              echo "$G_BOARD_NAME $G_SUBTARGET_NAME $G_DEVICE_NAME" > "$OUT_DIR/$G_DEVICE_NAME.txt"
+              cd "$OUT_DIR"
-              touch "$OUT_DIR/kernel-debug.tar.zst"
+              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
@@ -371,6 +520,13 @@ jobs:
       - name: Check space usage
         run: df -hT
 
+      - name: Check OOM error
+        if: failure()
+        run: |
+          dmesg | grep -i -E 'oom|killed process' || true
+          echo "================== Memory ================="
+          free -h
+    
       - name: Compress build logs
         if: always()
         env:
@@ -380,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: |
@@ -400,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 }}
@@ -410,7 +566,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: logs-${{ matrix.target }}-${{ env.FW_DATE }}
+          name: logs-${{ matrix.target }}-${{ needs.check.outputs.fw_date }}
           path: logs-*.tar.xz
 
   release:
@@ -439,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
+      - name: Generate names
-        uses: andelf/nightly-release@main
         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:
-          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
+          draft: ${{ env.TEST_BUILD == 'true' || github.event.inputs.fake_build  == 'true' }}
-          tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
+          prerelease: true
-          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

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

_cfginc/_base.config

@@ -45,6 +45,8 @@ CONFIG_PACKAGE_luci-app-filemanager=y
 CONFIG_PACKAGE_luci-i18n-filemanager-ru=y
 #CONFIG_PACKAGE_atftp=y
 #CONFIG_PACKAGE_atftpd=y
+CONFIG_PACKAGE_lscpu=y
+CONFIG_PACKAGE_bind-tools=y
 CONFIG_PACKAGE_facinstall=y
 
 ### Add-on programs
@@ -121,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
 
@@ -186,6 +189,7 @@ CONFIG_OPENSSL_WITH_MDC2=y
 CONFIG_OPENSSL_WITH_WHIRLPOOL=y
 
 ### SSL certificates
+CONFIG_PACKAGE_ca-bundle=y 
 CONFIG_PACKAGE_ca-certificates=y
 
 ### Luci

_cfginc/_base_initrd.config

@@ -37,12 +37,14 @@ CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_mtd-utils=y
 CONFIG_PACKAGE_iw=y
 CONFIG_PACKAGE_mc=y
+CONFIG_PACKAGE_rsync=y
 CONFIG_PACKAGE_luci-app-ttyd=y
 CONFIG_PACKAGE_luci-i18n-ttyd-ru=y
 CONFIG_PACKAGE_luci-app-filemanager=y
 CONFIG_PACKAGE_luci-i18n-filemanager-ru=y
 CONFIG_PACKAGE_atftp=y
 #CONFIG_PACKAGE_atftpd=y
+CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_facinstall=y
 
 CONFIG_PACKAGE_kmod-mtd-rw=y
@@ -55,6 +57,7 @@ CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_htop=y
 CONFIG_PACKAGE_nano=y
 CONFIG_PACKAGE_ccrypt=y
+CONFIG_PACKAGE_curl=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_patch=y
 CONFIG_PACKAGE_diffutils=y
@@ -64,6 +67,10 @@ CONFIG_PACKAGE_terminfo=y
 CONFIG_PACKAGE_zlib=y
 CONFIG_PACKAGE_ethtool=y
 
+### SSL certificates
+CONFIG_PACKAGE_ca-bundle=y 
+CONFIG_PACKAGE_ca-certificates=y
+
 ### Luci
 CONFIG_LUCI_LANG_en=y
 CONFIG_LUCI_LANG_ru=y

_cfginc/_proxy.config

@@ -9,12 +9,7 @@ CONFIG_PACKAGE_luci-i18n-https-dns-proxy-ru=y
 CONFIG_PACKAGE_igmpproxy=y
 
 CONFIG_PACKAGE_zapret=y
-CONFIG_PACKAGE_zapret-tpws=y
-CONFIG_PACKAGE_zapret-mdig=y
-CONFIG_PACKAGE_zapret-ip2net=y
 CONFIG_PACKAGE_luci-app-zapret=y
 
 CONFIG_PACKAGE_zapret2=y
-CONFIG_PACKAGE_zapret2-mdig=y
-CONFIG_PACKAGE_zapret2-ip2net=y
 CONFIG_PACKAGE_luci-app-zapret2=y

_initramfs/tuf-ax4200q.config

@@ -0,0 +1,14 @@
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_filogic=y
+CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200q=y
+
+#include _addons.config
+#include _base_initrd.config
+#include _wifi_en.config
+
+
+CONFIG_TARGET_INITRAMFS_FORCE=y
+CONFIG_TARGET_ROOTFS_INITRAMFS=y
+CONFIG_USES_SEPARATE_INITRAMFS=n
+CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
+

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

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
 

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
 

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

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

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

tuf-ax4200q.config

@@ -0,0 +1,43 @@
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_filogic=y
+CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200q=y
+
+#include _addons.config
+#include _base.config
+#include _wifi_en.config
+#include _printer.config
+#include _samba.config
+#include _torrents.config
+#include _proxy.config
+#include _argon.config
+#include _vpn.config
+
+### Temp and sensors
+CONFIG_PACKAGE_lm-sensors=y
+CONFIG_PACKAGE_luci-app-temp-status=y
+CONFIG_PACKAGE_luci-i18n-temp-status-ru=y
+CONFIG_PACKAGE_collectd-mod-sensors=y
+
+### HDD tools
+CONFIG_PACKAGE_smartmontools=y
+CONFIG_PACKAGE_hdparm=y
+CONFIG_PACKAGE_hd-idle=y
+CONFIG_PACKAGE_luci-app-hd-idle=y
+#CONFIG_PACKAGE_luci-i18n-hd-idle-ru=y
+CONFIG_PACKAGE_luci-app-disks-info=y
+#CONFIG_PACKAGE_luci-i18n-disks-info-ru=y
+CONFIG_PACKAGE_luci-app-diskman=y
+
+### Luci dashboard
+CONFIG_PACKAGE_luci-mod-dashboard=y
+CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
+
+### Network Ports viewer
+CONFIG_PACKAGE_luci-app-tn-netports=y
+CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
+
+### TimeControl
+CONFIG_PACKAGE_luci-app-timecontrol=m
+
+CONFIG_PACKAGE_fantastic-feeds=m
+

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

xmake.sh

@@ -15,7 +15,6 @@ OPT_FULL_REBUILD=false
 KALLSYMS=false
 TESTING_KERNEL=false
 BUILD_ONLY_INITRAMFS=false
-BUILD_SKIP_INITRAMFS=false
 ONLY_INIT=false
 
 while getopts "j:t:fiskTI" opt; do
@@ -26,7 +25,6 @@ while getopts "j:t:fiskTI" opt; do
 		k) KALLSYMS=true;;
 		T) TESTING_KERNEL=true;;
 		i) BUILD_ONLY_INITRAMFS=true;;
-		s) BUILD_SKIP_INITRAMFS=true;;
 		I) ONLY_INIT=true;;
 	esac
 done
@@ -70,7 +68,7 @@ function build_target {
 	fi
 	inclst=$( get_cfg_inc_lst $CFG )
 	for inc in $inclst; do
-		incfn=$XDIR/$inc
+		incfn=$XDIR/_cfginc/$inc
 		[ ! -f $incfn ] && die "File '$inc' not found!"
 		sed -i "/#include $inc/a <<LF>><<LF>>" $CFG
 		sed -i "s/<<LF>>/\n/g" $CFG
@@ -108,6 +106,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 ############
@@ -118,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
 	
-	AWG_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile
+	RAB_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile
-	if [ -f $AWG_LUCI_MK ]; then
+	if [ -f $RAB_LUCI_MK ]; then
-		if ! grep "PKG_PROVIDES" $AWG_LUCI_MK >/dev/null ; 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' $AWG_LUCI_MK
+			sed -i 's/LUCI_PKGARCH:=all/LUCI_PKGARCH:=all\nPKG_PROVIDES:=luci-app-ruantiblock/g' $RAB_LUCI_MK
+			echo ">>> ruantiblock patched !!!"
 		fi
 	fi
 
@@ -134,24 +143,50 @@ function build_target {
 		fi
 	fi
 
-	PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
+	PODKOP_DIR=$XDIR/package/feeds/_podkop
-	if [ -f $PODKOP_MK ]; then
+	if [ -d $PODKOP_DIR ]; then
-		sed -i 's/+sing-box / /g' $PODKOP_MK
+		PODKOP_PATCH=
-		sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK
+		PODKOP_MK=$PODKOP_DIR/podkop/Makefile
-	fi
+		if [ -f $PODKOP_MK ] && grep -q '+sing-box' $PODKOP_MK ; then
-	PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop
+			sed -i 's/+sing-box / /g' $PODKOP_MK
-	if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
+			sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK
-		sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
+			PODKOP_PATCH="$PODKOP_PATCH (del depend sing-box)"
+		fi
+		PODKOP_SH=$PODKOP_DIR/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
+			PODKOP_PATCH="$PODKOP_PATCH (status for sing-box)"
+		fi
+		if [ -f $PODKOP_MK ] && grep -q 'PODKOP_VERSION' $PODKOP_MK ; then
+			PKGVERLIST=$( git ls-remote --tags https://github.com/itdoginfo/podkop.git | awk -F/ '{print $3}' | grep -Ev '^v' | sort -V | tail -n 2 )
+			VER_PREV=$( sed -n '1p' <<< "$PKGVERLIST" )
+			VER_LATEST=$( sed -n '2p' <<< "$PKGVERLIST" )
+			[ -z "$VER_LATEST" ] && { echo "ERROR: cannot detect version of podkop!"; exit 1; }
+			sed -i 's/PKG_VERSION :=.*/PKG_VERSION:='$VER_LATEST'/g' $PODKOP_MK
+			PODKOP_PATCH="$PODKOP_PATCH (set ver $VER_LATEST)"
+		fi
+		PODKOP_MK=$PODKOP_DIR/luci-app-podkop/Makefile
+		if [ -f $PODKOP_MK ] && grep -q 'PODKOP_VERSION' $PODKOP_MK ; then
+			PKGVERLIST=$( git ls-remote --tags https://github.com/itdoginfo/podkop.git | awk -F/ '{print $3}' | grep -Ev '^v' | sort -V | tail -n 2 )
+			VER_PREV=$( sed -n '1p' <<< "$PKGVERLIST" )
+			VER_LATEST=$( sed -n '2p' <<< "$PKGVERLIST" )
+			[ -z "$VER_LATEST" ] && { echo "ERROR: cannot detect version of podkop!"; exit 1; }
+			sed -i 's/PKG_VERSION :=.*/PKG_VERSION:='$VER_LATEST'/g' $PODKOP_MK
+			PODKOP_PATCH="$PODKOP_PATCH (Set Ver $VER_LATEST)"
+		fi
+		[ "$PODKOP_PATCH" != "" ] && echo ">>> podkop patched !!! $PODKOP_PATCH"
 	fi
 
 	DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
 	if [ -f $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
+		echo ">>> dropbear patched !!! (disable MODERN_ONLY)"
 	fi
 
 	make defconfig
@@ -189,7 +224,10 @@ function build_target {
 		echo -e "\nCONFIG_PACKAGE_wpad-openssl=y\n" >> $CFG
 	fi
 
-	#DASHBRDPO=$XDIR/feeds/luci/modules/luci-mod-dashboard/po/ru/dashboard.po
+	DASHBRDPO=$XDIR/feeds/luci/modules/luci-mod-dashboard/po/ru/dashboard.po
+	if [ -f $DASHBRDPO ]; then
+		sed -i 's/msgid "Dashboard"/msgid "__dash_board__"/g' $DASHBRDPO
+	fi
 	DASHBRDPO=$XDIR/package/feeds/luci/luci-mod-dashboard/po/ru/dashboard.po
 	if [ -f $DASHBRDPO ]; then
 		sed -i 's/msgid "Dashboard"/msgid "__dash_board__"/g' $DASHBRDPO
@@ -284,6 +322,9 @@ function build_target {
 		sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
 		logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
 	fi
+	if [ $BUILD_ONLY_INITRAMFS = true ]; then
+		rm -f $OPKG_DIR/customfeeds.conf
+	fi
 
 	SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf
 	if [ -f $SYSCTLCONF_FN ]; then
@@ -313,13 +354,19 @@ function build_config {
 	local cfg=$1
 	local cfg_name=$( basename $cfg )
 	local target_name=${cfg_name%.*}
+	local initramfs=false
 	local board=$( get_cfg_board $cfg )
 	local subtarget=$( get_cfg_subtarget $cfg $board )
 	local device=$( get_cfg_dev_lst $cfg $board $subtarget )
 	local outdir=$XDIR/bin/targets/$board/$subtarget	
-	echo Start build for target $cfg_name "($board-$subtarget-$device)"
+
-	
+	if echo "$cfg" | grep -q '_initramfs/' ; then
-	build_target $cfg_name
+		initramfs=true
+		target_name=${target_name}_initramfs
+	fi
+	echo Start build for target $target_name "($board-$subtarget-$device)"
+
+	build_target $cfg
 	
 	if [ ! -f $outdir/kernel-debug.tar.zst ]; then
 		echo "ERROR: cannot build images for target $target_name"
@@ -334,6 +381,9 @@ function build_config {
 
 if [ "$XTARGET" != "*" ]; then
 	TARGETCFG=$XDIR/$XTARGET
+	if [ $BUILD_ONLY_INITRAMFS = true ]; then
+		TARGETCFG=$XDIR/_initramfs/$XTARGET
+	fi
 	XTARGET_EXT="${XTARGET##*.}"
 	[ $XTARGET_EXT != config ] && TARGETCFG=$TARGETCFG.config
 	[ ! -f $TARGETCFG ] && die "File '"`basename $TARGETCFG`"' not found!"
@@ -345,7 +395,12 @@ if [ "$XTARGET" != "*" ]; then
 fi
 
 XOUT=$XDIR/xout
-CFG_LIST=$( find $XDIR/* -maxdepth 1 -name '[a-z0-9]*.config' )
+
+if [ $BUILD_ONLY_INITRAMFS = true ]; then
+	CFG_LIST=$( find $XDIR/_initramfs/* -maxdepth 1 -name '[a-z0-9]*.config' )
+else
+	CFG_LIST=$( find $XDIR/* -maxdepth 1 -name '[a-z0-9]*.config' )
+fi
 
 rm -rf $XOUT
 
@@ -354,35 +409,16 @@ if [ -z "$CFG_LIST" ]; then
 	exit 1
 fi
 
-INITRAMFS_COUNT=0
+if [ $BUILD_ONLY_INITRAMFS = true ]; then
+	echo "Start make initramfs configs!"
+else
+	echo "Start make non initramfs configs!"
+fi	
+	
+clean_all
+
 for CFG in $CFG_LIST; do
-	if [[ "$CFG" == *"_initramfs"* ]]; then
+   build_config $CFG
-		INITRAMFS_COUNT=$(( INITRAMFS_COUNT + 1 ))
-	fi
 done
 
-if [ $INITRAMFS_COUNT = 0 ] && [ $BUILD_ONLY_INITRAMFS = true ]; then
-	echo "ERROR: Cannot found initramfs configs!"
-	exit 1
-fi
-
-if [ $INITRAMFS_COUNT -gt 0 ] && [ $BUILD_SKIP_INITRAMFS != true ]; then
-	echo "Start make initramfs configs!"
-	clean_all
-	for CFG in $CFG_LIST; do
-	   [[ "$CFG" != *"_initramfs"* ]] && continue  # process only initramfs configs
-	   build_config $CFG
-	done
-fi
-
-if [ $BUILD_ONLY_INITRAMFS != true ]; then
-	echo "Start make non initramfs configs!"
-	clean_all
-	for CFG in $CFG_LIST; do
-		[[ "$CFG" == *"_initramfs"* ]] && continue  # skip initramfs configs
-		build_config $CFG
-	done
-fi
-
 echo "All targets was builded!" 
-

xupdate.sh

@@ -4,8 +4,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 export XDIR=$SCRIPT_DIR
 export XADDONSDIR=$XDIR/package/addons
 FEEDSDIR=$XDIR/package/feeds
-ADDONSCFG=$XDIR/_addons.config
+ADDONSCFG=$XDIR/_cfginc/_addons.config
-ADDONSNSS=$XDIR/_addons_nss.config
+ADDONSNSS=$XDIR/_cfginc/_addons_nss.config
 
 . ./xcommon.sh
 

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