adsnj

.github/FUNDING.yml

@@ -0,0 +1,31 @@
+# These are supported funding model platforms
+
+# Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github:
+
+# Replace with a single Patreon username
+patreon:
+
+# Replace with a single Open Collective username
+open_collective:
+
+# Replace with a single Ko-fi username
+ko_fi:
+
+# Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+tidelift:
+
+# Replace with a single Community Bridge project-name e.g., cloud-foundry
+community_bridge:
+
+# Replace with a single Liberapay username
+liberapay:
+
+# Replace with a single IssueHunt username
+issuehunt:
+
+# Replace with a single Otechie username
+otechie:
+
+# Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://github.com/remittor/donate']

.github/workflows/build.yml

@@ -0,0 +1,300 @@
+name: build
+
+on:
+  workflow_dispatch:
+    inputs:
+      fake_build:
+        description: 'Fake build'
+        required: true
+        default: 'false'
+        type: choice
+        options:
+        - true
+        - false
+      suffix:
+        description: 'TAG suffix'
+        required: false
+        default: ''
+        type: string
+
+env:
+  FAKE_BUILD: ${{ github.event.inputs.fake_build }}
+  REPO_URL: https://github.com/openwrt-xiaomi/openwrt
+  REPO_LNK: openwrt-xiaomi/openwrt
+  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
+  REPO_DATE: unknown
+  FW_DATE: unknown
+  FW_VER: 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 }}
+      build_date: ${{ steps.gh.outputs.build_date }}
+      fw_date: ${{ steps.gh.outputs.fw_date }}
+      fw_ver: ${{ steps.gh.outputs.fw_ver }}
+      is_active: ${{ steps.activity.outputs.is_active }}
+    steps:
+      - name: Get repo data via GH API
+        id: gh
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Tag name from GITHUB_REF_NAME: $GITHUB_REF_NAME"
+          echo "Tag name from github.ref_name: ${{ github.ref_name }}"
+          BRANCH=$REPO_BRANCH
+          REPO_DATE=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.commit.committer.date')
+          BUILD_DATE=$( date --utc +'%y%m%d' )
+          FW_DATE=$( date --utc +'%Y-%m-%d' )
+          TAG=$TAG_PREFIX$BUILD_DATE
+          echo "REPO_DATE=$REPO_DATE" >> $GITHUB_ENV
+          echo "BUILD_DATE=$BUILD_DATE" >> $GITHUB_ENV
+          echo "FW_DATE=$FW_DATE" >> $GITHUB_ENV
+          echo "TAG=$TAG" >> $GITHUB_ENV
+          wget $REPO_URL/raw/refs/heads/$BRANCH/include/version.mk
+          FW_VERSION=$( grep -s '^VERSION_NUMBER:=$(if' version.mk 2>/dev/null )
+          [ -z "$FW_VERSION" ] && { echo "ERROR: Cannot find VERSION_NUMBER"; exit 90; }
+          FW_VER=$( echo $FW_VERSION | cut -d"," -f3 | cut -d")" -f1 )
+          echo 'FW_VER = "'$FW_VER'"'
+          echo "FW_VER=$FW_VER" >> $GITHUB_ENV
+          rm -f version.mk
+          {
+            echo "tag=$TAG"
+            echo "date=$(date --utc -d $REPO_DATE +%Y%m%d)"
+            echo "sha=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.sha[0:7]')"
+            echo "url=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.html_url')"
+            echo "message<<EOF"
+            gh api repos/$REPO_LNK/commits/$BRANCH --jq '.commit.message'
+            echo EOF
+            echo "build_date=$BUILD_DATE"
+            echo "fw_date=$FW_DATE"
+            echo "fw_ver=$FW_VER"
+          } >> $GITHUB_OUTPUT
+
+      - name: Check for repo activity
+        id: activity
+        env:
+          REPO_DATE: ${{ env.REPO_DATE }}
+          URL: ${{ steps.gh.outputs.url }}
+        run: |
+          TIMESTAMP=$(date --utc -d $REPO_DATE +%s)
+          DAYS=$(( ( $(date --utc +%s) - $TIMESTAMP ) / 86400 ))
+          echo "Repository activity: $(date --utc -d $REPO_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
+          - r3p
+          - rb03
+          - rb06
+          - rd03
+          - rt-ax52
+          - rt-ax57m
+          - rt-ax59u
+          - rt-ax89x
+          - tuf_ax4200
+          - tuf_ax6000
+          - zen-bt8
+    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.git $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
+        id: update
+        run: |
+          cd $BUILD_ROOT && ./xupdate.sh -f
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Build the firmware image
+        id: compile
+        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
+          ./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
+          G_BOARD_NAME=$( grep -so '^CONFIG_TARGET_BOARD=.*' .config | cut -d'"' -f2 )
+          [ -z "$G_BOARD_NAME" ] && exit 32
+          G_SUBTARGET_NAME=$( grep -so '^CONFIG_TARGET_SUBTARGET=.*' .config | cut -d'"' -f2 )
+          [ -z "$G_SUBTARGET_NAME" ] && exit 33
+          VERMAGIC_LIST="vermagic-$G_BOARD_NAME-$G_SUBTARGET_NAME-*.list"
+          if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
+              ./vermagic_update.sh $G_BOARD_NAME $G_SUBTARGET_NAME
+          fi
+          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
+          # 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
+              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"
+              ls -la
+              BLD_VER=$FW_VER
+          else
+              BLD_VER=$( cat $OUT_DIR/profiles.json | grep -so '"version_number":"[^"]*' | grep -so '[^"]*$' )
+          fi
+          echo "Firmware $BLD_VER [$FILE_DATE] builded!"
+          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=$G_DEVICE_NAME" >> $GITHUB_ENV
+          echo "BOARD_NAME=$G_BOARD_NAME" >> $GITHUB_ENV
+          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
+
+      - name: Compress build logs
+        if: always()
+        env:
+          TARGET: ${{ matrix.target }}
+          FW_DATE: ${{ needs.check.outputs.fw_date }}
+          LOGS_DIR: ${{ env.BUILD_ROOT }}/logs
+        run: |
+          tar -cJvf logs-$TARGET-$FW_DATE.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
+          rm -f *-preloader*
+          rm -f *-bl31-uboot*
+          rm -f *-initramfs-recovery*
+          rm -f *-bt8-factory.bin
+
+      - name: Upload OUT directory
+        uses: actions/upload-artifact@main
+        if: steps.compile.outputs.status == 'success'
+        with:
+          name: openwrt-${{ env.BLD_VER }}-${{ needs.check.outputs.build_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 }}-${{ env.FW_DATE }}
+          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
+        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 }}'
+          body: |
+            OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]
+            author: [remittor](https://github.com/remittor)
+          files: ./public/*.zip

README.md

@@ -1,3 +1,8 @@
+[![Github All Releases](https://img.shields.io/github/downloads/openwrt-xiaomi/builder/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
 
 For OpenWrt >= 21.02
@@ -13,11 +18,11 @@ sudo apt-get install python3-distutils rsync unzip zlib1g-dev
 ## Build firmware
 
 ```
-git clone https://github.com/openwrt-xiaomi/builder -b v23 openwrt-v23
-cd openwrt-v23
+git clone https://github.com/openwrt-xiaomi/builder -b v24 openwrt-v24
+cd openwrt-v24
 
-./xcreate.sh -v xq-23.05.0
-cd xq-23.05.0
+./xcreate.sh -v xq-24.10
+cd xq-24.10
 
 ./xupdate.sh -f
 

_addons.config

@@ -7,7 +7,7 @@
 
 ### alpine-fan-control
 #GIT_FEED _alpine_fan_control=https://github.com/openwrt-xiaomi/openwrt-alpine-fan-control.git
-CONFIG_FEED__alpine_fan_control=m
+#CONFIG_FEED__alpine_fan_control=m
 
 ### luci-app-temp-status
 #GIT_PACKAGE luci-app-temp-status=https://github.com/openwrt-xiaomi/luci-app-temp-status.git master
@@ -36,21 +36,19 @@ 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
 
+### Zapret
+#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git
+CONFIG_FEED__zapret=m
+
 ### ruantiblock
 #GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git
 CONFIG_FEED__ruantiblock=m
@@ -60,6 +58,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
 

_addons_nss.config

@@ -1,48 +0,0 @@
-
-
-### For NON compatible official firmwares!!!
-CONFIG_KERNEL_KALLSYMS=y
-#CONFIG_KERNEL_DEBUG_INFO=y
-#CONFIG_KERNEL_DEBUG_INFO_REDUCED=y
-#CONFIG_KERNEL_DEBUG_KERNEL=y
-
-
-CONFIG_PACKAGE_kmod-bonding=y
-CONFIG_PACKAGE_proto-bonding=y
-CONFIG_PACKAGE_luci-proto-bonding=y
-
-
-### NSS Drivers
-#GIT_FEED nss=https://github.com/openwrt-xiaomi/nss-packages.git;NSS-11.2-K5.15
-CONFIG_FEED_nss=m
-
-CONFIG_PACKAGE_MAC80211_NSS_SUPPORT=y
-
-CONFIG_PACKAGE_kmod-qca-nss-gmac=y
-CONFIG_PACKAGE_kmod-qca-nss-ecm-standard=y
-CONFIG_PACKAGE_kmod-qca-nss-drv=y
-CONFIG_PACKAGE_kmod-qca-nss-drv-qdisc=y
-CONFIG_PACKAGE_kmod-qca-nss-drv-pppoe=y
-CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2=y
-CONFIG_PACKAGE_kmod-qca-nss-drv-tunipip6=y
-CONFIG_PACKAGE_kmod-qca-nss-drv-igs=y
-CONFIG_PACKAGE_kmod-qca-nss-drv-pptp=y
-
-#CONFIG_PACKAGE_kmod-qca-mcs=y
-#CONFIG_PACKAGE_kmod-qca-nat46=y
-
-##CONFIG_PACKAGE_kmod-qca-nss-ecm=y
-##CONFIG_PACKAGE_kmod-qca-nss-ecm-noload is not set
-
-##CONFIG_PACKAGE_kmod-qca-nss-cfi-cryptoapi=y
-CONFIG_PACKAGE_kmod-qca-nss-crypto=y
-CONFIG_PACKAGE_kmod-nss-ifb=y
-
-#CONFIG_PACKAGE_nssinfo=y
-
-
-### sqm-scripts-nss (by KONG)
-#GIT_FEED sqm_scripts_nss=https://github.com/openwrt-xiaomi/sqm-scripts-nss.git
-CONFIG_FEED_sqm_scripts_nss=m
-CONFIG_PACKAGE_sqm-scripts-nss=y
-

_argon.config

@@ -1,3 +1,3 @@
 ### Argon Theme
-CONFIG_PACKAGE_luci-theme-argon=y
-CONFIG_PACKAGE_luci-app-argon-config=y
+#CONFIG_PACKAGE_luci-theme-argon=y
+#CONFIG_PACKAGE_luci-app-argon-config=y

_base.config

@@ -14,8 +14,8 @@ CONFIG_COLLECT_KERNEL_DEBUG=y
 CONFIG_BUILD_LOG=y
 
 ### Kernel debug tools
-CONFIG_PACKAGE_kmod-pstore=y
-CONFIG_PACKAGE_kmod-ramoops=y
+#CONFIG_PACKAGE_kmod-pstore=y
+#CONFIG_PACKAGE_kmod-ramoops=y
 
 ### Include package list in build
 CONFIG_INCLUDE_CONFIG=y
@@ -33,67 +33,71 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_WINCH=y
 ### System utils
 CONFIG_DROPBEAR_ECC=y
 CONFIG_PACKAGE_dropbear=y
-CONFIG_PACKAGE_uboot-envtools=y
+#CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_mtd-utils=y
 CONFIG_PACKAGE_kmod-mtd-rw=y
 CONFIG_PACKAGE_iw-full=y
-CONFIG_PACKAGE_mc=y
-CONFIG_PACKAGE_luci-app-ttyd=y
-CONFIG_PACKAGE_luci-i18n-ttyd-ru=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
+#CONFIG_PACKAGE_facinstall=y
 
 ### Add-on programs
 CONFIG_PACKAGE_iperf3=y
-CONFIG_PACKAGE_htop=y
-CONFIG_PACKAGE_nano=y
-CONFIG_PACKAGE_ccrypt=y
-CONFIG_LIBCURL_PROXY=y
+#CONFIG_PACKAGE_htop=y
+#CONFIG_PACKAGE_nano=y
+#CONFIG_PACKAGE_ccrypt=y
+#CONFIG_LIBCURL_PROXY=y
 CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_wget=y
-CONFIG_PACKAGE_patch=y
-CONFIG_PACKAGE_diffutils=y
-CONFIG_PACKAGE_tree=y
-CONFIG_PACKAGE_irqbalance=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_zlib=y
-CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_wget-ssl=y
+#CONFIG_PACKAGE_patch=y
+#CONFIG_PACKAGE_diffutils=y
+#CONFIG_PACKAGE_tree=y
+#CONFIG_PACKAGE_irqbalance=y
+#CONFIG_PACKAGE_terminfo=y
+#CONFIG_PACKAGE_zlib=y
+#CONFIG_PACKAGE_ethtool=y
+#CONFIG_PACKAGE_coreutils-cksum=y
 
 ### USB device mount & file systems support
-CONFIG_PACKAGE_gdisk=y
-CONFIG_PACKAGE_parted=y
-CONFIG_PACKAGE_e2fsprogs=y
-CONFIG_PACKAGE_usbutils=y
-CONFIG_PACKAGE_block-mount=y
-CONFIG_PACKAGE_libblkid=y
-CONFIG_PACKAGE_blkid=y
-CONFIG_PACKAGE_lsblk=y
-CONFIG_PACKAGE_lsblk=y
-CONFIG_PACKAGE_kmod-usb-storage=y
-CONFIG_PACKAGE_kmod-fs-cifs=y
-CONFIG_PACKAGE_kmod-fs-exfat=y
-CONFIG_PACKAGE_kmod-fs-ext4=y
-CONFIG_PACKAGE_kmod-fs-hfsplus=y
-CONFIG_PACKAGE_kmod-fs-msdos=y
-CONFIG_PACKAGE_kmod-fs-vfat=y
-CONFIG_PACKAGE_kmod-fs-f2fs=y
-CONFIG_PACKAGE_kmod-fs-ntfs=y
-CONFIG_PACKAGE_kmod-fs-squashfs=y
-CONFIG_PACKAGE_kmod-nls-cp1250=y
-CONFIG_PACKAGE_kmod-nls-cp437=y
-CONFIG_PACKAGE_kmod-nls-cp850=y
-CONFIG_PACKAGE_kmod-nls-iso8859-1=y
-CONFIG_PACKAGE_kmod-nls-iso8859-15=y
-CONFIG_PACKAGE_kmod-nls-utf8=y
+#CONFIG_PACKAGE_gdisk=y
+#CONFIG_PACKAGE_parted=y
+#CONFIG_PACKAGE_e2fsprogs=y
+#CONFIG_PACKAGE_usbutils=y
+#CONFIG_PACKAGE_block-mount=y
+#CONFIG_PACKAGE_libblkid=y
+#CONFIG_PACKAGE_blkid=y
+#CONFIG_PACKAGE_lsblk=y
+#CONFIG_PACKAGE_lsblk=y
+#CONFIG_PACKAGE_kmod-usb-storage=y
+#CONFIG_PACKAGE_kmod-fs-cifs=y
+#CONFIG_PACKAGE_kmod-fs-exfat=y
+#CONFIG_PACKAGE_kmod-fs-ext4=y
+#CONFIG_PACKAGE_kmod-fs-hfsplus=y
+#CONFIG_PACKAGE_kmod-fs-msdos=y
+#CONFIG_PACKAGE_kmod-fs-vfat=y
+#CONFIG_PACKAGE_kmod-fs-f2fs=y
+#CONFIG_PACKAGE_kmod-fs-ntfs=y
+#CONFIG_PACKAGE_kmod-fs-squashfs=y
+#CONFIG_PACKAGE_kmod-nls-cp1250=y
+#CONFIG_PACKAGE_kmod-nls-cp437=y
+#CONFIG_PACKAGE_kmod-nls-cp850=y
+#CONFIG_PACKAGE_kmod-nls-iso8859-1=y
+#CONFIG_PACKAGE_kmod-nls-iso8859-15=y
+#CONFIG_PACKAGE_kmod-nls-utf8=y
 
 ### WAN proto
-CONFIG_PACKAGE_kmod-tls=y
-CONFIG_PACKAGE_kmod-l2tp=y
-CONFIG_PACKAGE_kmod-pppol2tp=y
-CONFIG_PACKAGE_kmod-pppoe=y
-CONFIG_PACKAGE_kmod-pptp=y
-CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
+#CONFIG_PACKAGE_kmod-tls=y
+#CONFIG_PACKAGE_kmod-l2tp=y
+#CONFIG_PACKAGE_kmod-pppol2tp=y
+#CONFIG_PACKAGE_kmod-pppoe=y
+#CONFIG_PACKAGE_kmod-pptp=y
+#CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
 
 ### IPsec
 #CONFIG_PACKAGE_kmod-ipsec=y
@@ -102,21 +106,23 @@ CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
 #CONFIG_PACKAGE_kmod-crypto-authenc=y
 
 ### PPTP support
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_ppp-mod-pptp=y
+#CONFIG_PACKAGE_luci-proto-ppp=y
+#CONFIG_PACKAGE_ppp-mod-pptp=y
 
 ### kernel support for tunnels, VPNs
 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
-CONFIG_PACKAGE_luci-proto-relay=y
+#CONFIG_PACKAGE_relayd=y
+#CONFIG_PACKAGE_luci-proto-relay=y
 
 ### Luci proto
-CONFIG_PACKAGE_luci-proto-3g=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
+#CONFIG_PACKAGE_luci-proto-3g=y
+#CONFIG_PACKAGE_luci-proto-ipv6=y
 
 ### IPv6 support
 CONFIG_PACKAGE_6in4=y
@@ -126,17 +132,58 @@ CONFIG_PACKAGE_6rd=y
 ### IPv6 NAT support (ip6tables NAT extensions, ipt-nat6 and nf-nat6 kmods)
 ##CONFIG_PACKAGE_ip6tables-mod-nat=y
 
-### OpenSSL
-CONFIG_LIBCURL_OPENSSL=y
+### Kernel crypt mods
+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
+CONFIG_PACKAGE_kmod-lib-crc16=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
-
-### LuCI with HTTPS support (OpenSSL as SSL backend)
-CONFIG_PACKAGE_luci-ssl-openssl=y
+CONFIG_OPENSSL_WITH_ASM=y
+CONFIG_OPENSSL_WITH_DEPRECATED=y
+CONFIG_OPENSSL_WITH_TLS13=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,21 +233,23 @@ 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
-## CONFIG_WPA_MSG_MIN_PRIORITY=4
+
+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y
 
 ### BATMAN
 CONFIG_PACKAGE_kmod-batman-adv=y
 CONFIG_PACKAGE_batctl-full=y
 CONFIG_PACKAGE_luci-proto-batman-adv=y
-CONFIG_PACKAGE_batmand=y
+#CONFIG_PACKAGE_batmand=y
+CONFIG_PACKAGE_libwolfssl=y
+CONFIG_PACKAGE_librt=y
+CONFIG_PACKAGE_wpad-basic-mbedtls=n
+CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+CONFIG_WOLFSSL_HAS_NO_HW=y
+CONFIG_WPA_WOLFSSL=y
+CONFIG_PACKAGE_kmod-lib-crc-ccitt=y
 
 ### Wake On Lan
 ##CONFIG_PACKAGE_luci-app-wol=y
@@ -211,8 +260,8 @@ CONFIG_PACKAGE_luci-app-watchcat=y
 CONFIG_PACKAGE_luci-i18n-watchcat-ru=y
 
 ### IP Tables tool
-CONFIG_PACKAGE_kmod-ipt-ipopt=y
-CONFIG_PACKAGE_iptables-mod-ipopt=y
+#CONFIG_PACKAGE_kmod-ipt-ipopt=y
+#CONFIG_PACKAGE_iptables-mod-ipopt=y
 
 ### Adblock package with Luci support
 CONFIG_PACKAGE_adblock=y
@@ -235,8 +284,8 @@ CONFIG_PACKAGE_natflow-hostacl=y
 CONFIG_PACKAGE_urllogger=y
 CONFIG_PACKAGE_luci-app-natflow-users=y
 
-
 ### Disabled services
+#DISABLED_SVC=ksmbd
 #DISABLED_SVC=adblock
 #DISABLED_SVC=batmand
 #DISABLED_SVC=watchcat

_base_initrd.config

@@ -1,80 +0,0 @@
-CONFIG_FEED_luci=y
-CONFIG_FEED_packages=y
-CONFIG_FEED_routing=y
-CONFIG_FEED_telephony=y
-
-### For compatible official firmwares
-CONFIG_ALL_KMODS=y
-CONFIG_ALL_NONSHARED=y
-CONFIG_DEVEL=y
-CONFIG_KERNEL_KALLSYMS=n
-CONFIG_COLLECT_KERNEL_DEBUG=y
-
-### Per-package build logs in <buildroot>/logs
-CONFIG_BUILD_LOG=y
-
-### Kernel debug tools
-CONFIG_PACKAGE_kmod-pstore=y
-CONFIG_PACKAGE_kmod-ramoops=y
-
-### Include package list in build
-CONFIG_INCLUDE_CONFIG=y
-
-### Busybox
-CONFIG_PACKAGE_busybox=y
-CONFIG_BUSYBOX_CUSTOM=y
-##CONFIG_BUSYBOX_CONFIG_DIFF=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_FLAGS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_REGEXP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_WINCH=y
-
-### System utils
-CONFIG_DROPBEAR_ECC=y
-CONFIG_PACKAGE_dropbear=y
-CONFIG_PACKAGE_uboot-envtools=y
-CONFIG_PACKAGE_mtd-utils=y
-CONFIG_PACKAGE_iw=y
-CONFIG_PACKAGE_mc=y
-CONFIG_PACKAGE_luci-app-ttyd=y
-CONFIG_PACKAGE_luci-i18n-ttyd-ru=y
-CONFIG_PACKAGE_atftp=y
-#CONFIG_PACKAGE_atftpd=y
-CONFIG_PACKAGE_facinstall=y
-
-CONFIG_PACKAGE_kmod-mtd-rw=y
-#CONFIG_PACKAGE_kmod-mtdoops=y
-#CONFIG_PACKAGE_kmod-mtdram=y
-#CONFIG_PACKAGE_kmod-mtdtests=y
-
-### Add-on programs
-CONFIG_PACKAGE_iperf3=y
-CONFIG_PACKAGE_htop=y
-CONFIG_PACKAGE_nano=y
-CONFIG_PACKAGE_ccrypt=y
-CONFIG_PACKAGE_wget=y
-CONFIG_PACKAGE_patch=y
-CONFIG_PACKAGE_diffutils=y
-CONFIG_PACKAGE_tree=y
-CONFIG_PACKAGE_irqbalance=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_zlib=y
-CONFIG_PACKAGE_ethtool=y
-
-### Luci
-CONFIG_LUCI_LANG_en=y
-CONFIG_LUCI_LANG_ru=y
-CONFIG_PACKAGE_luci=y
-CONFIG_PACKAGE_luci-compat=y
-CONFIG_PACKAGE_luci-base=y
-CONFIG_PACKAGE_luci-i18n-base-ru=y
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-mod-network=y
-CONFIG_PACKAGE_luci-mod-status=y
-CONFIG_PACKAGE_luci-mod-system=y
-CONFIG_PACKAGE_luci-app-commands=y
-CONFIG_PACKAGE_luci-i18n-commands-ru=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-i18n-opkg-ru=y
-

_printer.config

@@ -1,5 +0,0 @@
-### USB Printer support
-CONFIG_PACKAGE_kmod-usb-printer=y
-CONFIG_PACKAGE_p910nd=y
-CONFIG_PACKAGE_luci-app-p910nd=y
-CONFIG_PACKAGE_luci-i18n-app-p910nd-ru=y

_proxy.config

@@ -1,9 +1,15 @@
 ### DNS and Proxy
-CONFIG_PACKAGE_luci-app-nextdns=y
-CONFIG_PACKAGE_luci-i18n-nextdns-ru=y
+#CONFIG_PACKAGE_luci-app-nextdns=y
+#CONFIG_PACKAGE_luci-i18n-nextdns-ru=y
 
 CONFIG_PACKAGE_https-dns-proxy=y
 CONFIG_PACKAGE_luci-app-https-dns-proxy=y
 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

_samba.config

@@ -1,4 +0,0 @@
-### Samba
-CONFIG_PACKAGE_luci-app-samba4=y
-CONFIG_PACKAGE_luci-i18n-samba4-ru=y
-CONFIG_PACKAGE_samba4-utils=y

_torrents.config

@@ -1,11 +0,0 @@
-### Torrent clients
-CONFIG_PACKAGE_transmission-daemon=y
-CONFIG_PACKAGE_transmission-web=y
-CONFIG_PACKAGE_transmission-remote=y
-CONFIG_PACKAGE_luci-app-transmission=y
-CONFIG_PACKAGE_luci-i18n-transmission-ru=y
-
-CONFIG_PACKAGE_luci-app-minidlna=y
-CONFIG_PACKAGE_luci-i18n-minidlna-ru=y
-
-

_vpn.config

@@ -1,16 +1,15 @@
 
-CONFIG_OPENVPN_openssl_ENABLE_DEF_AUTH=y
-CONFIG_OPENVPN_openssl_ENABLE_FRAGMENT=y
-CONFIG_OPENVPN_openssl_ENABLE_LZ4=y
-CONFIG_OPENVPN_openssl_ENABLE_LZO=y
-CONFIG_OPENVPN_openssl_ENABLE_MULTIHOME=y
-CONFIG_OPENVPN_openssl_ENABLE_PF=y
-CONFIG_OPENVPN_openssl_ENABLE_PORT_SHARE=y
-CONFIG_OPENVPN_openssl_ENABLE_SMALL=y
+#CONFIG_OPENVPN_mbedtls_ENABLE_DEF_AUTH=y
+#CONFIG_OPENVPN_mbedtls_ENABLE_FRAGMENT=y
+#CONFIG_OPENVPN_mbedtls_ENABLE_LZO=y
+#CONFIG_OPENVPN_mbedtls_ENABLE_LZ4=y
+#CONFIG_OPENVPN_mbedtls_ENABLE_PORT_SHARE=y
+#CONFIG_OPENVPN_mbedtls_ENABLE_SMALL=y
 
-CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_luci-app-openvpn=y
-CONFIG_PACKAGE_luci-i18n-openvpn-ru=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
@@ -47,3 +40,4 @@ CONFIG_PACKAGE_luci-i18n-ruantiblock-ru=y
 
 CONFIG_PACKAGE_podkop=y
 CONFIG_PACKAGE_luci-app-podkop=y
+CONFIG_PACKAGE_luci-i18n-podkop-ru=y

_wifi_en.config

@@ -1,6 +1,6 @@
 ### WiFi default config
 CONFIG_PACKAGE_MAC80211_ENABLE=y
 CONFIG_PACKAGE_MAC80211_COUNTRY="US"
-#CONFIG_PACKAGE_MAC80211_SSID=""
+CONFIG_PACKAGE_MAC80211_SSID="lev"
 CONFIG_PACKAGE_MAC80211_ENCRYPTION="psk2"
-CONFIG_PACKAGE_MAC80211_PASSWORD="12345678"
+CONFIG_PACKAGE_MAC80211_PASSWORD="fuckingwep"

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

@@ -1,128 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-ROOTFSDIR="$1"
-TOPDIR="$2"
-OUTDIR=
-
-[ -z "$OUTDIR" ] && OUTDIR=$TOPDIR
-
-if [ -t 8 ]; then
-	BUILD_STATE=true
-	OUTPUT_PIPE=8
-else
-	BUILD_STATE=false
-	OUTPUT_PIPE=2
-fi
-
-log_msg() {
-	printf "%s\n" "$1" >&$OUTPUT_PIPE
-}
-
-log_err() {
-	local msg="$1"
-	local _Y _R _N
-	if [ "$IS_TTY" == "1" -a "$NO_COLOR" != "1" ]; then
-		_Y=\\033[33m
-		_R=\\033[31m
-		_N=\\033[m
-	fi
-	printf "$_R%s$_N\n" "ERROR: $msg" >&$OUTPUT_PIPE
-}
-
-die() {
-	log_err "$1"
-	exit 1
-}
-
-get_param_q() {
-	local param=$1
-	local filename="$2"
-	echo $( grep -o -P "^$param='\K[^']+" "$filename" 2>/dev/null | tr -d '\n' )
-	#echo $( grep -o -P "(?<=^$param=').*(')" "$filename" 2>/dev/null )
-}
-
-del_last_word() {
-	echo -n "${@:1:$#-1}"
-}
-
-
-log_msg "hook_prepare_rootfs.sh"
-#log_msg "TOPDIR: '$TOPDIR'"
-#log_msg "ROOTFSDIR: '$ROOTFSDIR'"
-
-if [ ! -d "$ROOTFSDIR" ]; then
-	die "RootFS dir not found!"
-fi
-
-FW_VER_FN="$ROOTFSDIR/etc/openwrt_release"
-if [ ! -f "$FW_VER_FN" ]; then
-	die "File '/etc/openwrt_release' not found!"
-fi
-
-FULL_VERSION=$( get_param_q DISTRIB_RELEASE "$FW_VER_FN" )
-#log_msg "FULL_VERSION: '$FULL_VERSION'"
-if [ -z "$FULL_VERSION" ]; then
-	die "Firmware version not found!"
-fi
-
-CURDATE=$( date --utc +%y%m%d | tr -d '\n' )
-
-DISTR_REV=$( get_param_q DISTRIB_REVISION "$FW_VER_FN" )
-DISTR_DESC=$( get_param_q DISTRIB_RELEASE "$FW_VER_FN" )
-DISTR_DATE_LEN=$( echo -n "$DISTR_DESC" | awk '{print $NF}' | tr -d '\n' | wc -c )
-if [ "$DISTR_DATE_LEN" = 6 ]; then
-	DISTR_DESC=$( del_last_word $DISTR_DESC )
-fi
-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)"
-
-BANNER_FN="$ROOTFSDIR/etc/banner"
-BANNER_VER=$( grep -F "$DISTR_REV" "$BANNER_FN" 2>/dev/null )
-if [ -n "$BANNER_VER" ]; then
-	BANNER_SUFFIX=$( echo -n "$BANNER_VER" | awk '{print $NF}' | tr -d '\n' )
-	if [ $( echo -n "$BANNER_SUFFIX" | wc -c ) = 6 ]; then
-		sed -i "s/, $BANNER_SUFFIX/, $CURDATE/g" "$BANNER_FN"
-	else
-		sed -i "s/$DISTR_REV/&, $CURDATE/" "$BANNER_FN"
-	fi
-fi
-log_msg "Banner patched (DATE = $CURDATE)"
-
-FW_ARCH=$( get_param_q DISTRIB_ARCH "$FW_VER_FN" )
-#log_msg "FW_ARCH: '$FW_ARCH'"
-if [ -z "$FW_ARCH" ]; then
-	die "Firmware arch not found!"
-fi
-
-DIS_SVC_FN="$TOPDIR/disabled_services.lst"
-if [ -f "$DIS_SVC_FN" ]; then
-	DIS_SVC_LST="$( cat ""$DIS_SVC_FN"" )"
-	for svc in $DIS_SVC_LST; do
-		[ -z "$svc" ] && continue
-		svc_xx=$(find "$ROOTFSDIR/etc/rc.d" -maxdepth 1 -name ???$svc -printf 1 -quit)
-		if [ -n "$svc_xx" ]; then
-			log_msg "Service '$svc' disabled."
-		fi
-		rm -f "$ROOTFSDIR"/etc/rc.d/S??$svc
-		rm -f "$ROOTFSDIR"/etc/rc.d/K??$svc
-		if [ "$svc" = "nextdns" ]; then
-			sed -i 's/nextdns enable/nextdns disable/g' "$ROOTFSDIR/etc/uci-defaults/nextdns"
-		fi
-	done
-fi
-
-NEXTDNSCFG="$ROOTFSDIR/etc/config/nextdns"
-if [ -f "$NEXTDNSCFG" ]; then
-	sed -i "s/option enabled '1'/option enabled '0'/g" "$NEXTDNSCFG"
-	log_msg "Service 'nextdns' disabled."
-fi
-
-IS_SNAPSHOT=false
-if echo "$FULL_VERSION" | grep snapshot >/dev/null ; then
-	IS_SNAPSHOT=true
-	log_msg "Snapshot detected."
-fi
-

kng_re.config

@@ -1,44 +0,0 @@
-CONFIG_TARGET_ramips=y
-CONFIG_TARGET_ramips_mt7621=y
-CONFIG_TARGET_ramips_mt7621_DEVICE_zyxel_keenetic-giga-iii=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
-
-### Luci dashboard
-CONFIG_PACKAGE_luci-mod-dashboard=y
-CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
-
-### HDD tools
-CONFIG_PACKAGE_smartmontools=y
-CONFIG_PACKAGE_hdparm=y
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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

@@ -1,57 +0,0 @@
-CONFIG_TARGET_ipq806x=y
-CONFIG_TARGET_ipq806x_generic=y
-CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=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_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
-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
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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

@@ -1,44 +0,0 @@
-CONFIG_TARGET_ramips=y
-CONFIG_TARGET_ramips_mt7621=y
-CONFIG_TARGET_ramips_mt7621_DEVICE_xiaomi_mi-router-3g=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
-
-### Luci dashboard
-CONFIG_PACKAGE_luci-mod-dashboard=y
-CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
-
-### HDD tools
-CONFIG_PACKAGE_smartmontools=y
-CONFIG_PACKAGE_hdparm=y
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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

@@ -1,31 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_mt7622=y
-CONFIG_TARGET_mediatek_mt7622_DEVICE_xiaomi_redmi-router-ax6s=y
-
-#include _addons.config
-#include _base.config
-#include _wifi_en.config
-#include _proxy.config
-#include _argon.config
-#include _vpn.config
-
-### 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
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-CONFIG_PACKAGE_luci-i18n-sqm-ru=y
-
-### TimeControl
-#CONFIG_PACKAGE_luci-app-timecontrol=m
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-
-

rb06.config

@@ -1,31 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_xiaomi_redmi-router-ax6000-stock=y
-
-#include _addons.config
-#include _base.config
-#include _wifi_en.config
-#include _proxy.config
-#include _argon.config
-#include _vpn.config
-
-### 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
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-CONFIG_PACKAGE_luci-i18n-sqm-ru=y
-
-### TimeControl
-#CONFIG_PACKAGE_luci-app-timecontrol=m
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-
-
-

rd03.config

@@ -17,15 +17,9 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
 CONFIG_PACKAGE_luci-app-tn-netports=y
 CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
 
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-CONFIG_PACKAGE_luci-i18n-sqm-ru=y
-
 ### TimeControl
-#CONFIG_PACKAGE_luci-app-timecontrol=m
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
+CONFIG_PACKAGE_luci-app-timecontrol=m
+
 
 
 

routerich-ax3000.config

@@ -1,51 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_routerich_ax3000=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_lm-sensors-detect=y
-CONFIG_PACKAGE_luci-app-temp-status=y
-CONFIG_PACKAGE_luci-i18n-temp-status-ru=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
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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.config

@@ -1,38 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-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
-
-### 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
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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

@@ -1,17 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax52=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
-
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

rt-ax59u.config

@@ -1,55 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax59u=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_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
-
-### 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
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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

@@ -1,17 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax59u=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
-
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

rt-ax89x.config

@@ -1,60 +0,0 @@
-CONFIG_TARGET_qualcommax=y
-CONFIG_TARGET_qualcommax_ipq807x=y
-CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=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
-
-CONFIG_KERNEL_KALLSYMS=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
-
-### USB
-CONFIG_PACKAGE_kmod-usb-storage-uas=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
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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

@@ -1,21 +0,0 @@
-CONFIG_TARGET_qualcommax=y
-CONFIG_TARGET_qualcommax_ipq807x=y
-CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
-
-#include _addons.config
-#include _base_initrd.config
-
-CONFIG_KERNEL_KALLSYMS=y
-
-CONFIG_TARGET_INITRAMFS_FORCE=y
-CONFIG_TARGET_ROOTFS_INITRAMFS=y
-CONFIG_USES_SEPARATE_INITRAMFS=n
-CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
-
-
-### USB
-CONFIG_PACKAGE_kmod-usb-storage-uas=y
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

tuf_ax4200.config

@@ -1,55 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200=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_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
-
-### 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
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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

@@ -1,17 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200=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
-
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

tuf_ax6000.config

@@ -1,55 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax6000=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_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
-
-### 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
-
-### Network Ports viewer
-CONFIG_PACKAGE_luci-app-tn-netports=y
-CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
-
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-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

@@ -1,17 +0,0 @@
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_filogic=y
-CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax6000=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
-
-
-### DNSMasq
-CONFIG_PACKAGE_dnsmasq-full=y
-

xcommon.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-XSUPPORTEDVER=23
+XSUPPORTEDVER=24
 XREPOADDR=https://github.com/openwrt-xiaomi
-XDEFBRANCH=xq-23.05.0
+XDEFBRANCH=xq-24.10.0
 
 logmsg() {
 	echo "$@"

xmake.sh

@@ -16,8 +16,9 @@ KALLSYMS=false
 TESTING_KERNEL=false
 BUILD_ONLY_INITRAMFS=false
 BUILD_SKIP_INITRAMFS=false
+ONLY_INIT=false
 
-while getopts "j:t:fiskT" opt; do
+while getopts "j:t:fiskTI" 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;;
+		I) ONLY_INIT=true;;
 	esac
 done
 
@@ -125,6 +127,26 @@ function build_target {
 		fi
 	fi
 
+	PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
+	if [ -f $PODKOP_MK ]; then
+		sed -i 's/+sing-box / /g' $PODKOP_MK
+		sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK
+	fi
+	PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop
+	if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
+		sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
+	fi
+
+	DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
+	if [ -f $DROPBEAR_MK ]; then
+		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
+	fi
+
 	make defconfig
 
 	NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )
@@ -177,6 +199,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,8 +221,39 @@ 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
-
+	
+	XPATCHES=$XDIR/patches
+	for incfn in $XPATCHES/*.patch; do
+		[ ! -f "$incfn" ] && continue
+		inc=`patch -p1 -N -r - < "$incfn"`
+		if [ $? != 0 ]; then
+			if ! echo "$inc" | grep -q "patch detected!  Skipping patch."; then
+				echo "Patch '$(basename $incfn)' FAILED"
+				exit 1
+			fi
+		fi
+		echo "Patch '$(basename $incfn)' result: OK"
+	done
+	
 	OPKG_DIR=$XDIR/files/etc/opkg
 	if [ -d $OPKG_DIR ]; then
 		rm -rf $OPKG_DIR
@@ -200,14 +266,14 @@ function build_target {
 		cp $FANT_PKG_KEY $OPKG_KEYS_DIR/53ff2b6672243d28
 		OPKG_CFEED_FN=$OPKG_DIR/customfeeds.conf
 		cp $OPKG_SRC_DIR/customfeeds.conf $OPKG_CFEED_FN
+		PKG_LINK="https://fantastic-packages.github.io/packages/releases/<<VER>>/packages/<<ARCH>>"
 		echo "" >> $OPKG_CFEED_FN
-		fant_luci="src/gz  fantastic_packages_luci      https://fantastic-packages.github.io/packages/releases/<<VER>>/packages/<<ARCH>>/luci"
-		echo "$fant_luci" >> $OPKG_CFEED_FN
-		fant_pkgs="src/gz  fantastic_packages_packages  https://fantastic-packages.github.io/packages/releases/<<VER>>/packages/<<ARCH>>/packages"
-		echo "$fant_pkgs" >> $OPKG_CFEED_FN
+		echo "src/gz  fantastic_packages_luci      $PKG_LINK/luci"      >> $OPKG_CFEED_FN
+		echo "src/gz  fantastic_packages_packages  $PKG_LINK/packages"  >> $OPKG_CFEED_FN
+		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>>/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,7 +297,9 @@ function build_target {
 	#make tools/install -j$make_jobs
 	#make toolchain/install -j$make_jobs
 
-	make -j $make_jobs download world
+	[ "$ONLY_INIT" = "true" ] && return 0
+
+	make V=s -j $make_jobs download world
 }
 
 function build_config {

xupdate.sh

@@ -10,9 +10,11 @@ ADDONSNSS=$XDIR/_addons_nss.config
 . ./xcommon.sh
 
 OPT_FULL_UPDATE=false
+USE_GITHUB_SRC=false
 while getopts "f" opt; do
 	case $opt in
 		f) OPT_FULL_UPDATE=true;;
+		g) USE_GITHUB_SRC=true;;
 	esac
 done
 
@@ -37,7 +39,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 )
 
@@ -46,6 +48,12 @@ git reset --hard origin/$CUR_BRANCH
 
 rm -f feeds.conf
 cp -f feeds.conf.default feeds.conf
+
+if [ "$USE_GITHUB_SRC" = "true" ]; then
+	sed -i -e 's|https://git.openwrt.org/feed/|https://github.com/openwrt/|' feeds.conf
+	sed -i -e 's|https://git.openwrt.org/project/|https://github.com/openwrt/|' feeds.conf
+fi
+
 feed_lst=$( get_cfg_feed_lst "$ADDONSCFG" )
 for feed in $feed_lst; do
 	value=$( get_cfg_feed_url "$ADDONSCFG" $feed )
@@ -145,7 +153,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