test 14

.github/workflows/build.yml

@@ -0,0 +1,253 @@
+name: build
+
+on:
+  workflow_dispatch:
+#  push:
+#    tags:
+#      - v[0-9]+*
+
+env:
+  REPO_URL: https://github.com/openwrt-xiaomi/openwrt.git
+  REPO_BRANCH: xq-24.10
+  TAG_PREFIX: v24-
+  BUILD_ROOT: ${{ github.workspace }}/openwrt
+  DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
+  TZ: UTC
+  DEVICE_NAME: unknown
+  BUILD_DATE: unknown
+
+jobs:
+  check:
+    runs-on: ubuntu-24.04
+    outputs:
+      tag: ${{ steps.gh.outputs.tag }}
+      date: ${{ steps.gh.outputs.date }}
+      sha: ${{ steps.gh.outputs.sha }}
+      url: ${{ steps.gh.outputs.url }}
+      message: ${{ steps.gh.outputs.message }}
+      is_active: ${{ steps.activity.outputs.is_active }}
+    steps:
+      - name: Get repo data via GH API
+        id: gh
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: 'openwrt-xiaomi/openwrt'
+        run: |
+          echo "Tag name from GITHUB_REF_NAME: $GITHUB_REF_NAME"
+          echo "Tag name from github.ref_name: ${{ github.ref_name }}"
+          BRANCH=$(gh api repos/$REPO --jq '.default_branch')
+          DATE=$(gh api repos/$REPO/commits/$BRANCH --jq '.commit.committer.date')
+          BUILD_DATE=$( date --utc +'%y%m%d' )
+          TAG=$TAG_PREFIX$BUILD_DATE
+          {
+            echo "tag=$TAG"
+            echo "date=$(date --utc -d $DATE +%Y%m%d)"
+            echo "sha=$(gh api repos/$REPO/commits/$BRANCH --jq '.sha[0:7]')"
+            echo "url=$(gh api repos/$REPO/commits/$BRANCH --jq '.html_url')"
+            echo "build_root=$BUILD_ROOT"
+            echo "message<<EOF"
+            gh api repos/$REPO/commits/$BRANCH --jq '.commit.message'
+            echo EOF
+          } >> $GITHUB_OUTPUT
+          echo "DATE=$DATE" >> $GITHUB_ENV
+          echo "BUILD_DATE=$BUILD_DATE" >> $GITHUB_ENV
+          echo "TAG=$TAG" >> $GITHUB_ENV
+
+      - name: Check for repo activity
+        id: activity
+        env:
+          DATE: ${{ env.DATE }}
+          URL: ${{ steps.gh.outputs.url }}
+        run: |
+          TIMESTAMP=$(date --utc -d $DATE +%s)
+          DAYS=$(( ( $(date --utc +%s) - $TIMESTAMP ) / 86400 ))
+          echo "Repository activity: $(date --utc -d $DATE)"
+          echo "Commit: $URL"
+          if [ "${{ github.event_name }}" != "schedule" ]; then
+            is_active=true
+          elif [[ $DAYS -lt 1 ]] ; then
+            is_active=true
+          else
+            echo "Repository not updated within last 24 hours."
+            is_active=false
+          fi
+          echo "is_active=$is_active" >> $GITHUB_OUTPUT
+
+  build:
+    needs: check
+    #if: needs.check.outputs.is_active == 'true'
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - kng_re
+          - r3d
+          - r3g
+          - rb03
+          - rb06
+          - rd03
+          - rt-ax52
+          - rt-ax57m
+          - rt-ax59u
+          - rt-ax89x
+          - tuf_ax4200
+          - tuf_ax6000
+    steps:
+      - name: Initialization environment
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          sudo apt-get -qq update
+          #sudo apt-get -qq update && sudo apt-get -qq upgrade
+          sudo apt-get -qq install $(cat $DEPENDENCIES)
+          sudo apt-get -qq autoremove --purge
+          sudo apt-get -qq clean
+          sudo timedatectl set-timezone "$TZ"
+
+      - name: Maximize build disk space
+        uses: easimon/maximize-build-space@master
+        with:
+          remove-dotnet: true
+          remove-android: true
+          remove-haskell: true
+          remove-codeql: true
+          remove-docker-images: true
+        
+      - name: Checkout builder
+        uses: actions/checkout@main
+
+      - name: Download OpenWrt sources
+        run: git clone --branch $REPO_BRANCH $REPO_URL $BUILD_ROOT
+
+      - name: Init builder
+        env:
+          BLDROOT: ${{ github.workspace }}
+        shell: bash        
+        run: |
+          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
+
+      - name: Update OpenWrt packages
+        run: |
+          cd $BUILD_ROOT
+          ./xupdate.sh -f
+
+      - name: Build the firmware image
+        id: compile
+        env: 
+          TARGET: ${{ matrix.target }}
+        run: |
+          cd $BUILD_ROOT
+          MAKE_JOBS=$(($(nproc)+1))
+          echo "$MAKE_JOBS thread compile"
+          ./xmake.sh -m -t $TARGET
+          make -j $MAKE_JOBS download world
+          # || make V=sc
+          DEVICE_NAME=$( grep -so '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' )
+          BOARD_NAME=$( grep -so '^CONFIG_TARGET_BOARD=.*' .config | cut -d'"' -f2 )
+          SUBTARGET_NAME=$( grep -so '^CONFIG_TARGET_SUBTARGET=.*' .config | cut -d'"' -f2 )
+          OUT_DIR=$BUILD_ROOT/bin/targets/$BOARD_NAME/$SUBTARGET_NAME
+          # BLD_VER=24.10.0-rc5
+          BLD_VER=$( cat $OUT_DIR/profiles.json | grep -so '"version_number":"[^"]*' | grep -so '[^"]*$' )
+          FILE_DATE=$(date --utc +'%y%m%d')
+          echo "Firmware $BLD_VER [$FILE_DATE] builded!"
+          # mkdir -p logs
+          # mkdir -p $OUT_DIR
+          # echo "$BOARD_NAME $SUBTARGET_NAME $DEVICE_NAME" > "$OUT_DIR/$DEVICE_NAME.txt"
+          if [ ! -f $OUT_DIR/kernel-debug.tar.zst ]; then
+            echo "File kernel-debug.tar.zst not found!"
+            exit 100
+          fi
+          echo "status=success" >> $GITHUB_OUTPUT
+          echo "DEVICE_NAME=$DEVICE_NAME" >> $GITHUB_ENV
+          echo "BOARD_NAME=$BOARD_NAME" >> $GITHUB_ENV
+          echo "SUBTARGET_NAME=$SUBTARGET_NAME" >> $GITHUB_ENV
+          echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
+          echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
+          echo "FILE_DATE=$(date --utc +'%y%m%d')" >> $GITHUB_ENV
+          echo "FILE_TIME=$(date --utc +'%Y%m%d%H%M')" >> $GITHUB_ENV
+
+      - name: Check space usage
+        run: df -hT
+
+      - name: Compress build logs
+        if: always()
+        env:
+          TARGET: ${{ matrix.target }}
+          LOGS_DIR: ${{ env.BUILD_ROOT }}/logs
+        run: |
+          tar -cJvf logs-$TARGET.tar.xz $LOGS_DIR
+
+      - name: Cleanup OUT directory 
+        if: steps.compile.outputs.status == 'success'
+        env:
+          OUT_DIR: ${{ env.OUT_DIR }}
+        run: |
+          cd $OUT_DIR
+          echo "---------------------------"
+          ls -la
+          echo "---------------------------"
+          rm -rf packages
+          rm -f kernel-*
+          rm -f *uImage
+          rm -f *ubi-cleaner*
+          rm -f *-ram-*.bin
+
+      - name: Info
+        env:
+          OUT_DIR: ${{ env.OUT_DIR }}
+        run: |
+          echo "---------------------------"
+          ls -la $OUT_DIR
+          echo "---------------------------"
+
+      - name: Upload OUT directory
+        uses: actions/upload-artifact@main
+        if: steps.compile.outputs.status == 'success'
+        with:
+          name: openwrt-${{ env.BLD_VER }}-${{ env.FILE_DATE }}-${{ env.DEVICE_NAME }}
+          path: ${{ env.OUT_DIR }}
+          if-no-files-found: error
+
+      - name: Upload build logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: logs-${{ matrix.target }}
+          path: logs-*.tar.xz
+
+  release:
+    needs: [ check, build ]
+    permissions:
+      contents: write
+    runs-on: ubuntu-24.04
+    strategy:
+      max-parallel: 1
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: openwrt-*
+
+      - name: Put images into zip
+        env:
+          TAG: ${{ needs.check.outputs.tag }}
+          DATE: ${{ needs.check.outputs.date }}
+        run: |
+          mkdir -p public
+          find . -mindepth 1 -type d -name 'openwrt-*' -exec sh -c 'zip -0 ./public/$(basename {}).zip -j {} {}/*' \;
+          ls -lh ./public/*.zip
+
+      - name: Upload assets
+        uses: andelf/nightly-release@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: ${{ needs.check.outputs.tag }}
+        with:
+          prerelease: false
+          tag_name: ${{ needs.check.outputs.tag }}
+          name: '${{ needs.check.outputs.tag }}'
+          files: ./public/*.zip

_addons.config

@@ -36,19 +36,13 @@ CONFIG_FEED__alpine_fan_control=m
 ### luci-app-qbittorrent
 #GIT_PACKAGE luci-app-qbittorrent=https://github.com/openwrt-xiaomi/luci-app-qbittorrent.git master
 
-### luci-app-filebrowser
-#GIT_PACKAGE luci-app-filebrowser=https://github.com/openwrt-xiaomi/luci-app-filebrowser.git master
-
 ### luci-app-netspeedtest
 #GIT_PACKAGE luci-app-netspeedtest=https://github.com/openwrt-xiaomi/luci-app-netspeedtest.git master
 
 
-### luci-app-xray
-#GIT_PACKAGE luci-app-xray=https://github.com/yichya/luci-app-xray.git master
-
 
 ### AmneziaWG
-#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git
+#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-24.10
 CONFIG_FEED__amneziawg=m
 
 ### ruantiblock
@@ -60,6 +54,6 @@ CONFIG_FEED__ruantiblock=m
 CONFIG_FEED__podkop=m
 
 ### xwrt-packages
-#GIT_FEED _xwrt_packages=https://github.com/openwrt-xiaomi/xwrt-packages.git
+#GIT_FEED _xwrt_packages=https://github.com/x-wrt/com.x-wrt.git master
 CONFIG_FEED__xwrt_packages=m
 

_base.config

@@ -38,8 +38,11 @@ CONFIG_PACKAGE_mtd-utils=y
 CONFIG_PACKAGE_kmod-mtd-rw=y
 CONFIG_PACKAGE_iw-full=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_facinstall=y
@@ -51,7 +54,7 @@ CONFIG_PACKAGE_nano=y
 CONFIG_PACKAGE_ccrypt=y
 CONFIG_LIBCURL_PROXY=y
 CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_wget=y
+CONFIG_PACKAGE_wget-ssl=y
 CONFIG_PACKAGE_patch=y
 CONFIG_PACKAGE_diffutils=y
 CONFIG_PACKAGE_tree=y
@@ -109,6 +112,8 @@ CONFIG_PACKAGE_ppp-mod-pptp=y
 CONFIG_PACKAGE_kmod-tun=y
 CONFIG_PACKAGE_kmod-br-netfilter=y
 CONFIG_PACKAGE_gre=y
+CONFIG_PACKAGE_kmod-udptunnel4=y
+CONFIG_PACKAGE_kmod-udptunnel6=y
 
 ### Relay
 CONFIG_PACKAGE_relayd=y
@@ -126,17 +131,57 @@ CONFIG_PACKAGE_6rd=y
 ### IPv6 NAT support (ip6tables NAT extensions, ipt-nat6 and nf-nat6 kmods)
 ##CONFIG_PACKAGE_ip6tables-mod-nat=y
 
-### OpenSSL
+### Kernel crypt mods
-CONFIG_LIBCURL_OPENSSL=y
+CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=y
+CONFIG_PACKAGE_kmod-crypto-lib-chacha20=y
+CONFIG_PACKAGE_kmod-crypto-lib-poly1305=y
+CONFIG_PACKAGE_kmod-crypto-lib-curve25519=y
+CONFIG_PACKAGE_kmod-crypto-kpp=y
+CONFIG_PACKAGE_kmod-crypto-md4=y
+CONFIG_PACKAGE_kmod-crypto-md5=y
+CONFIG_PACKAGE_kmod-crypto-ecb=y
+CONFIG_PACKAGE_kmod-crypto-des=y
+CONFIG_PACKAGE_kmod-crypto-sha256=y
+CONFIG_PACKAGE_kmod-asn1-decoder=y
+
+### mbedTLS lib
+CONFIG_PACKAGE_libmbedtls=y
+CONFIG_MBEDTLS_AES_C=y
+CONFIG_MBEDTLS_CMAC_C=y
+CONFIG_MBEDTLS_DES_C=y
+CONFIG_MBEDTLS_GCM_C=y
+CONFIG_MBEDTLS_NIST_KW_C=y
+CONFIG_MBEDTLS_RSA_NO_CRT=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
+#CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED=y
+#CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED=y
+
+### OpenSSL lib
 CONFIG_PACKAGE_libopenssl=y
 CONFIG_PACKAGE_libopenssl-legacy=y
 #CONFIG_PACKAGE_libopenssl-devcrypto=y
 CONFIG_PACKAGE_openssl-util=y
+CONFIG_PACKAGE_libopenssl-conf=y
 CONFIG_PACKAGE_libwebsockets-full=y
-CONFIG_PACKAGE_libuhttpd-openssl=y
+CONFIG_OPENSSL_WITH_ASM=y
-
+CONFIG_OPENSSL_WITH_DEPRECATED=y
-### LuCI with HTTPS support (OpenSSL as SSL backend)
+CONFIG_OPENSSL_WITH_TLS13=y
-CONFIG_PACKAGE_luci-ssl-openssl=y
+#CONFIG_OPENSSL_WITH_DTLS=y
+CONFIG_OPENSSL_WITH_SRP=y
+CONFIG_OPENSSL_WITH_CMS=y
+CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
+#CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
+CONFIG_OPENSSL_WITH_PSK=y
+CONFIG_OPENSSL_WITH_IDEA=y
+CONFIG_OPENSSL_WITH_SEED=y
+CONFIG_OPENSSL_WITH_MDC2=y
+CONFIG_OPENSSL_WITH_WHIRLPOOL=y
 
 ### SSL certificates
 CONFIG_PACKAGE_ca-certificates=y
@@ -186,15 +231,10 @@ CONFIG_PACKAGE_collectd-mod-sensors=y
 CONFIG_PACKAGE_collectd-mod-uptime=y
 
 ### hostap
-#CONFIG_PACKAGE_hostapd-openssl=y
-#CONFIG_PACKAGE_hostapd-utils=y
-## https://forum.openwrt.org/t/wpad-vs-hostapd-wpa-supplicant/30844
-## WPAD included wpa-supplicant + hostapd
-CONFIG_PACKAGE_wpad-openssl=y
 CONFIG_WPA_RFKILL_SUPPORT=y
-#CONFIG_PACKAGE_wpa-supplicant-openssl=y
+
-## CONFIG_WPA_MSG_MIN_PRIORITY=2
+### DNSMasq
-## CONFIG_WPA_MSG_MIN_PRIORITY=4
+CONFIG_PACKAGE_dnsmasq-full=y
 
 ### BATMAN
 CONFIG_PACKAGE_kmod-batman-adv=y
@@ -237,6 +277,7 @@ CONFIG_PACKAGE_luci-app-natflow-users=y
 
 
 ### Disabled services
+#DISABLED_SVC=ksmbd
 #DISABLED_SVC=adblock
 #DISABLED_SVC=batmand
 #DISABLED_SVC=watchcat

_base_initrd.config

@@ -39,6 +39,8 @@ CONFIG_PACKAGE_iw=y
 CONFIG_PACKAGE_mc=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_facinstall=y

_samba.config

@@ -1,4 +1,7 @@
 ### Samba
-CONFIG_PACKAGE_luci-app-samba4=y
+CONFIG_PACKAGE_kmod-fs-smbfs-common=y
-CONFIG_PACKAGE_luci-i18n-samba4-ru=y
+CONFIG_PACKAGE_kmod-fs-ksmbd=y
-CONFIG_PACKAGE_samba4-utils=y
+CONFIG_PACKAGE_ksmbd-server=y
+CONFIG_PACKAGE_ksmbd-hotplug=y
+CONFIG_PACKAGE_luci-app-ksmbd=y
+CONFIG_PACKAGE_luci-i18n-ksmbd-ru=y

_vpn.config

@@ -1,16 +1,15 @@
 
-CONFIG_OPENVPN_openssl_ENABLE_DEF_AUTH=y
+CONFIG_OPENVPN_mbedtls_ENABLE_DEF_AUTH=y
-CONFIG_OPENVPN_openssl_ENABLE_FRAGMENT=y
+CONFIG_OPENVPN_mbedtls_ENABLE_FRAGMENT=y
-CONFIG_OPENVPN_openssl_ENABLE_LZ4=y
+CONFIG_OPENVPN_mbedtls_ENABLE_LZO=y
-CONFIG_OPENVPN_openssl_ENABLE_LZO=y
+CONFIG_OPENVPN_mbedtls_ENABLE_LZ4=y
-CONFIG_OPENVPN_openssl_ENABLE_MULTIHOME=y
+CONFIG_OPENVPN_mbedtls_ENABLE_PORT_SHARE=y
-CONFIG_OPENVPN_openssl_ENABLE_PF=y
+CONFIG_OPENVPN_mbedtls_ENABLE_SMALL=y
-CONFIG_OPENVPN_openssl_ENABLE_PORT_SHARE=y
-CONFIG_OPENVPN_openssl_ENABLE_SMALL=y
 
-CONFIG_PACKAGE_openvpn-openssl=y
+CONFIG_PACKAGE_openvpn-mbedtls=y
 CONFIG_PACKAGE_luci-app-openvpn=y
 CONFIG_PACKAGE_luci-i18n-openvpn-ru=y
+CONFIG_PACKAGE_openvpn-easy-rsa=y
 
 CONFIG_PACKAGE_kmod-veth=y
 CONFIG_PACKAGE_kmod-nft-tproxy=y
@@ -24,7 +23,6 @@ CONFIG_PACKAGE_luci-proto-wireguard=y
 
 CONFIG_PACKAGE_kmod-amneziawg=y
 CONFIG_PACKAGE_amneziawg-tools=y
-#CONFIG_PACKAGE_amneziawg-go=y
 CONFIG_PACKAGE_luci-proto-amneziawg=y
 
 CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
@@ -34,11 +32,6 @@ CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel=y
 CONFIG_PACKAGE_luci-app-shadowsocks-libev=y
 CONFIG_PACKAGE_luci-i18n-shadowsocks-libev-ru=y
 
-#CONFIG_PACKAGE_xray-core=y
-#CONFIG_PACKAGE_luci-app-xray=y
-#CONFIG_PACKAGE_v2ray-geoip=y
-#CONFIG_PACKAGE_v2ray-geosite=y
-
 CONFIG_PACKAGE_ruantiblock=y
 CONFIG_PACKAGE_ruantiblock-mod-lua=y
 #CONFIG_PACKAGE_ruantiblock-mod-py=y

dependencies-ubuntu.txt

@@ -0,0 +1 @@
+build-essential clang flex bison g++ gawk gcc-multilib g++-multilib gettext git libncurses5-dev libssl-dev python3-setuptools rsync swig unzip zlib1g-dev file wget

hook_prepare_rootfs.sh

@@ -43,6 +43,12 @@ get_param_q() {
 	#echo $( grep -o -P "(?<=^$param=').*(')" "$filename" 2>/dev/null )
 }
 
+get_param_qq() {
+	local param=$1
+	local filename="$2"
+	echo $( grep -o -P "^$param=\"\K[^\"]+" "$filename" 2>/dev/null | tr -d '\n' )
+}
+
 del_last_word() {
 	echo -n "${@:1:$#-1}"
 }
@@ -79,6 +85,22 @@ sed -i "/DISTRIB_DESCRIPTION=/d" "$FW_VER_FN"
 echo "DISTRIB_DESCRIPTION='$DISTR_DESC $CURDATE'" >> "$FW_VER_FN"
 log_msg "Option DISTRIB_DESCRIPTION patched (DATE = $CURDATE)"
 
+FW_OSVER_FN="$ROOTFSDIR/etc/os-release"
+[ ! -f "$FW_OSVER_FN" ] && die "File '/etc/os-release' not found!"
+FW_OSVER2_FN="$ROOTFSDIR/usr/lib/os-release"
+[ ! -f "$FW_OSVER2_FN" ] && die "File '/usr/lib/os-release' not found!"
+BUILD_ID=$( get_param_qq BUILD_ID "$FW_OSVER_FN" )
+PRETTY_NAME=$( get_param_qq PRETTY_NAME "$FW_OSVER_FN" )
+REL_NAME=$( get_param_qq OPENWRT_RELEASE "$FW_OSVER_FN" )
+
+sed -i "s/^BUILD_ID=.*/BUILD_ID=\"[$CURDATE] $BUILD_ID\"/g" "$FW_OSVER_FN"
+sed -i "s/^BUILD_ID=.*/BUILD_ID=\"[$CURDATE] $BUILD_ID\"/g" "$FW_OSVER2_FN"
+log_msg "Option BUILD_ID patched! BUILD_ID = '[$CURDATE] $BUILD_ID'"
+
+sed -i "s/^OPENWRT_RELEASE=.*/OPENWRT_RELEASE=\"$PRETTY_NAME [$CURDATE] $BUILD_ID\"/g" "$FW_OSVER_FN"
+sed -i "s/^OPENWRT_RELEASE=.*/OPENWRT_RELEASE=\"$PRETTY_NAME [$CURDATE] $BUILD_ID\"/g" "$FW_OSVER2_FN"
+log_msg "Option OPENWRT_RELEASE patched! OPENWRT_RELEASE = '$PRETTY_NAME [$CURDATE] $BUILD_ID'"
+
 BANNER_FN="$ROOTFSDIR/etc/banner"
 BANNER_VER=$( grep -F "$DISTR_REV" "$BANNER_FN" 2>/dev/null )
 if [ -n "$BANNER_VER" ]; then

