xmake: Add patching for podkop

vpn: Add package luci-i18n-podkop-ru
configs: Remove SQM package
2025-04-11 21:33:46 +03:00 · 2025-04-11 21:33:21 +03:00 · 2025-04-03 13:03:19 +03:00 · 2025-04-03 12:59:36 +03:00 · 2025-03-31 09:42:31 +03:00 · 2025-03-31 09:39:47 +03:00
26 changed files with 254 additions and 232 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,19 +2,35 @@ name: build

 on:
  workflow_dispatch:
-#  push:
-#    tags:
-#      - v[0-9]+*
+    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:
-  REPO_URL: https://github.com/openwrt-xiaomi/openwrt.git
-  REPO_BRANCH: xq-24.10
-  TAG_PREFIX: v24-
+  FAKE_BUILD: ${{ github.event.inputs.fake_build }}
+  REPO_URL: https://github.com/openwrt-xiaomi/openwrt
+  REPO_LNK: openwrt-xiaomi/openwrt
+  REPO_BRANCH: xq-23.05.5
+  TAG_PREFIX: v23-
  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:
@@ -25,43 +41,56 @@ jobs:
      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 }}
-          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')
+          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 $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 "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/commits/$BRANCH --jq '.commit.message'
+            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
-          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 }}
+          REPO_DATE: ${{ env.REPO_DATE }}
          URL: ${{ steps.gh.outputs.url }}
        run: |
-          TIMESTAMP=$(date --utc -d $DATE +%s)
+          TIMESTAMP=$(date --utc -d $REPO_DATE +%s)
          DAYS=$(( ( $(date --utc +%s) - $TIMESTAMP ) / 86400 ))
-          echo "Repository activity: $(date --utc -d $DATE)"
+          echo "Repository activity: $(date --utc -d $REPO_DATE)"
          echo "Commit: $URL"
          if [ "${{ github.event_name }}" != "schedule" ]; then
            is_active=true
@@ -90,7 +119,6 @@ jobs:
          - rt-ax52
          - rt-ax57m
          - rt-ax59u
-          - rt-ax89x
          - tuf_ax4200
          - tuf_ax6000
    steps:
@@ -118,7 +146,7 @@ jobs:
        uses: actions/checkout@main

      - name: Download OpenWrt sources
-        run: git clone --branch $REPO_BRANCH $REPO_URL $BUILD_ROOT
+        run: git clone --branch $REPO_BRANCH $REPO_URL.git $BUILD_ROOT

      - name: Init builder
        env:
@@ -131,32 +159,39 @@ jobs:
          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
+          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"
-          ./xmake.sh -m -t $TARGET
-          make -j $MAKE_JOBS download world
-          # || make V=sc
+          ./xmake.sh -I -t $TARGET
+          [ "$FAKE_BUILD" != "true" ] && make -j $MAKE_JOBS download world
+          FILE_DATE=$(date --utc +'%y%m%d')
          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
+          if [ "$FAKE_BUILD" = "true" ]; then
+              mkdir -p logs
+              mkdir -p $OUT_DIR
+              echo "$BOARD_NAME $SUBTARGET_NAME $DEVICE_NAME" > "$OUT_DIR/$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 '[^"]*$' )
-          FILE_DATE=$(date --utc +'%y%m%d')
+          fi
          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
@@ -167,8 +202,7 @@ jobs:
          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
+          echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV

      - name: Check space usage
        run: df -hT
@@ -177,9 +211,10 @@ jobs:
        if: always()
        env:
          TARGET: ${{ matrix.target }}
+          FW_DATE: ${{ needs.check.outputs.fw_date }}
          LOGS_DIR: ${{ env.BUILD_ROOT }}/logs
        run: |
-          tar -cJvf logs-$TARGET.tar.xz $LOGS_DIR
+          tar -cJvf logs-$TARGET-$FW_DATE.tar.xz $LOGS_DIR

      - name: Cleanup OUT directory 
        if: steps.compile.outputs.status == 'success'
@@ -196,19 +231,11 @@ jobs:
          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 }}
+          name: openwrt-${{ env.BLD_VER }}-${{ needs.check.outputs.build_date }}-${{ env.DEVICE_NAME }}
          path: ${{ env.OUT_DIR }}
          if-no-files-found: error

@@ -216,7 +243,7 @@ jobs:
        if: always()
        uses: actions/upload-artifact@v4
        with:
-          name: logs-${{ matrix.target }}
+          name: logs-${{ matrix.target }}-${{ env.FW_DATE }}
          path: logs-*.tar.xz

  release:
@@ -233,9 +260,6 @@ jobs:
          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 {} {}/*' \;
@@ -250,4 +274,7 @@ jobs:
          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
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Github All Releases](https://img.shields.io/github/downloads/openwrt-xiaomi/builder/total.svg)](https://github.com/openwrt-xiaomi/builder/releases)
+
 # OpenWrt builder

 For OpenWrt >= 21.02
--- a/_addons.config
+++ b/_addons.config
@@ -36,13 +36,16 @@ 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



 ### AmneziaWG
-#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-24.10
+#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-23.05
 CONFIG_FEED__amneziawg=m

 ### ruantiblock
--- a/_base.config
+++ b/_base.config
@@ -41,8 +41,6 @@ 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
@@ -54,7 +52,7 @@ CONFIG_PACKAGE_nano=y
 CONFIG_PACKAGE_ccrypt=y
 CONFIG_LIBCURL_PROXY=y
 CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_wget-ssl=y
+CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_patch=y
 CONFIG_PACKAGE_diffutils=y
 CONFIG_PACKAGE_tree=y
@@ -62,6 +60,7 @@ 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
@@ -112,8 +111,6 @@ 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
@@ -131,57 +128,17 @@ CONFIG_PACKAGE_6rd=y
 ### IPv6 NAT support (ip6tables NAT extensions, ipt-nat6 and nf-nat6 kmods)
 ##CONFIG_PACKAGE_ip6tables-mod-nat=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
-
-### 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
+### OpenSSL
+CONFIG_LIBCURL_OPENSSL=y
 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_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
+CONFIG_PACKAGE_libuhttpd-openssl=y
+
+### LuCI with HTTPS support (OpenSSL as SSL backend)
+CONFIG_PACKAGE_luci-ssl-openssl=y

 ### SSL certificates
 CONFIG_PACKAGE_ca-certificates=y
@@ -231,7 +188,15 @@ 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
--- a/_base_initrd.config
+++ b/_base_initrd.config
@@ -39,8 +39,6 @@ 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
@@ -80,3 +78,6 @@ CONFIG_PACKAGE_luci-i18n-commands-ru=y
 CONFIG_PACKAGE_luci-app-opkg=y
 CONFIG_PACKAGE_luci-i18n-opkg-ru=y

+### Luci themes
+CONFIG_PACKAGE_luci-theme-bootstrap=y
+CONFIG_PACKAGE_luci-theme-openwrt-2020=y
--- a/_vpn.config
+++ b/_vpn.config
@@ -1,15 +1,16 @@

-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_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_PACKAGE_openvpn-mbedtls=y
+CONFIG_PACKAGE_openvpn-openssl=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
@@ -23,6 +24,7 @@ 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
@@ -32,6 +34,11 @@ 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
@@ -40,3 +47,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
--- a/kng_re.config
+++ b/kng_re.config
@@ -24,13 +24,17 @@ CONFIG_PACKAGE_hdparm=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

+### FileBrowser
+CONFIG_PACKAGE_wget-ssl=y
+CONFIG_PACKAGE_luci-app-filebrowser=y
+
+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y
+
+



--- a/r3d.config
+++ b/r3d.config
@@ -12,6 +12,8 @@ CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=y
 #include _argon.config
 #include _vpn.config

+CONFIG_KERNEL_KALLSYMS=y
+
 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y
 CONFIG_PACKAGE_lm-sensors-detect=y
@@ -31,21 +33,20 @@ 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

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

--- a/r3g.config
+++ b/r3g.config
@@ -24,13 +24,17 @@ CONFIG_PACKAGE_hdparm=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

+### FileBrowser
+CONFIG_PACKAGE_wget-ssl=y
+CONFIG_PACKAGE_luci-app-filebrowser=y
+
+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y
+
+



--- a/rb03.config
+++ b/rb03.config
@@ -17,12 +17,11 @@ 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
+


--- a/rb06.config
+++ b/rb06.config
@@ -17,12 +17,11 @@ 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
+


--- a/rd03.config
+++ b/rd03.config
@@ -17,13 +17,11 @@ 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



--- a/routerich-ax3000.config
+++ b/routerich-ax3000.config
@@ -1,6 +1,6 @@
-CONFIG_TARGET_qualcommax=y
-CONFIG_TARGET_qualcommax_ipq807x=y
-CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_filogic=y
+CONFIG_TARGET_mediatek_filogic_DEVICE_routerich_ax3000=y

 #include _addons.config
 #include _base.config
@@ -12,17 +12,11 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
 #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
@@ -34,23 +28,19 @@ 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

-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-CONFIG_PACKAGE_luci-i18n-sqm-ru=y
-
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m

-### CPU Freq
-CONFIG_PACKAGE_luci-app-cpufreq=y
+### FileBrowser
+CONFIG_PACKAGE_wget-ssl=y
+CONFIG_PACKAGE_luci-app-filebrowser=y
+
+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y



--- a/rt-ax52.config
+++ b/rt-ax52.config
@@ -15,19 +15,19 @@ 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

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

--- a/rt-ax52_initramfs.config
+++ b/rt-ax52_initramfs.config
@@ -12,3 +12,6 @@ CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n


+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y
+
--- a/rt-ax57m.config
+++ b/rt-ax57m.config
@@ -15,20 +15,19 @@ 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

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


--- a/rt-ax57m_initramfs.config
+++ b/rt-ax57m_initramfs.config
@@ -12,3 +12,6 @@ CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n


+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y
+
--- a/rt-ax59u.config
+++ b/rt-ax59u.config
@@ -29,23 +29,22 @@ 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

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



--- a/rt-ax59u_initramfs.config
+++ b/rt-ax59u_initramfs.config
@@ -12,3 +12,6 @@ CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n


+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y
+
--- a/rt-ax89x_initramfs.config
+++ b/rt-ax89x_initramfs.config
@@ -1,19 +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
-
-
--- a/tuf_ax4200.config
+++ b/tuf_ax4200.config
@@ -29,18 +29,23 @@ 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

-### 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
+
+
+
+
--- a/tuf_ax4200_initramfs.config
+++ b/tuf_ax4200_initramfs.config
@@ -11,3 +11,7 @@ CONFIG_TARGET_ROOTFS_INITRAMFS=y
 CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n

+
+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y
+
--- a/tuf_ax6000.config
+++ b/tuf_ax6000.config
@@ -29,20 +29,23 @@ 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

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


--- a/tuf_ax6000_initramfs.config
+++ b/tuf_ax6000_initramfs.config
@@ -12,3 +12,6 @@ CONFIG_USES_SEPARATE_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n


+### DNSMasq
+CONFIG_PACKAGE_dnsmasq-full=y
+
--- a/xmake.sh
+++ b/xmake.sh
@@ -16,9 +16,9 @@ KALLSYMS=false
 TESTING_KERNEL=false
 BUILD_ONLY_INITRAMFS=false
 BUILD_SKIP_INITRAMFS=false
-CALL_MAKE=true
+ONLY_INIT=false

-while getopts "j:t:fiskTm" opt; do
+while getopts "j:t:fiskTI" opt; do
 	case $opt in
 		j) MAKE_JOBS=$OPTARG;;
 		t) XTARGET=$OPTARG;;
@@ -27,7 +27,7 @@ while getopts "j:t:fiskTm" opt; do
 		T) TESTING_KERNEL=true;;
 		i) BUILD_ONLY_INITRAMFS=true;;
 		s) BUILD_SKIP_INITRAMFS=true;;
-		m) CALL_MAKE=false;;
+		I) ONLY_INIT=true;;
 	esac
 done

@@ -127,6 +127,15 @@ 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
+	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
+
 	make defconfig

 	NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )
@@ -233,14 +242,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>>/24.10/g" $OPKG_CFEED_FN
+		sed -i "s/<<VER>>/23.05/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
@@ -264,7 +273,7 @@ function build_target {
 	#make tools/install -j$make_jobs
 	#make toolchain/install -j$make_jobs

-	[ "$CALL_MAKE" = "false" ] && return 0
+	[ "$ONLY_INIT" = "true" ] && return 0

 	make -j $make_jobs download world
 }
--- a/xupdate.sh
+++ b/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

@@ -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,6 +153,7 @@ 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
Author	SHA1	Message	Date
remittor	5915dc610a	xmake: Add patching for podkop	2025-04-11 21:33:46 +03:00
remittor	205076e724	vpn: Add package luci-i18n-podkop-ru	2025-04-11 21:33:21 +03:00
remittor	258f71ae2d	configs: Remove SQM package	2025-04-03 13:03:19 +03:00
remittor	1f00b6e321	base: Add package coreutils-cksum	2025-04-03 12:59:36 +03:00
remittor	d1df8c9dfc	xmake: Add special fantastic packages	2025-03-31 09:42:31 +03:00
remittor	ea57823375	base_initrd: Add theme openwrt-2020	2025-03-31 09:39:47 +03:00
remittor	425a257322	Add support github actions	2025-01-14 16:19:18 +03:00
remittor	ad481dd293	Remove Asus RT-AX89X	2025-01-14 16:18:27 +03:00
remittor	77b8e87dd9	r3d: Enable CONFIG_KERNEL_KALLSYMS	2025-01-14 16:13:04 +03:00
remittor	883554aa0a	readme: Add download counter	2025-01-14 15:56:13 +03:00
remittor	78d24a571e	Add new device Asus RT-AX57M	2025-01-14 15:54:51 +03:00
remittor	8be5c110ed	Add patch for os-release file	2025-01-14 15:38:01 +03:00
remittor	353412f993	xmake: Fix build for ntfs-3g package	2025-01-14 15:36:48 +03:00
remittor	af85abbb4a	xmake: Cleanup x-wrt packages	2025-01-14 15:36:02 +03:00
remittor	f80d726319	xupdate: Check result of git pull	2025-01-14 15:32:42 +03:00
remittor	be11da2423	base: Replace samba4 to KSMBD	2025-01-14 15:27:43 +03:00
remittor	1b644b6033	base: Update some packages	2025-01-14 15:25:58 +03:00
remittor	f60e00adea	Remove _torrents.config from asus rt-ax52 config	2024-12-03 21:18:00 +03:00