xmake: Fix build podkop (remove conflicts)

proxy: Add package zapret-openwrt
xmake: Add support install custom patches
2025-05-06 11:48:09 +03:00 · 2025-05-05 13:41:28 +03:00 · 2025-04-12 17:29:52 +03:00 · 2025-04-11 21:38:16 +03:00 · 2025-04-11 21:38:16 +03:00 · 2025-04-11 21:37:46 +03:00
30 changed files with 328 additions and 113 deletions
--- a/.github/FUNDING.yml
+++ b/.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']
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,12 +2,25 @@ 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
+  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
@@ -15,6 +28,9 @@ env:
  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
@@ -84,6 +113,7 @@ jobs:
          - kng_re
          - r3d
          - r3g
+          - r3p
          - rb03
          - rb06
          - rd03
@@ -93,6 +123,7 @@ jobs:
          - rt-ax89x
          - tuf_ax4200
          - tuf_ax6000
+          - zen-bt8
    steps:
      - name: Initialization environment
        env:
@@ -118,7 +149,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,44 +162,63 @@ 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
-          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 '[^"]*$' )
+          # 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!"
-          # 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
+              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 "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=$(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 +227,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'
@@ -195,20 +246,16 @@ jobs:
          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 "---------------------------"
+          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 }}-${{ 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 +263,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 +280,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 +294,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,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

--- a/_addons.config
+++ b/_addons.config
@@ -45,6 +45,10 @@ CONFIG_FEED__alpine_fan_control=m
 #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
--- a/_base.config
+++ b/_base.config
@@ -62,6 +62,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
@@ -251,8 +252,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
--- a/_base_initrd.config
+++ b/_base_initrd.config
@@ -80,3 +80,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/_proxy.config
+++ b/_proxy.config
@@ -7,3 +7,9 @@ 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
--- a/_vpn.config
+++ b/_vpn.config
@@ -40,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
--- a/hook_prepare_rootfs.sh
+++ b/hook_prepare_rootfs.sh
@@ -136,6 +136,23 @@ if [ -f "$DIS_SVC_FN" ]; then
 	done
 fi

+WIFI77_FN="$ROOTFSDIR/etc/uci-defaults/77_wireless"
+if [ -f "$WIFI77_FN" ]; then
+	if grep -q 'CONFIG_PACKAGE_MAC80211_ENABLE=y' $TOPDIR/.config ; then
+		if grep -q 'CONFIG_PACKAGE_MAC80211_PASSWORD="' $TOPDIR/.config ; then
+			sed -i "s#%ENABLE%#y#g" "$WIFI77_FN"
+			WIFI_SSID=$( get_param_qq CONFIG_PACKAGE_MAC80211_SSID "$TOPDIR/.config" )
+			sed -i "s#%SSID%#${WIFI_SSID}#g" "$WIFI77_FN"
+			WIFI_ENCRYPTION=$( get_param_qq CONFIG_PACKAGE_MAC80211_ENCRYPTION "$TOPDIR/.config" )
+			sed -i "s#%ENCRYPTION%#${WIFI_ENCRYPTION}#g" "$WIFI77_FN"
+			WIFI_PASSWORD=$( get_param_qq CONFIG_PACKAGE_MAC80211_PASSWORD "$TOPDIR/.config" )
+			sed -i "s#%KEY%#${WIFI_PASSWORD}#g" "$WIFI77_FN"
+			WIFI_COUNTRY=$( get_param_qq CONFIG_PACKAGE_MAC80211_COUNTRY "$TOPDIR/.config" )
+			sed -i "s#%COUNTRY%#${WIFI_COUNTRY}#g" "$WIFI77_FN"
+		fi
+	fi
+fi
+
 NEXTDNSCFG="$ROOTFSDIR/etc/config/nextdns"
 if [ -f "$NEXTDNSCFG" ]; then
 	sed -i "s/option enabled '1'/option enabled '0'/g" "$NEXTDNSCFG"
--- 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
@@ -39,10 +41,6 @@ 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

--- a/r3g.config
+++ b/r3g.config
@@ -24,10 +24,6 @@ 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

--- a/r3p.config
+++ b/r3p.config
@@ -0,0 +1,32 @@
+CONFIG_TARGET_ramips=y
+CONFIG_TARGET_ramips_mt7621=y
+CONFIG_TARGET_ramips_mt7621_DEVICE_xiaomi_mi-router-3-pro=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
+
+### TimeControl
+CONFIG_PACKAGE_luci-app-timecontrol=m
+
+
+
+
--- a/rb03.config
+++ b/rb03.config
@@ -17,10 +17,6 @@ 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

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

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

--- a/rt-ax52.config
+++ b/rt-ax52.config
@@ -23,10 +23,6 @@ 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

--- a/rt-ax52_initramfs.config
+++ b/rt-ax52_initramfs.config
@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax52=y

 #include _addons.config
 #include _base_initrd.config
+#include _wifi_en.config


 CONFIG_TARGET_INITRAMFS_FORCE=y
--- a/rt-ax57m.config
+++ b/rt-ax57m.config
@@ -23,10 +23,6 @@ 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

--- a/rt-ax57m_initramfs.config
+++ b/rt-ax57m_initramfs.config
@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax57m=y

 #include _addons.config
 #include _base_initrd.config
+#include _wifi_en.config


 CONFIG_TARGET_INITRAMFS_FORCE=y
--- a/rt-ax59u.config
+++ b/rt-ax59u.config
@@ -37,10 +37,6 @@ 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

--- a/rt-ax59u_initramfs.config
+++ b/rt-ax59u_initramfs.config
@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax59u=y

 #include _addons.config
 #include _base_initrd.config
+#include _wifi_en.config


 CONFIG_TARGET_INITRAMFS_FORCE=y
--- a/rt-ax89x.config
+++ b/rt-ax89x.config
@@ -42,10 +42,6 @@ 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

--- a/tuf_ax4200.config
+++ b/tuf_ax4200.config
@@ -37,10 +37,6 @@ 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

--- a/tuf_ax4200_initramfs.config
+++ b/tuf_ax4200_initramfs.config
@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200=y

 #include _addons.config
 #include _base_initrd.config
+#include _wifi_en.config


 CONFIG_TARGET_INITRAMFS_FORCE=y
--- a/tuf_ax6000.config
+++ b/tuf_ax6000.config
@@ -37,10 +37,6 @@ 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

--- a/tuf_ax6000_initramfs.config
+++ b/tuf_ax6000_initramfs.config
@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax6000=y

 #include _addons.config
 #include _base_initrd.config
+#include _wifi_en.config


 CONFIG_TARGET_INITRAMFS_FORCE=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,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 )
@@ -220,7 +240,20 @@ function build_target {
 			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
@@ -233,11 +266,11 @@ 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
@@ -264,7 +297,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 )
--- a/zen-bt8.config
+++ b/zen-bt8.config
@@ -0,0 +1,47 @@
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_filogic=y
+CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=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
+
+### Luci dashboard
+CONFIG_PACKAGE_luci-mod-dashboard=y
+CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
+
+### Network Ports viewer
+CONFIG_PACKAGE_luci-app-tn-netports=y
+CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
+
+### TimeControl
+CONFIG_PACKAGE_luci-app-timecontrol=m
+
--- a/zen-bt8_initramfs.config
+++ b/zen-bt8_initramfs.config
@@ -0,0 +1,17 @@
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_filogic=y
+CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
+
+CONFIG_KERNEL_KALLSYMS=y
+
+#include _addons.config
+#include _base_initrd.config
+#include _wifi_en.config
+
+
+CONFIG_TARGET_INITRAMFS_FORCE=y
+CONFIG_TARGET_ROOTFS_INITRAMFS=y
+CONFIG_USES_SEPARATE_INITRAMFS=n
+CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
+
+
Author	SHA1	Message	Date
remittor	91f0229c56	xmake: Fix build podkop (remove conflicts)	2025-05-06 11:48:09 +03:00
remittor	c2b23fc75d	proxy: Add package zapret-openwrt	2025-05-05 13:41:28 +03:00
remittor	8889b52c08	xmake: Add support install custom patches	2025-04-12 17:29:52 +03:00
remittor	d625301034	xmake: Disable MODERN mode for dropbear	2025-04-11 21:38:16 +03:00
remittor	349acbd731	xmake: Add patching for podkop	2025-04-11 21:38:16 +03:00
remittor	35a12373c1	vpn: Add package luci-i18n-podkop-ru	2025-04-11 21:37:46 +03:00
remittor	bd18b7bbac	build: Add Xiaomi R3P and Asus ZenWiFi-BT8	2025-04-04 20:43:08 +03:00
remittor	ab609c865a	base: Add package coreutils-cksum	2025-04-03 12:58:54 +03:00
remittor	20a7be2d85	Auto activate WiFi modules for Asus initramfs images	2025-03-31 11:20:54 +03:00
remittor	68a27ad4ff	base_initrd: Add theme openwrt-2020	2025-03-31 09:39:04 +03:00
remittor	ff24a36fe4	xmake: Add special fantastic packages	2025-03-21 10:03:57 +03:00
remittor	88fdc87118	Add support Xiaomi R3P	2025-03-06 12:07:38 +03:00
remittor	67a306e4a5	config: Remove SQM package	2025-02-28 15:26:13 +03:00
remittor	58dd491beb	base: Disable IP Tables tool	2025-02-28 15:21:26 +03:00
remittor	d4039b3221	build: Check downloaded vermagic hash	2025-02-14 16:58:54 +03:00
remittor	053d54a01b	readme: Add new badges	2025-01-31 13:04:25 +03:00
remittor	f07b1487bf	readme: Add download counter	2025-01-14 14:44:11 +03:00
remittor	9add7ffb32	r3d: Enable CONFIG_KERNEL_KALLSYMS	2025-01-14 12:43:01 +03:00
remittor	2c59084788	Add support github actions	2025-01-14 12:33:35 +03:00