kng_re.config

@@ -31,14 +31,6 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
-CONFIG_PACKAGE_wget-ssl=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-
 
 
 

r3d.config

@@ -31,6 +31,10 @@ 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
@@ -42,13 +46,6 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
-CONFIG_PACKAGE_wget-ssl=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
 ### CPU Freq
 CONFIG_PACKAGE_luci-app-cpufreq=y
 

r3g.config

@@ -31,14 +31,6 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
-CONFIG_PACKAGE_wget-ssl=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-
 
 
 

rb03.config

@@ -24,8 +24,5 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 #CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
 
 

rb06.config

@@ -24,8 +24,5 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 #CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
 
 

rd03.config

@@ -24,8 +24,6 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 #CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
 
 
 

rt-ax52.config

@@ -5,7 +5,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax52=y
 #include _addons.config
 #include _base.config
 #include _wifi_en.config
-#include _torrents.config
 #include _proxy.config
 #include _argon.config
 #include _vpn.config
@@ -16,6 +15,10 @@ CONFIG_PACKAGE_lm-sensors-detect=y
 CONFIG_PACKAGE_luci-app-temp-status=y
 CONFIG_PACKAGE_luci-i18n-temp-status-ru=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
@@ -27,12 +30,4 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
-CONFIG_PACKAGE_wget-ssl=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-
 

