fix(ci): fix openwrt 25 build

Author: Maxim Kurbatov

.github/workflows/ci-packages.yml

@@ -100,6 +100,8 @@ jobs:
             architecture: "aarch64_cortex-a53"
           - openwrt_version: "25.12.2"
             architecture: "aarch64_cortex-a53"
+          - openwrt_version: "25.12.2"
+            architecture: "x86_64"
     uses: ./.github/workflows/reusable-openwrt-packages.yml
     with:
       openwrt_version: ${{ matrix.build.openwrt_version }}

build_scripts/collect-openwrt.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# collect-openwrt.sh — Rename compiled OpenWrt packages and generate repository indexes.
+# collect-openwrt.sh — Collect compiled OpenWrt packages and generate repository indexes.
 #
 # Usage: scripts/collect-openwrt.sh \
 #          <workspace-dir> <sdk-dir> <release-dir> \
@@ -28,7 +28,7 @@ DEBUG_DEST_ROOT="$RELEASE_DIR/openwrt-debug/${TAG}"
 mkdir -p "$RELEASE_DIR"
 mkdir -p "$DEBUG_DEST_ROOT"
 
-# ── Copy and rename packages ──────────────────────────────────────────────────
+# ── Copy packages ──────────────────────────────────────────────────────────────
 
 _copy_pkg() {
     local name_prefix="$1"  # "keen-pbr" or "keen-pbr-headless"
@@ -46,7 +46,11 @@ _copy_pkg() {
         ARCH_DIR_NAME="${PKG_ARCH}"
         DEST_DIR="$RELEASE_DIR/openwrt/${TAG}/${ARCH_DIR_NAME}"
         mkdir -p "$DEST_DIR"
-        cp "$f" "$DEST_DIR/${name_prefix}_${VERSION_RELEASE}_openwrt_${TAG}_${ARCHITECTURE}.${EXT}"
+        if [ "$EXT" = "apk" ]; then
+            cp "$f" "$DEST_DIR/$(basename "$f")"
+        else
+            cp "$f" "$DEST_DIR/${name_prefix}_${VERSION_RELEASE}_openwrt_${TAG}_${ARCHITECTURE}.${EXT}"
+        fi
     done
 }
 
@@ -126,13 +130,13 @@ if [ ! -x "$APK_BIN" ]; then
 fi
 
 if [ -n "$APK_BIN" ] && find "$RELEASE_DIR/openwrt/${TAG}" -type f \
-        -name "keen-pbr*_openwrt_${TAG}_${ARCHITECTURE}.apk" 2>/dev/null | grep -q .; then
+        -name "keen-pbr*.apk" 2>/dev/null | grep -q .; then
     rm -f "$APK_SIGNING_MARKER"
     for ARCH_DIR in $(find "$RELEASE_DIR/openwrt/${TAG}" -mindepth 1 -maxdepth 1 -type d | sort); do
         ARCH_DIR_NAME=$(basename "$ARCH_DIR")
         PKG_ARCH="${ARCH_DIR_NAME}"
         mapfile -t ARCH_APKS < <(find "$ARCH_DIR" -maxdepth 1 -type f \
-            -name "keen-pbr*_openwrt_${TAG}_${ARCHITECTURE}.apk" -printf '%f\n' | sort)
+            -name "keen-pbr*.apk" -printf '%f\n' | sort)
         if [ "${#ARCH_APKS[@]}" -gt 0 ]; then
             tmp_dir="$(mktemp -d)"
             for apk_file in "${ARCH_APKS[@]}"; do

docs/content/docs/getting-started/installation/openwrt.md

@@ -18,11 +18,6 @@ The repository page automatically shows the correct flow for your target:
 
 Install `dnsmasq-full` before installing keen-pbr:
 
-{{< callout type="info" >}}
-OpenWrt 25.x and newer also need `dnsmasq-full` instead of the default `dnsmasq`.
-I do not have an `apk`-based router to test the exact replacement steps yet. If you know the correct procedure, please send a PR to improve these docs.
-{{< /callout >}}
-
 ```bash {filename="bash"}
 # OpenWrt 25.x and newer
 apk --update-cache add dnsmasq-full