fix 1

xmake: Fix warning "your configuration is out of sync"
dependencies: Add libc6-dev for luajit
2025-12-30 18:43:39 +05:00 · 2025-12-30 16:42:39 +03:00 · 2025-12-30 14:16:17 +03:00 · 2025-12-30 14:15:05 +03:00 · 2025-12-30 14:13:45 +03:00 · 2025-12-30 08:45:47 +03:00
14 changed files with 242 additions and 34 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,24 @@ name: build
 on:
  workflow_dispatch:
    inputs:
+      test_build:
+        description: 'Test build'
+        required: true
+        default: 'false'
+        type: choice
+        options:
+        - true
+        - false
+      target_name:
+        description: 'Target Name'
+        required: false
+        default: 'r3d'
+        type: string
+      package_dir:
+        description: 'Package Dir'
+        required: false
+        default: ''
+        type: string
      fake_build:
        description: 'Fake build'
        required: true
@@ -18,11 +36,15 @@ on:
        type: string

 env:
-  FAKE_BUILD: ${{ github.event.inputs.fake_build }}
+  TEST_BUILD: ${{ github.event.inputs.test_build == 'true' }}
+  FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
+  TAG_SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || github.event.inputs.test_build == 'true' && '-test' || '' }}
+  TARGET_NAME: ${{ github.event.inputs.target_name }}
+  PACKAGE_DIR: ${{ github.event.inputs.package_dir }}
  REPO_URL: https://github.com/openwrt-xiaomi/openwrt
  REPO_LNK: openwrt-xiaomi/openwrt
-  REPO_BRANCH: xq-24.10
-  TAG_PREFIX: v24-
+  REPO_BRANCH: xq-25.12
+  TAG_PREFIX: v25-
  BUILD_ROOT: ${{ github.workspace }}/openwrt
  DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
  TZ: UTC
@@ -45,6 +67,9 @@ jobs:
      fw_date: ${{ steps.gh.outputs.fw_date }}
      fw_ver: ${{ steps.gh.outputs.fw_ver }}
      is_active: ${{ steps.activity.outputs.is_active }}
+      test_build: ${{ env.TEST_BUILD }}
+      target_name: ${{ env.TARGET_NAME }}
+      fake_build: ${{ env.FAKE_BUILD }}
    steps:
      - name: Get repo data via GH API
        id: gh
@@ -124,6 +149,12 @@ jobs:
          - tuf_ax4200
          - tuf_ax6000
          - zen-bt8
+        isTest:
+          - ${{ needs.check.outputs.test_build == 'true' }}
+        exclude:
+          - { isTest: true }
+        include:
+          - target: ${{ github.event.inputs.target_name }}
    steps:
      - name: Initialization environment
        env:
@@ -132,9 +163,11 @@ jobs:
          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 install libc6-dev pkg-config
          sudo apt-get -qq autoremove --purge
          sudo apt-get -qq clean
          sudo timedatectl set-timezone "$TZ"
+          ls -l /usr/include/bits/

      - name: Maximize build disk space
        uses: easimon/maximize-build-space@master
@@ -159,7 +192,7 @@ jobs:
          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
+          wget https://github.com/fantastic-packages/packages/raw/refs/heads/25.12/keys/usign/53FF2B6672243D28.pub

      - name: Update OpenWrt packages
        id: update
@@ -167,17 +200,15 @@ jobs:
          cd $BUILD_ROOT && ./xupdate.sh -f
          echo "status=success" >> $GITHUB_OUTPUT

-      - name: Build the firmware image
-        id: compile
+      - name: Configure
+        id: configure
        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
+          cd $BUILD_ROOT && echo "init build config"
+          FILE_DATE=$(date --utc +'%y%m%d')
          ./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
@@ -192,10 +223,126 @@ jobs:
          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
