base: Add lscpu and bind-tools

.github/workflows/build.yml

@@ -42,14 +42,6 @@ on:
         options:
         - true
         - false
-      trx_build:
-        description: 'TRX images build'
-        required: true
-        default: 'false'
-        type: choice
-        options:
-        - true
-        - false
       suffix:
         description: 'TAG suffix'
         required: false
@@ -58,13 +50,14 @@ on:
 
 env:
   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 }}
   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-
+  REPO_BRANCH: xq-24.10
+  TAG_PREFIX: v24-
   TZ: UTC
   DEVICE_NAME: unknown
   BUILD_DATE: unknown
@@ -211,31 +204,6 @@ jobs:
       - name: Checkout builder
         uses: actions/checkout@main
 
-      - name: Prepare env params
-        env:
-          INP_FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
-          INP_TRX_BUILD: ${{ github.event.inputs.trx_build == 'true' }}
-          TARGET: ${{ matrix.target }}
-        run: |
-          FAKE_BUILD=$INP_FAKE_BUILD
-          TRX_BUILD=false
-          if [ "$INP_TRX_BUILD" = true ]; then
-              CFG="./_initramfs/$TARGET.config"
-              if [ -f "$CFG" ]; then
-                  TRX_BUILD=true
-                  echo "Start TRX build for $CFG"
-                  echo "OPT_INITRAMFS=-i" >> $GITHUB_ENV
-              else
-                  FAKE_BUILD=true
-                  echo "Start FAKE build for $TARGET"
-                  echo "SKIP_ME=true" >> $GITHUB_ENV
-              fi
-          fi
-          echo "FAKE_BUILD = $FAKE_BUILD"
-          echo "TRX_BUILD  = $TRX_BUILD"
-          echo "FAKE_BUILD=$FAKE_BUILD" >> $GITHUB_ENV
-          echo "TRX_BUILD=$TRX_BUILD" >> $GITHUB_ENV
-
       - name: Download OpenWrt sources
         run: |
           git clone --branch $REPO_BRANCH $REPO_URL.git openwrt
@@ -246,8 +214,7 @@ jobs:
       - name: Init builder
         run: |
           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/24.10/keys/usign/53FF2B6672243D28.pub
 
       - name: Update OpenWrt packages
         id: update
@@ -324,7 +291,7 @@ jobs:
           TARGET: ${{ matrix.target }}
           FW_VER: ${{ needs.check.outputs.fw_ver }}
         run: |
-          ./xmake.sh $OPT_INITRAMFS -I -t $TARGET
+          ./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 )
@@ -370,7 +337,7 @@ jobs:
 
       - name: Download sources (dl)
         id: download
-        if: ${{ steps.configure.outputs.status == 'success' && env.FAKE_BUILD != 'true' }}
+        if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
         run: |
           make -j$(nproc) download
           echo "status=success" >> $GITHUB_OUTPUT
@@ -387,7 +354,7 @@ jobs:
 
       - name: Build tools and toolchain
         id: tools
-        if: ${{ steps.configure.outputs.status == 'success' && env.FAKE_BUILD != 'true' }}
+        if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
         run: |
           make toolchain/install -j$(nproc)
           echo "status=success" >> $GITHUB_OUTPUT
@@ -409,14 +376,14 @@ jobs:
           TARGET: ${{ matrix.target }}
         run: |
           make clean
