update

.github/workflows/Openwrt-AutoBuild.yml

@@ -73,7 +73,7 @@ jobs:
           echo "ARCH=linux/arm64" >> $GITHUB_ENV
           if [[ ${{matrix.target}} == "bcm27xx_bcm2711" ]]; then
             echo "MTARGET=aarch64_cortex-a72" >> $GITHUB_ENV
-          elif [[ ${{matrix.target}} == "rockchip" ]]; then
+          elif [[ ${{matrix.target}} == "rockchip_armv8" ]]; then
             echo "MTARGET=aarch64_generic" >> $GITHUB_ENV
           fi
         fi
@@ -120,11 +120,11 @@ jobs:
                -H "Authorization: Bearer ${{ secrets.REPO_TOKEN }}" \
                -X POST -d '{ "query": "query {repository(owner: \"openwrt\", name: \"openwrt\") {refs(refPrefix: \"refs/tags/\", last: 4, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) {edges {node {name}}}}}"}' https://api.github.com/graphql) | jq -r '.data.repository.refs.edges[].node.name' | grep v21 | tail -n 1 | sed -e 's/v//')"
         git clone $REPO_URL -b v$REPO_BRANCH openwrt
-        if [[ "${{ contains(github.event.action, 'nosdk') }}" != "true" ]]; then
+        if [[ "${{ contains(github.event.action, 'sdk') }}" == "true" ]]; then
         cd openwrt
         if [[ ${{matrix.target}} == "x86_64" ]]; then
             curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/x86/64/openwrt-sdk-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "rockchip" ]]; then
+        elif [[ ${{matrix.target}} == "rockchip_armv8" ]]; then
             curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/rockchip/armv8/openwrt-sdk-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
         elif [[ ${{matrix.target}} == "bcm27xx_bcm2711" ]]; then
             curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/bcm27xx/bcm2711/openwrt-sdk-bcm27xx-bcm2711_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
@@ -197,12 +197,12 @@ jobs:
         make download -j$(($(nproc)+1)) &
         sleep 5
 
-    #- name: Cache
-    #  uses: klever1988/cachewrtbuild@main
-    #  with:
-    #    ccache: 'true'
-    #    clean: ${{ contains(github.event.action, 'nocache') }}
-    #    prefix: ${{ github.workspace }}/openwrt
+    - name: Cache
+      uses: klever1988/cachewrtbuild@main
+      with:
+        ccache: 'true'
+        clean: ${{ contains(github.event.action, 'nocache') }}
+        prefix: ${{ github.workspace }}/openwrt
 
     - name: Compile the firmware
       id: compile
@@ -220,12 +220,10 @@ jobs:
       id: organize
       run: |
         shopt -s extglob
-        mkdir -p firmware/${{matrix.target}} kmods
+        mkdir -p firmware/${{matrix.target}}
         cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
         cp openwrt/${{matrix.target}}.config  ./firmware/${{matrix.target}}/${{matrix.target}}.config || true
         cp openwrt/build_dir/target-*/linux-*/linux-*/.config ./firmware/${{matrix.target}}/${{matrix.target}}_kernel.config
-        cp -rf openwrt/bin/targets/*/*/packages ./kmods/${{ env.KERNEL }} || true
-        rm -rf openwrt/bin/targets/*/*/packages/*.ipk
         rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
         rename -v "s/friendlyarm_//" ./firmware/*/*gz || true
         rename -v "s/embedfire_//" ./firmware/*/*gz || true
@@ -250,17 +248,6 @@ jobs:
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/firmware/"
 
-    - name: Deploy kmods to server
-      uses: easingthemes/ssh-deploy@main
-      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser')
-      with:
-        SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        ARGS: "-avzr"
-        SOURCE: kmods/
-        REMOTE_HOST: op.supes.top
-        REMOTE_USER: root
-        TARGET: "/www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/kmods/"
-
     - name: Deploy imagebuilder to server
       uses: easingthemes/ssh-deploy@main
       if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser')
@@ -294,6 +281,7 @@ jobs:
           cd /www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/
           opkg &
 
+    - run: rm -rf ${{ env.REPO_BRANCH }}/targets/*/*/{packages,openwrt-sdk*}
     - name: Upload firmware for artifact
       uses: actions/upload-artifact@main
       continue-on-error: true
@@ -301,9 +289,7 @@ jobs:
       with:
         name: ${{ env.VERSION }}_${{matrix.target}}
         path: |
-          ./firmware/
           ${{ env.REPO_BRANCH }}
-          openwrt/bin/packages/*/base/*-firmware*
 
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'
@@ -362,7 +348,7 @@ jobs:
     - name: Build and push docker image
       uses: docker/build-push-action@master
       continue-on-error: true
-      if: env.DOCKER_ID && env.DOCKER_PASSWD && ! contains(github.event.action, 'noser') && ${{matrix.target}} == "x86_64"
+      if: env.DOCKER_ID && env.DOCKER_PASSWD && ! contains(github.event.action, 'noser') && github.event.client_payload.target == 'x86_64'
       with:
         platforms: ${{ env.ARCH }}
         file: Dockerfile

README.md

@@ -157,8 +157,9 @@ Build OpenWrt using GitHub Actions
 ## Acknowledgments
 - [OpenWrt](https://github.com/openwrt/openwrt)
 - [Lean's OpenWrt](https://github.com/coolsnowwolf/lede)
-- [P3TERX](https://github.com/P3TERX/OpenWrt_x86-r2s-r4s/blob/master/LICENSE)
+- [P3TERX](https://github.com/P3TERX/Actions-OpenWrt/blob/master/LICENSE)
 - [aparcar](https://github.com/openwrt/asu)
+- [unifreq](https://github.com/unifreq/openwrt_packit)
 - [GitHub](https://github.com)
 - [GitHub Actions](https://github.com/features/actions)
 

devices/common/diy.sh

@@ -14,7 +14,7 @@ sed -i 's/ libelf//' tools/Makefile
 
 kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
 echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
-sed -i "s?targets/%S/packages?packages/%A/kmods/$kernel_v?" include/feeds.mk
+# sed -i "s?targets/%S/packages?packages/%A/kmods/$kernel_v?" include/feeds.mk
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advanced luci-app-firewall luci-app-gpsysupgrade luci-app-opkg luci-app-upnp luci-app-autoreboot \
@@ -65,9 +65,6 @@ sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/
 date=`date +%m.%d.%Y`
 sed -i -e "/\(# \)\?REVISION:=/c\REVISION:=$date" -e '/VERSION_CODE:=/c\VERSION_CODE:=$(REVISION)' include/version.mk
 
-sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk
-sed -i 's/ +kmod-thermal//' package/kernel/mt76/Makefile
-
 sed -i \
 	-e "s/+\(luci\|luci-ssl\|uhttpd\)\( \|$\)/\2/" \
 	-e "s/+nginx\( \|$\)/+nginx-ssl\1/" \

devices/common/patches/imagebuilder.patch

@@ -1,6 +1,6 @@
 --- a/target/imagebuilder/Makefile
 +++ b/target/imagebuilder/Makefile
-@@ -38,13 +38,14 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+@@ -38,13 +38,15 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
  		./files/repositories.conf \
  		$(TMP_DIR)/.targetinfo \
  		$(TMP_DIR)/.packageinfo \
@@ -13,6 +13,7 @@
  	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
 -endif
 +	$(SED) 's/^src\/gz \(.*\) https.*top\/\(packages.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
++	$(SED) 's/^src\/gz \(.*\) https.*top\/\(targets.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/releases\/\2/' $(PKG_BUILD_DIR)/repositories.conf
 +	$(SED) 's/\/kiddin9//' $(PKG_BUILD_DIR)/repositories.conf
  
  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages

devices/ipq807x/.config

@@ -6,6 +6,9 @@ CONFIG_TARGET_DEVICE_ipq807x_generic_DEVICE_redmi_ax6=y
 CONFIG_TARGET_DEVICE_ipq807x_generic_DEVICE_xiaomi_ax3600=y
 CONFIG_TARGET_DEVICE_ipq807x_generic_DEVICE_xiaomi_ax9000=y
 
+CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE_DRV=n
+CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE=y
+
 CONFIG_PACKAGE_kmod-qca-mcs=n
 CONFIG_PACKAGE_kmod-qca-nss-drv-qdisc=n
 CONFIG_PACKAGE_kmod-qca-nss-ecm=n

devices/ramips_mt7621/.config

@@ -7,6 +7,7 @@ CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-3g=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-3-pro=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-4=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_redmi-router-ac2100=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-ac2100=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaoyu_xy-c5=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_d-team_newifi-d2=y
 

devices/ramips_mt7621/diy.sh

@@ -2,12 +2,8 @@
 
 shopt -s extglob
 
-svn export --force https://github.com/x-wrt/x-wrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
+curl -sfL https://raw.githubusercontent.com/x-wrt/x-wrt/master/target/linux/mediatek/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch -o target/linux/ramips/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch
 
-svn export --force https://github.com/x-wrt/x-wrt/trunk/package/kernel/mt76 package/kernel/mt76
-rm -rf target/linux/ramips/!(patches-5.15)
-svn co https://github.com/x-wrt/x-wrt/trunk/target/linux/ramips target/linux/ramips
-rm -rf target/linux/ramips/{.svn,patches-5.15/.svn}
-svn co https://github.com/x-wrt/x-wrt/trunk/target/linux/ramips/patches-5.15 target/linux/ramips/patches-5.15
+svn export --force https://github.com/x-wrt/x-wrt/trunk/target/linux/ramips/files/drivers/net/ethernet/ralink target/linux/ramips/files/drivers/net/ethernet/ralink
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-natflow-users natflow-boot/' target/linux/ramips/Makefile

devices/ramips_mt7621/patches/cr660x.patch

@@ -0,0 +1,113 @@
+--- a/target/linux/ramips/image/mt7621.mk
++++ b/target/linux/ramips/image/mt7621.mk
+@@ -1831,7 +1831,7 @@ define Device/xiaomi_nand_separate
+   PAGESIZE := 2048
+   KERNEL_SIZE := 4096k
+   UBINIZE_OPTS := -E 5
+-  IMAGES += kernel1.bin rootfs0.bin
++  IMAGES += kernel1.bin
+   IMAGE/kernel1.bin := append-kernel
+   IMAGE/rootfs0.bin := append-ubi | check-size
+   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+@@ -1915,30 +1915,14 @@ define Device/xiaomi_mi-router-cr660x
+   KERNEL_SIZE := 4096k
+   UBINIZE_OPTS := -E 5
+   IMAGE_SIZE := 128512k
+-  IMAGES += firmware.bin
++  IMAGES += factory.bin
+   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+-  IMAGE/firmware.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
++  IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
+ 	check-size
+   DEVICE_PACKAGES += kmod-mt7915e uboot-envtools
++  DEVICE_MODEL := Mi Router CR6606 / CR6608 / CR6609
+ endef
+-
+-define Device/xiaomi_mi-router-cr6606
+-  $(Device/xiaomi_mi-router-cr660x)
+-  DEVICE_MODEL := Mi Router CR6606
+-endef
+-TARGET_DEVICES += xiaomi_mi-router-cr6606
+-
+-define Device/xiaomi_mi-router-cr6608
+-  $(Device/xiaomi_mi-router-cr660x)
+-  DEVICE_MODEL := Mi Router CR6608
+-endef
+-TARGET_DEVICES += xiaomi_mi-router-cr6608
+-
+-define Device/xiaomi_mi-router-cr6609
+-  $(Device/xiaomi_mi-router-cr660x)
+-  DEVICE_MODEL := Mi Router CR6609
+-endef
+-TARGET_DEVICES += xiaomi_mi-router-cr6609
++TARGET_DEVICES += xiaomi_mi-router-cr660x
+ 
+ define Device/xiaomi_redmi-router-ac2100
+   $(Device/xiaomi_nand_separate)
+
+--- /dev/null
++++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr660x.dts
+@@ -0,0 +1,8 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++
++#include "mt7621_xiaomi_mi-router-cr660x.dtsi"
++
++/ {
++	compatible = "xiaomi,mi-router-cr660x", "mediatek,mt7621-soc";
++	model = "Xiaomi Mi Router CR6606 / CR6608 / CR6609";
++};
+
+--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
++++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+@@ -131,9 +131,7 @@ tplink,tl-wpa8631p-v3)
+ xiaomi,mi-router-ac2100)
+ 	ucidef_set_led_netdev "wan-blue" "WAN (blue)" "blue:wan" "wan"
+ 	;;
+-xiaomi,mi-router-cr6606|\
+-xiaomi,mi-router-cr6608|\
+-xiaomi,mi-router-cr6609)
++xiaomi,mi-router-cr660x)
+ 	ucidef_set_led_netdev "internet" "Internet" "blue:net" "wan"
+ 	;;
+ xiaomi,redmi-router-ac2100)
+
+--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
++++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+@@ -27,9 +27,7 @@ ramips_setup_interfaces()
+ 	hiwifi,hc5962|\
+ 	xiaomi,mi-router-3-pro|\
+ 	xiaomi,mi-router-ac2100|\
+-	xiaomi,mi-router-cr6606|\
+-	xiaomi,mi-router-cr6608|\
+-	xiaomi,mi-router-cr6609|\
++	xiaomi,mi-router-cr660x|\
+ 	xiaomi,redmi-router-ac2100)
+ 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
+
+--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+@@ -88,9 +88,7 @@ platform_do_upgrade() {
+ 	xiaomi,mi-router-3-pro|\
+ 	xiaomi,mi-router-4|\
+ 	xiaomi,mi-router-ac2100|\
+-	xiaomi,mi-router-cr6606|\
+-	xiaomi,mi-router-cr6608|\
+-	xiaomi,mi-router-cr6609|\
++	xiaomi,mi-router-cr660x|\
+ 	xiaomi,redmi-router-ac2100)
+ 		nand_do_upgrade "$1"
+ 		;;
+
+--- a/package/boot/uboot-envtools/files/ramips
++++ b/package/boot/uboot-envtools/files/ramips
+@@ -73,9 +73,7 @@ zyxel,nr7101)
+ 		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x1000" "0x80000"
+ 	;;
+ bolt,arion|\
+-xiaomi,mi-router-cr6606|\
+-xiaomi,mi-router-cr6608|\
+-xiaomi,mi-router-cr6609)
++xiaomi,mi-router-cr660x)
+ 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000"
+ 	;;
+ esac

devices/rockchip/diy.sh → devices/rockchip_armv8/diy.sh

@@ -2,8 +2,6 @@
 
 shopt -s extglob
 
-sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk
-
 rm -rf package/boot/uboot-rockchip
 svn export --force https://github.com/coolsnowwolf/lede/trunk/package/boot/uboot-rockchip package/boot/uboot-rockchip
 svn export --force https://github.com/coolsnowwolf/lede/trunk/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
@@ -16,8 +14,6 @@ sed -i "s/KERNEL_PATCHVER=5.10/KERNEL_PATCHVER=5.15/" target/linux/rockchip/Make
 
 sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk
 
-sed -i '/;;/i\ethtool -K eth1 rx off tx off && logger -t disable-offloading "disabed rk3328 ethernet tcp/udp offloading tx/rx"' target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
-
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq/' target/linux/rockchip/Makefile
 
 echo '