rt-ax52_initramfs.config

@@ -12,6 +12,3 @@ CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
 
 
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

rt-ax57m.config

@@ -1,13 +1,10 @@
 CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_routerich_ax3000=y
+CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax57m=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
@@ -18,15 +15,9 @@ CONFIG_PACKAGE_lm-sensors-detect=y
 CONFIG_PACKAGE_luci-app-temp-status=y
 CONFIG_PACKAGE_luci-i18n-temp-status-ru=y
 
-### HDD tools
+### Luci dashboard
-CONFIG_PACKAGE_smartmontools=y
+CONFIG_PACKAGE_luci-mod-dashboard=y
-CONFIG_PACKAGE_hdparm=y
+CONFIG_PACKAGE_luci-i18n-dashboard-ru=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
 
 ### Network Ports viewer
 CONFIG_PACKAGE_luci-app-tn-netports=y
@@ -39,13 +30,5 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
-CONFIG_PACKAGE_wget-ssl=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-
 
 

rt-ax57m_initramfs.config

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

rt-ax59u.config

@@ -29,6 +29,10 @@ 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
@@ -40,15 +44,8 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
+
-CONFIG_PACKAGE_wget-ssl=y
+
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-### CPU Freq
-CONFIG_PACKAGE_luci-app-cpufreq=y
 
 
 