-          ./xmake.sh $OPT_INITRAMFS -I -t $TARGET
+          ./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' && env.FAKE_BUILD != 'true' }}
+        if: ${{ steps.tools.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
         run: |
           make target/linux/compile -j$(nproc)
           echo "status=success" >> $GITHUB_OUTPUT
@@ -451,57 +418,29 @@ jobs:
                   make V=sc world
               fi
           fi
-          echo "status=success" >> $GITHUB_OUTPUT
-          
-      - name: Process out results
-        id: install
-        if: steps.compile.outputs.status == 'success' || env.FAKE_BUILD == 'true'
-        env: 
-          TARGET: ${{ matrix.target }}
-          OUT_DIR: ./bin/targets/${{ env.G_BOARD_NAME }}/${{ env.G_SUBTARGET_NAME }}
-        run: |
-          if [ "$FAKE_BUILD" = true ]; then
+          # process results
+          OUT_DIR=bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
+          if [ "$FAKE_BUILD" = "true" ]; then
               mkdir -p logs
-              mkdir -p "$OUT_DIR"
-              cd "$OUT_DIR"
-              echo "$G_BOARD_NAME $G_SUBTARGET_NAME $G_DEVICE_NAME" > "$G_DEVICE_NAME.txt"
-              touch FAKE_BUILD.bin
-              touch kernel-debug.tar.zst
+              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"
               BLD_VER=$FW_VER
           else
-              if [ ! -d "$OUT_DIR" ]; then
-                  echo "OUT_DIR not found!"
-                  exit 99
-              fi
-              cd "$OUT_DIR"
-              BLD_VER=$( cat profiles.json | grep -so '"version_number":"[^"]*' | grep -so '[^"]*$' )
-          fi
-          if [ "$SKIP_ME" = true ]; then
-              touch FLAG-SKIP_ME
-          fi
-          if [ "$TRX_BUILD" = true ]; then
-              touch FLAG-TRX_BUILD
+              BLD_VER=$( cat $OUT_DIR/profiles.json | grep -so '"version_number":"[^"]*' | grep -so '[^"]*$' )
           fi
           echo "Firmware $BLD_VER [$FILE_DATE] builded!"
-          if [ ! -f kernel-debug.tar.zst ]; then
+          if [ ! -f $OUT_DIR/kernel-debug.tar.zst ]; then
               echo "File kernel-debug.tar.zst not found!"
               exit 100
           fi
-          if [ "$TRX_BUILD" = true ]; then
-              find . -maxdepth 1 -type f ! -name '*-initramfs*' ! -name 'FLAG-*' -delete
-              VER_MAJOR=$( echo "$BLD_VER" | cut -d. -f1 )
-              STD_IMG_DIR="openwrt-initramfs-bin-for-luci"
-              mkdir $STD_IMG_DIR
-              find . -maxdepth 1 -type f -name '*-initramfs*.bin' -exec mv -f {} $STD_IMG_DIR/openwrt-${VER_MAJOR}_${TARGET}_initramfs.bin \;
-              find . -maxdepth 1 -type f -name '*-initramfs*.trx' -exec mv -f {} openwrt-${VER_MAJOR}_${TARGET}_initramfs.trx \;
-          fi
           echo "status=success" >> $GITHUB_OUTPUT
           echo "FW_BUILD_OK=1" >> $GITHUB_ENV
           echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
           echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
 
       - name: Mark firmware build failed
-        if: false # steps.install.outcome == 'failure' || steps.compile.outcome == 'failure'
+        if: false # steps.compile.outcome == 'failure'
         run: |
           echo "Firmware build failed, continuing pipeline"
           echo "FW_BUILD_OK=0" >> $GITHUB_ENV
@@ -532,7 +471,7 @@ jobs:
           tar -cJvf logs-$TARGET-$FW_DATE.tar.xz logs
 
       - name: Cleanup OUT directory 
-        if: steps.install.outputs.status == 'success'
+        if: steps.compile.outputs.status == 'success'
         env:
           OUT_DIR: ${{ env.OUT_DIR }}
         run: |
@@ -552,7 +491,7 @@ jobs:
 
       - name: Upload OUT directory
         uses: actions/upload-artifact@main
-        if: steps.install.outputs.status == 'success'
+        if: steps.compile.outputs.status == 'success'
         with:
           name: openwrt-${{ env.BLD_VER }}-${{ needs.check.outputs.build_date }}-${{ env.G_DEVICE_NAME }}
           path: ${{ env.OUT_DIR }}
@@ -591,52 +530,19 @@ jobs:
       - name: Put images into zip
         run: |
           mkdir -p public
-          for DIR in openwrt-*; do
-              [ -d "$DIR" ] || continue
-              if [ -f "$DIR/FLAG-SKIP_ME" ]; then
-                  echo "Skip $DIR"
-                  continue
-              fi
-              ZIP_SUFFIX=""
-              if [ -f "$DIR/FLAG-TRX_BUILD" ]; then
-                  echo "TRX_BUILD=true" >> $GITHUB_ENV
-                  ZIP_SUFFIX=".trx"
-              fi
-              rm -f "$DIR"/FLAG-*
-              zip_name="./public/$(basename "$DIR")${ZIP_SUFFIX}.zip"
-              echo "Creating $zip_name"
-              ( cd "$DIR"; zip -0 -r "../$zip_name" . )
-          done
-
-      - name: Show all zip files
-        run: |
+          find . -mindepth 1 -type d -name 'openwrt-*' -exec sh -c 'zip -0 ./public/$(basename {}).zip -j {} {}/*' \;
           ls -lh ./public/*.zip
 
-      - name: Generate names
-        env:
-          TAG: ${{ needs.check.outputs.tag }}
-          FW_VER: ${{ needs.check.outputs.fw_ver }}
-          FW_DATE: ${{ needs.check.outputs.fw_date }}
-        run: |
-          NAME="$TAG"
-          DESC="OpenWrt $FW_VER [$FW_DATE]"
-          if [ "$TRX_BUILD" = true ]; then
-              NAME="TRX-$TAG"
-              TAG="$TAG-trx"
-              DESC="TRX images based on $DESC"
-          fi
-          echo "REL_TAG=$TAG" >> $GITHUB_ENV
-          echo "REL_NAME=$NAME" >> $GITHUB_ENV
-          echo "REL_DESC=$DESC" >> $GITHUB_ENV
-
       - name: Upload assets
-        uses: softprops/action-gh-release@v2
+        uses: andelf/nightly-release@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: ${{ needs.check.outputs.tag }}
         with:
-          draft: ${{ env.TEST_BUILD == 'true' || github.event.inputs.fake_build  == 'true' }}
           prerelease: true
-          tag_name: ${{ env.REL_TAG }}${{ env.TAG_SUFFIX }}
-          name: '${{ env.REL_NAME }}'
+          tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
+          name: '${{ needs.check.outputs.tag }}'
           body: |
-            ${{ env.REL_DESC }}
+            OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]
             author: [remittor](https://github.com/remittor)
           files: ./public/*.zip

_cfginc/_base.config

@@ -123,7 +123,6 @@ CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_luci-proto-relay=y
 
 ### Luci proto
-CONFIG_PACKAGE_luci-proto-gre=y
 CONFIG_PACKAGE_luci-proto-3g=y
 CONFIG_PACKAGE_luci-proto-ipv6=y
 

tuf-ax4200q.config

@@ -40,3 +40,5 @@ CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 
+CONFIG_PACKAGE_fantastic-feeds=m
+

xmake.sh

@@ -117,22 +117,12 @@ function build_target {
 			sed -i 's/ squashfs-sys/ sys/g' $XDIR/target/linux/mediatek/image/mt7622.mk
 			sed -i 's/ squashfs-sys/ sys/g' $XDIR/target/linux/mediatek/image/mt7623.mk
 		fi
-	fi
-
-	BATADV_DIR=$XDIR/feeds/luci/protocols/luci-proto-batman-adv/htdocs/luci-static/resources/protocol
-	if [ -d $BATADV_DIR ]; then
-		if [ ! -f $BATADV_DIR/batadv_vlan.js ]; then
-			BATADV_VLAN_URL="https://github.com/luminem/luci/raw/4e0612a45e4be8c58de2bbd21c3bffbcf5252be4/protocols/luci-proto-batman-adv/htdocs/luci-static/resources/protocol/batadv_vlan.js"
-			curl -sSL "$BATADV_VLAN_URL" -o "$BATADV_DIR/batadv_vlan.js"
-			echo ">>> batman_adv patched !!!"
-		fi
-	fi
+	fi	
 	
 	RAB_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile
 	if [ -f $RAB_LUCI_MK ]; then
 		if ! grep "PKG_PROVIDES" $RAB_LUCI_MK >/dev/null ; then
 			sed -i 's/LUCI_PKGARCH:=all/LUCI_PKGARCH:=all\nPKG_PROVIDES:=luci-app-ruantiblock/g' $RAB_LUCI_MK
-			echo ">>> ruantiblock patched !!!"
 		fi
 	fi
 
@@ -177,40 +167,17 @@ function build_target {
 		[ "$PODKOP_PATCH" != "" ] && echo ">>> podkop patched !!! $PODKOP_PATCH"
 	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
+	DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
 	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
-	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
+		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
 		echo ">>> dropbear patched !!! (disable MODERN_ONLY)"
 	fi
-	if [ -f $DROPBEAR_MK ]  && [ -f $TMP_DROPBEAR_MK ] && ! cmp -s $DROPBEAR_MK $TMP_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 !!!"
-	fi
 
 	make defconfig
 
@@ -322,32 +289,31 @@ 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>>/24.10/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
 	if [ $BUILD_ONLY_INITRAMFS = true ]; then
-		rm -f $APK_DIR/repositories.d/customfeeds.list
+		rm -f $OPKG_DIR/customfeeds.conf
 	fi
 
 	SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf