fix 2

fix 1
2026-02-02 23:47:48 +05:00 · 2025-12-29 13:09:48 +03:00 · 2025-12-29 12:59:05 +03:00
3 changed files with 70 additions and 289 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,21 +3,8 @@ name: build
 on:
  workflow_dispatch:
    inputs:
-      use_cache:
-        description: 'Restore cache for host tools'
-        required: true
-        default: 'true'
-        type: choice
-        options:
-        - true
-        - false
-      cache_ver:
-        description: 'Use cache version'
-        required: false
-        default: '0'
-        type: string
      test_build:
-        description: 'Test build (only spec target) '
+        description: 'Test build'
        required: true
        default: 'false'
        type: choice
@@ -25,15 +12,10 @@ on:
        - true
        - false
      target_name:
-        description: 'Target Name for test build'
+        description: 'Target Name'
        required: false
        default: 'r3d'
        type: string
-      package_dir:
-        description: 'Package Dir for test build'
-        required: false
-        default: ''
-        type: string
      fake_build:
        description: 'Fake build'
        required: true
@@ -50,14 +32,15 @@ on:

 env:
  TEST_BUILD: ${{ github.event.inputs.test_build == 'true' }}
+  TARGET_NAME: ${{ github.event.inputs.target_name }}
  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 }}
-  G_PKG_DIR: ${{ github.event.inputs.package_dir }}
  REPO_URL: https://github.com/openwrt-xiaomi/openwrt
  REPO_LNK: openwrt-xiaomi/openwrt
  REPO_BRANCH: xq-25.12
  TAG_PREFIX: v25-
+  BUILD_ROOT: ${{ github.workspace }}/openwrt
+  DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
  TZ: UTC
  DEVICE_NAME: unknown
  BUILD_DATE: unknown
@@ -173,10 +156,7 @@ jobs:
        run: |
          sudo apt-get -qq update
          #sudo apt-get -qq update && sudo apt-get -qq upgrade
-          sudo apt-get -qq install  build-essential gawk flex rsync swig unzip zlib1g-dev file wget
-          sudo apt-get -qq install  libc6-dev clang bison g++ gcc-multilib g++-multilib
-          sudo apt-get -qq install  gettext git libncurses5-dev libssl-dev python3-setuptools
-          sudo apt-get -qq install  libc6-dev pkg-config squashfs-tools
+          sudo apt-get -qq install $(cat $DEPENDENCIES)
          sudo apt-get -qq autoremove --purge
          sudo apt-get -qq clean
          sudo timedatectl set-timezone "$TZ"
@@ -189,108 +169,40 @@ jobs:
          remove-haskell: true
          remove-codeql: true
          remove-docker-images: true
-
-      - name: Set fixed workspace
-        env: 
-          GITHUB_WORKSPACE: ${{ github.workspace }}
-        run: |
-          sudo mkdir -p $GITHUB_WORKSPACE/_temp
-          #sudo chown -R $USER:$USER $GITHUB_WORKSPACE
-          echo "GITHUB_WORKSPACE = $GITHUB_WORKSPACE"
-          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE" >> $GITHUB_ENV
-          echo "RUNNER_TEMP=$GITHUB_WORKSPACE/_temp" >> $GITHUB_ENV
-          
+        
      - name: Checkout builder
        uses: actions/checkout@main

      - name: Download OpenWrt sources
-        run: |
-          git clone --branch $REPO_BRANCH $REPO_URL.git openwrt
-          rm -rf .git
-          rsync -a openwrt/ ./
-          rm -rf openwrt  
+        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/master/keys/apksign/20241123170031.pub
-          wget https://fantastic-packages.github.io/releases/25.12/20241123170031.pub
+          wget https://github.com/fantastic-packages/packages/raw/refs/heads/25.12/keys/usign/53FF2B6672243D28.pub

      - name: Update OpenWrt packages
        id: update
        run: |
-          ./xupdate.sh -f
-          mkdir -p logs
-          echo "status=success" >> $GITHUB_OUTPUT
-          
-      - name: Prepare for cache
-        id: cache_prepare
-        env: 
-          TARGET: ${{ matrix.target }}
-          USE_CACHE: ${{ github.event.inputs.use_cache }}
-          CACHE_VER: ${{ github.event.inputs.cache_ver }}
-        run: |
-          if [ "$USE_CACHE" = "true" ]; then
-              rm -rf staging_dir/
-              mkdir -p staging_dir/host
-              rm -rf build_dir/
-              mkdir -p build_dir/host
-          fi
-          if [[ " kng_re r3g r3p " == *" $TARGET "* ]]; then
-              CACHE_ARCH=mips
-          else
-              CACHE_ARCH=arm
-          fi
-          echo "CACHE_ARCH = $CACHE_ARCH"
-          echo "USE_CACHE=$USE_CACHE" >> $GITHUB_ENV
-          echo "CACHE_VER=$CACHE_VER" >> $GITHUB_ENV
-          echo "CACHE_ARCH=$CACHE_ARCH" >> $GITHUB_ENV
+          cd $BUILD_ROOT && ./xupdate.sh -f
          echo "status=success" >> $GITHUB_OUTPUT

-      - name: Restore cache for host tools
-        id: tools_cache_restore
-        if: github.event.inputs.use_cache == 'true'
-        uses: actions/cache/restore@v4
-        with:
-          key: host-tools-${{ env.CACHE_VER }}-${{ env.CACHE_ARCH }}-${{ hashFiles('tools/**') }}
-          path: |
-            staging_dir/host
-            build_dir/host
-
-      - name: Fix time stamps into restored dirs
-        if: github.event.inputs.use_cache == 'true' && steps.tools_cache_restore.outputs.cache-hit == 'true'
-        run: |
-          touch staging_dir/host/.prepared
-          touch staging_dir/host/.prereq-build
-          touch staging_dir/host/stamp/.* 2>/dev/null
-          find build_dir/host -name ".prepared*"  -exec touch {} +
-          find build_dir/host -name ".configured" -exec touch {} +
-          find build_dir/host -name ".built"      -exec touch {} +
-
-      - name: Inspect restored host tools
-        if: github.event.inputs.use_cache == 'true'
-        run: |
-          echo "====== openwrt-native.txt ======"
-          cat build_dir/host/pkgconf-*/openwrt-native.txt || true
-          echo "====== staging_dir/host ====="
-          du -sh staging_dir/host || true
-          ls -la staging_dir/host || true
-          echo "====== staging_dir/host/bin ====="
-          du -sh staging_dir/host/bin || true
-          ls -1  staging_dir/host/bin | head -20 || true
-          echo "====== build_dir/host ======="
-          du -sh build_dir/host || true
-          ls -1  build_dir/host | head -20 || true
-          echo "====== path info ========"
-          grep -R "/home/runner" build_dir/host | head
-
-      - name: Configure
-        id: configure
+      - 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
@@ -298,8 +210,6 @@ jobs:
          [ -z "$G_BOARD_NAME" ] && exit 32
          G_SUBTARGET_NAME=$( grep -so '^CONFIG_TARGET_SUBTARGET=.*' .config | cut -d'"' -f2 )
          [ -z "$G_SUBTARGET_NAME" ] && exit 33
-          G_TARGET_ARCH=$( grep -so '^CONFIG_TARGET_ARCH_PACKAGES=.*' .config | cut -d'"' -f2 )
-          echo "G_TARGET_ARCH = $G_TARGET_ARCH"
          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
@@ -307,124 +217,23 @@ jobs:
          if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
              exit 41
          fi
-          FILE_DATE=$(date --utc +'%y%m%d')
-          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 "G_TARGET_ARCH=$G_TARGET_ARCH" >> $GITHUB_ENV
-          echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV
-
-      - name: Dump .config file
-        run: |
-          echo "====== .config ========="
-          cat .config
-          echo "========================"
-          cp -f .config logs/config1
-          cp -f .config config1
-
-      - name: Monitor memory
-        run: |
-          echo "CPU cores = $(nproc)"
-          echo "Memory and swap:"
-          sudo free -h
-          echo
-          sudo swapon --show
-          echo
-          echo "Available storage:"
-          sudo df -h
-
-      - name: Download sources (dl)
-        id: download
-        if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
-        run: |
-          make -j$(nproc) download
-          echo "status=success" >> $GITHUB_OUTPUT
-
-      - name: Fix time stamps into restored dirs
-        if: github.event.inputs.use_cache == 'true' && steps.tools_cache_restore.outputs.cache-hit == 'true'
-        run: |
-          touch staging_dir/host/.prepared
-          touch staging_dir/host/.prereq-build
-          touch staging_dir/host/stamp/.* 2>/dev/null
-          find build_dir/host -name ".prepared*"  -exec touch {} +
-          find build_dir/host -name ".configured" -exec touch {} +
-          find build_dir/host -name ".built"      -exec touch {} +
-
-      - name: Build tools and toolchain
-        id: tools
-        if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
-        run: |
-          make toolchain/install -j$(nproc)
-          echo "status=success" >> $GITHUB_OUTPUT
-
-      - name: Save cache for host tools
-        id: tools_cache_save
-        if: steps.tools.outputs.status == 'success'
-        uses: actions/cache/save@v4
-        with:
-          key: host-tools-${{ env.CACHE_VER }}-${{ env.CACHE_ARCH }}-${{ hashFiles('tools/**') }}
-          path: |
-            staging_dir/host
-            build_dir/host
-
-      - name: Configure 2
-        id: configure2
-        if: steps.tools.outputs.status == 'success'
-        env: 
-          TARGET: ${{ matrix.target }}
-        run: |
-          make clean
-          ./xmake.sh -I -t $TARGET
-          mkdir -p logs
-          cp -f .config logs/config2
-          [ -f config1 ] && cp -f config1 logs/config1
-
-      - name: Kernel compile
-        id: kernel
-        if: ${{ steps.tools.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
-        run: |
-          make target/linux/compile -j$(nproc)
-          echo "status=success" >> $GITHUB_OUTPUT
-
-      - name: Monitor memory 2
-        run: |
-          echo "Memory and swap:"
-          sudo free -h
-          echo
-          sudo swapon --show
-          echo
-          echo "Available storage:"
-          sudo df -h
-
-      - name: Build the firmware image
-        id: compile
-        if: steps.tools.outputs.status == 'success'
-        env: 
-          TARGET: ${{ matrix.target }}
-        run: |
-          echo "Run $(nproc) thread compile"
-          if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$G_PKG_DIR" != "" ]; then
-              make target/linux/compile -j$(npoc)
-              echo "=============== BUILD PACKAGE: $G_PKG_DIR ==============="
-              make $G_PKG_DIR/compile V=sc BUILD_LOG=1
-              exit 99
-          fi
+          # run build
          if [ "$FAKE_BUILD" != "true" ]; then
              if [ "$TEST_BUILD" != "true" ]; then
-                  make -j$(nproc) world
+                  make -j $MAKE_JOBS download world
              else
-                  make V=sc world
+                  make V=sc download world
              fi
          fi
          # process results
-          OUT_DIR=bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
+          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 '[^"]*$' )
@@ -435,40 +244,24 @@ jobs:
              exit 100
          fi
          echo "status=success" >> $GITHUB_OUTPUT
-          echo "FW_BUILD_OK=1" >> $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
-
-      - name: Mark firmware build failed
-        if: false # steps.compile.outcome == 'failure'
-        run: |
-          echo "Firmware build failed, continuing pipeline"
-          echo "FW_BUILD_OK=0" >> $GITHUB_ENV
-          OUT_DIR=_bin_fake
-          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"
-          echo "BUILD FAILED" > $OUT_DIR/FAILED.txt
-          echo "BLD_VER=$FW_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: Check OOM error
-        if: failure()
-        run: |
-          dmesg | grep -i -E 'oom|killed process' || true
-          echo "================== Memory ================="
-          free -h
-    
      - 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
+          tar -cJvf logs-$TARGET-$FW_DATE.tar.xz $LOGS_DIR

      - name: Cleanup OUT directory 
        if: steps.compile.outputs.status == 'success'
@@ -493,7 +286,7 @@ jobs:
        uses: actions/upload-artifact@main
        if: steps.compile.outputs.status == 'success'
        with:
-          name: openwrt-${{ env.BLD_VER }}-${{ needs.check.outputs.build_date }}-${{ env.G_DEVICE_NAME }}
+          name: openwrt-${{ env.BLD_VER }}-${{ needs.check.outputs.build_date }}-${{ env.DEVICE_NAME }}
          path: ${{ env.OUT_DIR }}
          if-no-files-found: error

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

  release:
@@ -517,16 +310,6 @@ jobs:
        with:
          pattern: openwrt-*

-      - name: Check for failed builds
-        run: |
-          echo "Checking for FAILED.txt in openwrt-* directories..."
-          FAILED_DIRS=$( find . -maxdepth 1 -type d -name 'openwrt-*' -exec test -f '{}/FAILED.txt' \; -print )
-          if [ -n "$FAILED_DIRS" ]; then
-            echo "❌ Build failures detected in:"
-            exit 201
-          fi
-          echo "✅ No FAILED.txt found, proceeding to release"
-    
      - name: Put images into zip
        run: |
          mkdir -p public
@@ -539,7 +322,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAG: ${{ needs.check.outputs.tag }}
        with:
-          prerelease: true
+          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
          tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
          name: '${{ needs.check.outputs.tag }}'
          body: |
--- a/_proxy.config
+++ b/_proxy.config
@@ -9,7 +9,12 @@ 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

 CONFIG_PACKAGE_zapret2=y
+CONFIG_PACKAGE_zapret2-mdig=y
+CONFIG_PACKAGE_zapret2-ip2net=y
 CONFIG_PACKAGE_luci-app-zapret2=y
--- a/xmake.sh
+++ b/xmake.sh
@@ -108,7 +108,6 @@ function build_target {
 		############ change images prefix ############
 		# IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
 		sed -i -e 's/^IMG_PREFIX:=.*/IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(call sanitize,$(VERSION_NUMBER))-'$CURDATE'/g' $XDIR/include/image.mk
-		echo ">>> image.mk patched !!!"
 	fi
 	if [ 1 = 1 ]; then
 		############ remove "squashfs" suffix ############
@@ -143,13 +142,10 @@ function build_target {
 	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
-		echo ">>> podkop patched !!!"
 	fi

 	DROPBEAR_DIR=$XDIR/package/network/services/dropbear
-	DROPBEAR_MK=$DROPBEAR_DIR/Makefile
 	TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
-	TMP_DROPBEAR_MK=$TMP_DROPBEAR_DIR/Makefile
 	if [ -f $DROPBEAR_MK ]; then
 		# download dropbear 2024.86 (OpenWrt v24.10)
 		if [ ! -f $TMP_DROPBEAR_DIR/Makefile ]; then
@@ -163,22 +159,20 @@ function build_target {
 			rm -rf $TMP_DROPBEAR_DIR/package
 			rm -rf $TMP_DROPBEAR_DIR/.git
 		fi
+		rm -rf $DROPBEAR_DIR/files
+		rm -rf $DROPBEAR_DIR/patches
 	fi
-	if [ -f $TMP_DROPBEAR_MK ] && ! grep -q 'PKG_RELEASE:=0' $TMP_DROPBEAR_MK ; then
-		# patch: Disable MODERN and enable RSA/DH-SHA1
-		sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $TMP_DROPBEAR_MK
-		sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $TMP_DROPBEAR_MK
-		sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $TMP_DROPBEAR_MK
-		sed -i 's/ CONFIG_DROPBEAR_MODERN_ONLY/ /g' $TMP_DROPBEAR_MK
-		sed -i 's/DROPBEAR_DH_GROUP14_SHA1,0/ /g' $TMP_DROPBEAR_MK
-		sed -i 's/DROPBEAR_SHA1_HMAC,0/ /g' $TMP_DROPBEAR_MK
-		echo ">>> dropbear patched !!! (disable MODERN_ONLY)"
-	fi
-	if [ -f $DROPBEAR_MK ]  && [ -f $TMP_DROPBEAR_MK ] && ! cmp -s $DROPBEAR_MK $TMP_DROPBEAR_MK ; then
+	DROPBEAR_MK=$DROPBEAR_DIR/Makefile
+	if [ -f $DROPBEAR_MK ]; then
 		# downgrade dropbear to 2024.86 (OpenWrt v24.10)
-		rm -rf $DROPBEAR_DIR/*
 		cp -a $TMP_DROPBEAR_DIR/. $DROPBEAR_DIR/
-		echo ">>> dropbear downgraded to 2024.86 !!!"
+		# 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
+		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
@@ -288,29 +282,28 @@ function build_target {
 		echo "Patch '$(basename $incfn)' result: OK"
 	done
 	
-	APK_DIR=$XDIR/files/etc/apk
-	if [ -d $APK_DIR ]; then
-		rm -rf $APK_DIR
+	OPKG_DIR=$XDIR/files/etc/opkg
+	if [ -d $OPKG_DIR ]; then
+		rm -rf $OPKG_DIR
 	fi
-	FANT_PKG_KEY=$XDIR/20241123170031.pub
+	FANT_PKG_KEY=$XDIR/53FF2B6672243D28.pub
 	if [ -f $FANT_PKG_KEY ]; then
-		APK_SRC_DIR=$XDIR/package/system/apk/files
-		APK_KEYS_DIR=$APK_DIR/keys
-		mkdir -p $APK_KEYS_DIR
-		cp $FANT_PKG_KEY $APK_KEYS_DIR/fantastic-packages-20241123170031.pem
-		APK_CFEED_FN=$APK_DIR/repositories.d/customfeeds.list
-		mkdir -p $APK_DIR/repositories.d
-		cp $APK_SRC_DIR/customfeeds.list $APK_CFEED_FN
-		PKG_LINK="https://fantastic-packages.github.io/releases/<<VER>>/packages/<<ARCH>>"
-		echo "" >> $APK_CFEED_FN
-		echo "$PKG_LINK/luci/packages.adb"      >> $APK_CFEED_FN
-		echo "$PKG_LINK/packages/packages.adb"  >> $APK_CFEED_FN
-		echo "$PKG_LINK/special/packages.adb"   >> $APK_CFEED_FN
+		OPKG_SRC_DIR=$XDIR/package/system/opkg/files
+		OPKG_KEYS_DIR=$OPKG_DIR/keys
+		mkdir -p $OPKG_KEYS_DIR
+		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
+		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>>/25.12/g" $APK_CFEED_FN
-		sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $APK_CFEED_FN
-		logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/releases]"
+		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

 	SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf
Author	SHA1	Message	Date
remittor	6897181d32	fix 2	2025-12-29 13:09:48 +03:00
remittor	1ad38544bf	fix 1	2025-12-29 12:59:05 +03:00