+          echo "status=success" >> $GITHUB_OUTPUT
+          echo "FW_VER=$FW_VER" >> $GITHUB_ENV
+          echo "G_DEVICE_NAME=$G_DEVICE_NAME" >> $GITHUB_ENV
+          echo "G_BOARD_NAME=$G_BOARD_NAME" >> $GITHUB_ENV
+          echo "G_SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
+          echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV
+
+      - name: Dump .config file
+        run: |
+          echo "====== .config ========="
+          cat $BUILD_ROOT/.config
+          echo "========================"
+
+      - name: Download tools and toolchain
+        id: tools_download
+        if: steps.configure.outputs.status == 'success'
+        run: |
+          cd $BUILD_ROOT
+          G_TARGET_ARCH=$( grep -so '^CONFIG_TARGET_ARCH_PACKAGES=' .config | cut -d'"' -f2 )
+          echo "G_TARGET_ARCH=$G_TARGET_ARCH" >> $GITHUB_ENV
+          echo "OpenWrt version: $FW_VER"
+          SDK_URL_BASE="https://downloads.openwrt.org/releases/${FW_VER}/targets/${G_BOARD_NAME}/${G_SUBTARGET_NAME}"
+          echo "Searching SDK at $SDK_URL_BASE"
+          SDK_TARBALL=$( curl -s "$SDK_URL_BASE/" | grep -oE 'openwrt-sdk-[^"]+Linux-x86_64\.tar\.(xz|zst)' | head -n1 )
+          if [ -z "$SDK_TARBALL" ]; then
+              echo "ERROR: SDK not found for ${G_BOARD_NAME}/${G_SUBTARGET_NAME}"
+              exit 81
+          fi
+          echo "Found SDK: $SDK_TARBALL"
+          #curl -L --fail --retry 5 --retry-delay 5 --progress-bar -o "$SDK_TARBALL" "$SDK_URL_BASE/$SDK_TARBALL"
+          wget --progress=dot:mega "$SDK_URL_BASE/$SDK_TARBALL"
+          if [[ "$SDK_TARBALL" == *.tar.xz ]]; then
+              tar -xf "$SDK_TARBALL"
+          elif [[ "$SDK_TARBALL" == *.tar.zst ]]; then
+              tar -I zstd -xf "$SDK_TARBALL"
+          else
+              echo "Unknown archive format: $SDK_TARBALL"
+              exit 82
+          fi
+          SDK_DIR=$(tar -tf "$SDK_TARBALL" | head -n1 | cut -d/ -f1)
+          echo "Using SDK dir: $SDK_DIR"
+          rm -rf staging_dir
+          mv "$SDK_DIR/staging_dir" .
+          echo "========= staging_dir =========="
+          ls -l staging_dir
+          echo "================================"
+          #cp -a "$SDK_DIR"/toolchain/* toolchain/ 2>/dev/null || true
+          TOOLS_DIR=staging_dir/host
+          touch $TOOLS_DIR/.prepared
+          TOOLS_STAMP_DIR=$TOOLS_DIR/stamp
+          TOOLS_PKGS=$( 
+            find tools/ -maxdepth 1 -mindepth 1 -type d | while read -r d; do
+                mk="$d/Makefile"
+                [ -f "$mk" ] || continue
+                awk -F':=' '
+                  /^[[:space:]]*PKG_NAME[[:space:]]*:=/ {
+                    v=$2
+                    gsub(/\r/, "", v)
+                    gsub(/^[[:space:]]+/, "", v)
+                    gsub(/[[:space:]]+$/, "", v)
+                    if (v != "") print v
+                  }
+                ' "$mk"
+            done | sort -u
+          )
+          mkdir -p "$TOOLS_STAMP_DIR"
+          echo "Found host tools packages: $TOOLS_PKGS"
+          for pkg in $TOOLS_PKGS; do
+              touch "$TOOLS_STAMP_DIR/.$pkg"_installed
+          done
+          TOOLCHAIN_DIR=$( find staging_dir -maxdepth 1 -type d -name "toolchain-*" )
+          echo "Found toolchain directory: $TOOLCHAIN_DIR"
+          #touch $TOOLCHAIN_DIR/.prepared
+          mkdir -p "$TOOLCHAIN_DIR/stamp"
+          touch $TOOLCHAIN_DIR/stamp/.binutils_installed
+          #touch $TOOLCHAIN_DIR/stamp/.fortify-headers_installed
+          touch $TOOLCHAIN_DIR/stamp/.gcc_final_installed
+          touch $TOOLCHAIN_DIR/stamp/.gcc_initial_installed
+          touch $TOOLCHAIN_DIR/stamp/.gdb_installed
+          #touch $TOOLCHAIN_DIR/stamp/.linux_installed
+          touch $TOOLCHAIN_DIR/stamp/.musl_installed
+          touch $TOOLCHAIN_DIR/stamp/.toolchain_compile
+          echo "Checking cross-compiler..."
+          find staging_dir -name '*gcc' | head -n 10
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Build tools and toolchain
+        id: tools
+        if: steps.configure.outputs.status == 'success'
+        run: |
+          cd $BUILD_ROOT
+          MAKE_JOBS=$(nproc)
+          echo "$MAKE_JOBS thread compile"
+          export CCACHE=1
+          make tools/install -j$MAKE_JOBS
+          make toolchain/install -j$MAKE_JOBS
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Build the firmware image
+        id: compile
+        if: steps.tools.outputs.status == 'success'
+        env: 
+          TARGET: ${{ matrix.target }}
+        run: |
+          cd $BUILD_ROOT
+          MAKE_JOBS=$(nproc)
+          echo "$MAKE_JOBS thread compile"
+          export CCACHE=1
+          if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$PACKAGE_DIR" != "" ]; then
+              make $PACKAGE_DIR/compile V=sc BUILD_LOG=1
+              exit 99
+          fi
+          if [ "$FAKE_BUILD" != "true" ]; then
+              if [ "$TEST_BUILD" != "true" ]; then
+                  make -j $MAKE_JOBS download world
+              else
+                  make V=sc download world
+              fi
+          fi
          # 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
@@ -218,7 +365,6 @@ jobs:
          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
@@ -291,8 +437,8 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAG: ${{ needs.check.outputs.tag }}
        with:
-          prerelease: false
-          tag_name: ${{ needs.check.outputs.tag }}
+          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
+          tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
          name: '${{ needs.check.outputs.tag }}'
          body: |
            OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]
--- a/_addons.config
+++ b/_addons.config
@@ -13,16 +13,16 @@ CONFIG_FEED__alpine_fan_control=m
 #GIT_PACKAGE luci-app-temp-status=https://github.com/openwrt-xiaomi/luci-app-temp-status.git master

 ### luci-app-disks-info
-#GIT_PACKAGE luci-app-disks-info=https://github.com/openwrt-xiaomi/luci-app-disks-info.git master
+#GIT_PACKAGE luci-app-disks-info=https://github.com/gSpotx2f/luci-app-disks-info.git master

 ### luci-app-diskman
-#GIT_PACKAGE luci-app-diskman=https://github.com/openwrt-xiaomi/luci-app-diskman.git master
+#GIT_PACKAGE luci-app-diskman=https://github.com/lisaac/luci-app-diskman.git master

 ### luci-theme-argon
-#GIT_PACKAGE luci-theme-argon=https://github.com/openwrt-xiaomi/luci-theme-argon.git master
+#GIT_PACKAGE luci-theme-argon=https://github.com/jerrykuku/luci-theme-argon.git master

 ### luci-app-argon-config
-#GIT_PACKAGE luci-app-argon-config=https://github.com/openwrt-xiaomi/luci-app-argon-config.git master
+#GIT_PACKAGE luci-app-argon-config=https://github.com/jerrykuku/luci-app-argon-config.git master

 ### luci-app-tn-netports
 #GIT_PACKAGE luci-app-tn-netports=https://github.com/openwrt-xiaomi/luci-app-tn-netports.git master
@@ -42,12 +42,14 @@ CONFIG_FEED__alpine_fan_control=m


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

 ### Zapret
-#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git
+#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git;zap1
 CONFIG_FEED__zapret=m
+#GIT_FEED _zapret2=https://github.com/remittor/zapret-openwrt.git;master
+CONFIG_FEED__zapret2=m

 ### ruantiblock
 #GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git
--- a/_base.config
+++ b/_base.config
@@ -162,6 +162,7 @@ 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
+CONFIG_PACKAGE_px5g-mbedtls=y

 ### OpenSSL lib
 CONFIG_PACKAGE_libopenssl=y
@@ -204,8 +205,8 @@ CONFIG_PACKAGE_luci-app-ddns=y
 CONFIG_PACKAGE_luci-i18n-ddns-ru=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-i18n-firewall-ru=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-i18n-opkg-ru=y
+CONFIG_PACKAGE_luci-app-package-manager=y
+CONFIG_PACKAGE_luci-i18n-package-manager-ru=y
 CONFIG_PACKAGE_luci-app-uhttpd=y
 CONFIG_PACKAGE_luci-i18n-uhttpd-ru=y
 CONFIG_PACKAGE_luci-app-upnp=y
@@ -217,6 +218,28 @@ CONFIG_PACKAGE_luci-theme-material=y
 CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y

+### Luci extensions
+CONFIG_PACKAGE_luci-full=y
+CONFIG_PACKAGE_luci-lib-uqr=y
+CONFIG_PACKAGE_luci-ssl=y
+CONFIG_PACKAGE_cgi-io=y
+CONFIG_PACKAGE_libiwinfo=y
+CONFIG_PACKAGE_libiwinfo-data=y
+CONFIG_PACKAGE_liblucihttp=y
+CONFIG_PACKAGE_liblucihttp-ucode=y
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-file=y
+CONFIG_PACKAGE_rpcd-mod-iwinfo=y
+CONFIG_PACKAGE_rpcd-mod-luci=y
+CONFIG_PACKAGE_rpcd-mod-rpcsys=y
+CONFIG_PACKAGE_rpcd-mod-rrdns=y
+CONFIG_PACKAGE_rpcd-mod-ucode=y
+CONFIG_PACKAGE_ucode-mod-html=y
+CONFIG_PACKAGE_ucode-mod-log=y
+CONFIG_PACKAGE_ucode-mod-math=y
+CONFIG_PACKAGE_uhttpd=y
+CONFIG_PACKAGE_uhttpd-mod-ubus=y
+
 ### Luci menu customizer
 CONFIG_PACKAGE_cozymenu=y

--- a/_base_initrd.config
+++ b/_base_initrd.config
@@ -77,8 +77,8 @@ 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
+CONFIG_PACKAGE_luci-app-package-manager=y
+CONFIG_PACKAGE_luci-i18n-package-manager-ru=y

 ### Luci themes
 CONFIG_PACKAGE_luci-theme-bootstrap=y
--- a/_proxy.config
+++ b/_proxy.config
@@ -13,3 +13,8 @@ CONFIG_PACKAGE_zapret-tpws=y
 CONFIG_PACKAGE_zapret-mdig=y
 CONFIG_PACKAGE_zapret-ip2net=y
 CONFIG_PACKAGE_luci-app-zapret=y
+
+CONFIG_PACKAGE_zapret2=y
+CONFIG_PACKAGE_zapret2-mdig=y
+CONFIG_PACKAGE_zapret2-ip2net=y
+CONFIG_PACKAGE_luci-app-zapret2=y
--- a/_vpn.config
+++ b/_vpn.config
@@ -24,6 +24,7 @@ CONFIG_PACKAGE_luci-proto-wireguard=y
 CONFIG_PACKAGE_kmod-amneziawg=y
 CONFIG_PACKAGE_amneziawg-tools=y
 CONFIG_PACKAGE_luci-proto-amneziawg=y
+CONFIG_PACKAGE_luci-i18n-amneziawg-ru=y

 CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
 CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
--- a/dependencies-ubuntu.txt
+++ b/dependencies-ubuntu.txt
@@ -1 +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
+build-essential libc6-dev clang flex bison g++ gawk gcc-multilib g++-multilib gettext git libncurses5-dev libssl-dev python3-setuptools rsync swig unzip zlib1g-dev file wget
--- a/r3d.config
+++ b/r3d.config
@@ -12,7 +12,7 @@ CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=y
 #include _argon.config
 #include _vpn.config

-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y

 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y
--- a/rt-ax89x.config
+++ b/rt-ax89x.config
@@ -12,7 +12,7 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
 #include _argon.config
 #include _vpn.config

-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y

 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y
--- a/rt-ax89x_initramfs.config
+++ b/rt-ax89x_initramfs.config
@@ -5,7 +5,7 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
 #include _addons.config
 #include _base_initrd.config

-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y

 CONFIG_TARGET_INITRAMFS_FORCE=y
 CONFIG_TARGET_ROOTFS_INITRAMFS=y