rt-ax59u_initramfs.config

@@ -12,6 +12,3 @@ CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
 
 
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

rt-ax89x.config

@@ -34,6 +34,10 @@ 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
@@ -45,13 +49,6 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
-CONFIG_PACKAGE_wget-ssl=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
 ### CPU Freq
 CONFIG_PACKAGE_luci-app-cpufreq=y
 

rt-ax89x_initramfs.config

@@ -16,6 +16,4 @@ CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
 ### USB
 CONFIG_PACKAGE_kmod-usb-storage-uas=y
 
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
 

tuf_ax4200.config

@@ -29,6 +29,10 @@ 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
@@ -40,16 +44,3 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
-CONFIG_PACKAGE_wget-ssl=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-### CPU Freq
-CONFIG_PACKAGE_luci-app-cpufreq=y
-
-
-
-

tuf_ax4200_initramfs.config

@@ -11,7 +11,3 @@ CONFIG_TARGET_ROOTFS_INITRAMFS=y
 CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
 
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

tuf_ax6000.config

@@ -29,6 +29,10 @@ 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
@@ -40,16 +44,5 @@ CONFIG_PACKAGE_luci-i18n-sqm-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
-### FileBrowser
-CONFIG_PACKAGE_wget-ssl=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-### CPU Freq
-CONFIG_PACKAGE_luci-app-cpufreq=y
-
-
 
 

tuf_ax6000_initramfs.config

@@ -12,6 +12,3 @@ CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
 
 
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

xmake.sh

@@ -16,8 +16,9 @@ KALLSYMS=false
 TESTING_KERNEL=false
 BUILD_ONLY_INITRAMFS=false
 BUILD_SKIP_INITRAMFS=false
+CALL_MAKE=true
 
-while getopts "j:t:fiskT" opt; do
+while getopts "j:t:fiskTm" opt; do
 	case $opt in
 		j) MAKE_JOBS=$OPTARG;;
 		t) XTARGET=$OPTARG;;
@@ -26,6 +27,7 @@ while getopts "j:t:fiskT" opt; do
 		T) TESTING_KERNEL=true;;
 		i) BUILD_ONLY_INITRAMFS=true;;
 		s) BUILD_SKIP_INITRAMFS=true;;
+		m) CALL_MAKE=false;;
 	esac
 done
 
@@ -177,6 +179,19 @@ function build_target {
 		sed -i "/config statistics 'collectd_thermal'/{n; s/option enable '0'/option enable '1'/}" $LUCISTATCONF
 	fi
 
+	if [ 1 = 1 ]; then
+		########### disable some kmod from x-wrt packages ##########
+		sed -i 's/^CONFIG_PACKAGE_kmod-exfat-linux=/###CONFIG_PACKAGE_kmod-exfat-linux=/g' $CFG
+		sed -i 's/^CONFIG_PACKAGE_kmod-qmi-wwan-q=/###CONFIG_PACKAGE_kmod-qmi-wwan-q=/g' $CFG
+		sed -i 's/^CONFIG_PACKAGE_kmod-rtw8852cu=/###CONFIG_PACKAGE_kmod-rtw8852cu=/g' $CFG
+		sed -i 's/^CONFIG_PACKAGE_kmod-rproxy=/###CONFIG_PACKAGE_kmod-rproxy=/g' $CFG
+		sed -i 's/^CONFIG_PACKAGE_kmod-natcap=/###CONFIG_PACKAGE_kmod-natcap=/g' $CFG
+	fi
+
+	sed -i 's/^CONFIG_PACKAGE_base-config-setting=/###CONFIG_PACKAGE_base-config-setting=/g' $CFG
+	sed -i 's/^CONFIG_BASE_CONFIG_SETTING_LUCI_LOGIN=/###CONFIG_BASE_CONFIG_SETTING_LUCI_LOGIN=/g' $CFG
+	sed -i 's/^CONFIG_PACKAGE_base-config-setting-ext4fs=/###CONFIG_PACKAGE_base-config-setting-ext4fs=/g' $CFG
+
 	XWRTDIR=$XDIR/package/feeds/_xwrt_packages
 	if [ -d $XWRTDIR ]; then
 		[ -f $XWRTDIR/natflow/files/hostacl.config ] && sed -i 's/192.168.15./192.168.1./g' $XWRTDIR/natflow/files/hostacl.config
@@ -186,6 +201,24 @@ function build_target {
 		[ -f $XWRTJSDIR/network/hostacl.js         ] && sed -i 's/192.168.15./192.168.1./g' $XWRTJSDIR/network/hostacl.js
 		[ -f $XWRTJSDIR/network/natflow-qos.js     ] && sed -i 's/192.168.15./192.168.1./g' $XWRTJSDIR/network/natflow-qos.js
 		[ -f $XWRTJSDIR/system/natflow-users.js    ] && sed -i 's/192.168.15./192.168.1./g' $XWRTJSDIR/system/natflow-users.js
+		USERS_MENU=$XWRTDIR/luci-app-natflow-users/root/usr/share/luci/menu.d/luci-app-natflow-users.json
+		if [ -f $USERS_MENU ]; then
+			if grep -q -F '"admin/system/users": {' $USERS_MENU ; then
+				sed -i '/"admin\/system\/users": {/i "admin\/system\/users"  :  {' $USERS_MENU
+				sed -i '/"admin\/system\/users": {/,+2d' $USERS_MENU
+				sed -i '/"admin\/system\/users"  :  {/a "order": 89,' $USERS_MENU
+				sed -i '/"admin\/system\/users"  :  {/a "title": "Users",' $USERS_MENU
+			fi
+		fi
+	fi	
+	
+	NTFS3G=$XDIR/package/feeds/packages/ntfs-3g/Makefile
+	if [ -f $NTFS3G ]; then
+		if grep -q -F '$(INSTALL_DIR) $(1)/usr/{bin,sbin}' $NTFS3G ; then
+			sed -i  '/\$(INSTALL_DIR) \$(1)\/usr\/{bin,sbin}/a \\t\$(INSTALL_DIR) \$(1)\/usr\/bin' $NTFS3G
+			sed -i  '/\$(INSTALL_DIR) \$(1)\/usr\/{bin,sbin}/a \\t\$(INSTALL_DIR) \$(1)\/usr\/sbin' $NTFS3G
+			sed -i 's/\$(INSTALL_DIR) \$(1)\/usr\/{bin,sbin}/#\$(INSTALL_DIR) \$(1)\/usr\/__bin_sbin__/g' $NTFS3G
+		fi
 	fi
 
 	OPKG_DIR=$XDIR/files/etc/opkg
@@ -207,7 +240,7 @@ function build_target {
 		echo "$fant_pkgs" >> $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>>/23.05/g" $OPKG_CFEED_FN
+		sed -i "s/<<VER>>/24.10/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
@@ -231,6 +264,8 @@ function build_target {
 	#make tools/install -j$make_jobs
 	#make toolchain/install -j$make_jobs
 
+	[ "$CALL_MAKE" = "false" ] && return 0
+
 	make -j $make_jobs download world
 }
 

xupdate.sh

@@ -37,7 +37,7 @@ git fetch
 [ "$?" != "0" ] && die "Can't fetch current repository"
 
 git pull --force "origin" &> /dev/null 
-#[ "$?" != "0" ] && die "Can't pull current repository"
+[ "$?" != "0" ] && die "Can't pull current repository"
 
 CUR_BRANCH=$( git rev-parse --abbrev-ref HEAD )
 
@@ -145,7 +145,6 @@ fi
 if [ "$OPT_FULL_UPDATE" = "true" ]; then
 	if [ -f "$XDIR/vermagic_update.sh" ]; then
 		./vermagic_update.sh ipq806x generic
-		./vermagic_update.sh ipq807x generic
 		./vermagic_update.sh qualcommax ipq807x
 		./vermagic_update.sh ramips mt7621
 		./vermagic_update.sh mediatek mt7622