--- a/xmake.sh
+++ b/xmake.sh
@@ -127,6 +127,13 @@ function build_target {
 		fi
 	fi

+	AWG_KMOD_MK=$XDIR/package/feeds/_amneziawg/kmod-amneziawg/Makefile
+	if [ -f $AWG_KMOD_MK ]; then
+		if grep "876bf7571e47e349d0e86b70c244330b470d9642" $AWG_KMOD_MK >/dev/null ; then
+			sed -i 's/PKG_SOURCE_VERSION:=876bf7571e47e349d0e86b70c244330b470d9642/PKG_SOURCE_VERSION:=b96e12d00112dbee9d51d18d8438aa991cec0f6a/g' $AWG_KMOD_MK
+		fi
+	fi
+
 	PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
 	if [ -f $PODKOP_MK ]; then
 		sed -i 's/+sing-box / /g' $PODKOP_MK
@@ -137,8 +144,29 @@ function build_target {
 		sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
 	fi

-	DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
+	DROPBEAR_DIR=$XDIR/package/network/services/dropbear
+	TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
 	if [ -f $DROPBEAR_MK ]; then
+		# download dropbear 2024.86 (OpenWrt v24.10)
+		if [ ! -f $TMP_DROPBEAR_DIR/Makefile ]; then
+			rm -rf $TMP_DROPBEAR_DIR
+			git clone --depth 1 --filter=blob:none --sparse https://github.com/openwrt/openwrt.git $TMP_DROPBEAR_DIR && (
+				cd $TMP_DROPBEAR_DIR
+				git sparse-checkout set package/network/services/dropbear
+				git checkout a2f0cd35ac1d15e69f4897b35c049e175dd06825 # commit 2024-12-12 https://github.com/openwrt/openwrt/commits/openwrt-25.12/package/network/services/dropbear
+				mv package/network/services/dropbear/* .
+			)
+			rm -rf $TMP_DROPBEAR_DIR/package
+			rm -rf $TMP_DROPBEAR_DIR/.git
+		fi
+		rm -rf $DROPBEAR_DIR/files
+		rm -rf $DROPBEAR_DIR/patches
+	fi
+	DROPBEAR_MK=$DROPBEAR_DIR/Makefile
+	if [ -f $DROPBEAR_MK ]; then
+		# downgrade dropbear to 2024.86 (OpenWrt v24.10)
+		cp -a $TMP_DROPBEAR_DIR/. $DROPBEAR_DIR/
+		# patch: Disable MODERN and enable RSA/DH-SHA1
 		sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
 		sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
 		sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
@@ -273,7 +301,7 @@ function build_target {
 		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>>/25.12/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
@@ -294,6 +322,8 @@ function build_target {
 		make_jobs=$( grep processor /proc/cpuinfo | tail -n 1 | awk '{print $3}' )
 	fi

+	cp -af $XDIR/.config $XDIR/tmp/.config
+
 	#make tools/install -j$make_jobs
 	#make toolchain/install -j$make_jobs

--- a/xupdate.sh
+++ b/xupdate.sh
@@ -27,6 +27,7 @@ if [ "$OPT_FULL_UPDATE" = "true" ]; then
 	#rm -rf feeds
 	#rm -rf package/feeds
 	rm -rf staging_dir/packages
+	rm -rf feeds/_*
 	rm -rf $XADDONSDIR
 fi

--- a/zen-bt8.config
+++ b/zen-bt8.config
@@ -12,7 +12,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
 #include _argon.config
 #include _vpn.config

-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y

 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y
--- a/zen-bt8_initramfs.config
+++ b/zen-bt8_initramfs.config
@@ -2,7 +2,7 @@ CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_filogic=y
 CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y

-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y

 #include _addons.config
 #include _base_initrd.config
Author	SHA1	Message	Date
remittor	c5fe3ea00b	fix 1	2025-12-30 16:42:39 +03:00
remittor	6cd0f64b8d	xmake: Fix warning "your configuration is out of sync"	2025-12-30 14:16:17 +03:00
remittor	9cc255858e	dependencies: Add libc6-dev for luajit	2025-12-30 14:15:05 +03:00
remittor	a775b82e5b	build: Add step "Download tools and toolchain"	2025-12-30 14:13:45 +03:00
remittor	f9ab8e3841	build: Add make tools and toolchain	2025-12-30 08:45:47 +03:00
remittor	4e7389f304	build: Add option PACKAGE_DIR	2025-12-30 08:17:47 +03:00
remittor	887d928a4b	build: Add configure step	2025-12-29 19:22:58 +03:00
remittor	5167d394e1	build: Add test_build option	2025-12-29 12:53:00 +03:00
remittor	dd3a9395f2	xmake: Downgrade dropbear to 2024.86	2025-12-28 11:28:07 +03:00
remittor	2f112defb4	build: Fix branch name	2025-12-27 19:29:18 +03:00
remittor	9104838c9b	addons: Fix download zapret2 packages	2025-12-27 17:51:09 +03:00
remittor	4e60cabc73	addons: Update sources for packages	2025-12-26 16:32:36 +03:00
remittor	295d495e81	build: Adapt for OpenWrt 25.12	2025-12-26 15:21:00 +03:00
remittor	d147c0c72d	xmake: Adapt fantastic packages for 25.12	2025-12-26 15:17:36 +03:00
remittor	8a003ba248	xupdate: Fix force update addons	2025-12-20 12:24:56 +03:00
remittor	d42e48d53e	addons: Add zapret2 packages	2025-12-20 12:15:20 +03:00
remittor	8d3762e7b3	base_initrd: Fix package manager	2025-12-20 12:11:46 +03:00
remittor	8d5dcda073	base: Add luci extensions (FULL variant)	2025-12-20 12:06:54 +03:00
remittor	d46b05352f	Disable CONFIG_KERNEL_KALLSYMS for compatibility with officials OpenWrt packages	2025-10-24 13:01:39 +03:00
remittor	e723da8e08	vpn: Replace AWG package to fork by Slava-Shchipunov Source: https://github.com/Slava-Shchipunov/awg-openwrt	2025-10-22 15:19:42 +03:00