update

.github/workflows/Openwrt-AutoBuild.yml

@@ -65,13 +65,15 @@ jobs:
         if [ ${{matrix.target}} == "x86_64" ]; then
             echo "ARCH=linux/amd64" >> $GITHUB_ENV
             echo "MTARGET=x86_64" >> $GITHUB_ENV
-        elif [ ${{matrix.target}} == "phicomm-N1" ]; then
+        elif [[ ${{matrix.target}} =~ (armvirt_64|ipq807x|mediatek_mt7622) ]]; then
             echo "MTARGET=aarch64_cortex-a53" >> $GITHUB_ENV
+        elif [[ ${{matrix.target}} == "ramips_mt7621" ]]; then
+            echo "MTARGET=mipsel_24kc" >> $GITHUB_ENV
         else
           echo "ARCH=linux/arm64" >> $GITHUB_ENV
-          if [[ ${{matrix.target}} == "Rpi-4B" ]]; then
+          if [[ ${{matrix.target}} == "bcm27xx_bcm2711" ]]; then
             echo "MTARGET=aarch64_cortex-a72" >> $GITHUB_ENV
-          else
+          elif [[ ${{matrix.target}} == "rockchip" ]]; then
             echo "MTARGET=aarch64_generic" >> $GITHUB_ENV
           fi
         fi
@@ -99,6 +101,8 @@ jobs:
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean ) &
         sudo timedatectl set-timezone "$TZ"
+        sudo mkdir -p /workdir
+        sudo chown $USER:$GROUPS /workdir
     
     - name: Get current date
       id: date
@@ -109,37 +113,35 @@ jobs:
         [ "$VERSION" ] && echo "VERSION=$VERSION" >> $GITHUB_ENV || echo "VERSION=$(date +'%m.%d')" >> $GITHUB_ENV
 
     - name: Clone source code
+      working-directory: /workdir
       run: |
         [ "${{ env.REPO_BRANCH }}" ] ||
             REPO_BRANCH="$((curl -gs -H 'Content-Type: application/json' \
                -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, 'sdk') }}" == "true" ]]; then
+        if [[ "${{ contains(github.event.action, 'nosdk') }}" != "true" ]]; then
         cd openwrt
         if [[ ${{matrix.target}} == "x86_64" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/x86/64/openwrt-sdk-$REPO_BRANCH-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -m 60 -o sdk.tar.xz https://openwrt.tetaneutral.net/releases/21.02-SNAPSHOT/targets/x86/64/openwrt-sdk-21.02-SNAPSHOT-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz
-        elif [[ ${{matrix.target}} == nanopi* ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/rockchip/armv8/openwrt-sdk-$REPO_BRANCH-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -m 60 -o sdk.tar.xz https://openwrt.tetaneutral.net/releases/21.02-SNAPSHOT/targets/rockchip/armv8/openwrt-sdk-21.02-SNAPSHOT-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz
-        elif [[ ${{matrix.target}} =~ "Rpi-4B" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/bcm27xx/bcm2711/openwrt-sdk-$REPO_BRANCH-bcm27xx-bcm2711_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -m 60 -o sdk.tar.xz https://openwrt.tetaneutral.net/releases/21.02-SNAPSHOT/targets/bcm27xx/bcm2711/openwrt-sdk-21.02-SNAPSHOT-bcm27xx-bcm2711_gcc-8.4.0_musl.Linux-x86_64.tar.xz
-        elif [[ ${{matrix.target}} =~ "phicomm-N1" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/armvirt/64/openwrt-sdk-$REPO_BRANCH-armvirt-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -m 60 -o sdk.tar.xz https://openwrt.tetaneutral.net/releases/21.02-SNAPSHOT/targets/armvirt/64/openwrt-sdk-21.02-SNAPSHOT-armvirt-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz
+            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
+            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
+        elif [[ ${{matrix.target}} == "armvirt_64" ]]; then
+            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/armvirt/64/openwrt-sdk-armvirt-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
+        elif [[ ${{matrix.target}} == "ramips_mt7621" ]]; then
+            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/ramips/mt7621/openwrt-sdk-ramips-mt7621_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
+        elif [[ ${{matrix.target}} == "mediatek_mt7622" ]]; then
+            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/mediatek/mt7622/openwrt-sdk-mediatek-mt7622_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
+        elif [[ ${{matrix.target}} == "ipq807x" ]]; then
+            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/ipq807x/generic/openwrt-sdk-ipq807x-generic_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
         fi
         fi
+        ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
         echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV
         echo "$REPO_BRANCH"
         
-    - name: Free up disk space
-      if: env.FREE_UP_DISK == 'true'
-      env:
-        DEBIAN_FRONTEND: noninteractive
-      run: |
-        sudo mkdir -p -m 777 /mnt/openwrt/dl /mnt/openwrt/staging_dir /mnt/openwrt/build_dir/hostpkg openwrt/build_dir
-        ln -sf /mnt/openwrt/dl openwrt/dl
-        ln -sf /mnt/openwrt/staging_dir openwrt/staging_dir
-        ln -sf /mnt/openwrt/build_dir/hostpkg openwrt/build_dir/hostpkg
-        
     - name: Load custom configuration
       run: |
         cp -rf devices/common/. openwrt/
@@ -193,20 +195,21 @@ jobs:
       run: |
         cd openwrt
         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
       run: |
         cd openwrt
         echo -e "$(($(nproc)+1)) thread compile"
-        make -j$(($(nproc)+1)) || make -j1 V=s
+        make -j$(($(nproc)+1)) || (curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage" ; make -j1 V=s)
         echo "::set-output name=status::success"
         mv -f .config ${{matrix.target}}.config
    
@@ -226,8 +229,7 @@ jobs:
         rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
         rename -v "s/friendlyarm_//" ./firmware/*/*gz || true
         rename -v "s/embedfire_//" ./firmware/*/*gz || true
-        rename -v "s/xiaomi_redmi-router/redmi/" *bin || true
-        rename -v "s/xiaoyu_)//" *bin || true
+        rename -v "s/xiaomi_redmi-router/redmi/" ./firmware/*/*bin || true
         mkdir ${{ env.REPO_BRANCH }}
         cp -rf openwrt/bin/targets ${{ env.REPO_BRANCH }}/
         Emoji=("🎉" "🤞" "✨" "🎁" "🎈" "🎄" "🎨" "💋" "🍓" "🍕" "🍉" "💐" "🌴" "🚀" "🛸" "🗽" "⛅" "🌈" "🔥" "⛄" "🐶" "🏅" "🦄" "🐤")
@@ -250,7 +252,7 @@ jobs:
 
     - name: Deploy kmods to server
       uses: easingthemes/ssh-deploy@main
-      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser') && env.MTARGET
+      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser')
       with:
         SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
         ARGS: "-avzr"
@@ -283,7 +285,7 @@ jobs:
 
     - name: remote ssh command
       uses: appleboy/ssh-action@master
-      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser') && env.MTARGET
+      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser')
       with:
         host: op.supes.top
         username: root
@@ -360,7 +362,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')
+      if: env.DOCKER_ID && env.DOCKER_PASSWD && ! contains(github.event.action, 'noser') && ${{matrix.target}} == "x86_64"
       with:
         platforms: ${{ env.ARCH }}
         file: Dockerfile
@@ -380,7 +382,7 @@ jobs:
       if: env.TELEGRAM_TOKEN && ! contains(github.event.action, 'notg')
       continue-on-error: true
       run: |
-        [ steps.compile.outputs.status == 'success' ] && curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=🎉 OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译成功 😋  https://op.supes.top/firmware/${{matrix.target}}/  ${{ env.COWURL }}   ${{ env.WETRANS }} 🚀" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage" || curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage"
+        curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=🎉 OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译成功 😋  https://op.supes.top/firmware/${{matrix.target}}/  ${{ env.COWURL }}   ${{ env.WETRANS }} 🚀" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage"
 
     - name: Delete workflow runs
       uses: GitRML/delete-workflow-runs@main

.github/workflows/repo-dispatcher.yml

@@ -59,15 +59,30 @@ jobs:
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
-          -d '{"event_type": "nanopi-r2s ${{ github.event.inputs.version }}", "client_payload": {"target": "nanopi-r2s"}}'
+          -d '{"event_type": "rockchip ${{ github.event.inputs.version }}", "client_payload": {"target": "rockchip"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
-          -d '{"event_type": "Rpi-4B ${{ github.event.inputs.version }}", "client_payload": {"target": "Rpi-4B"}}'
+          -d '{"event_type": "bcm27xx_bcm2711 ${{ github.event.inputs.version }}", "client_payload": {"target": "bcm27xx_bcm2711"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
-          -d '{"event_type": "phicomm-N1 ${{ github.event.inputs.version }}", "client_payload": {"target": "phicomm-N1"}}'
+          -d '{"event_type": "armvirt_64 ${{ github.event.inputs.version }}", "client_payload": {"target": "armvirt_64"}}'
+          curl \
+          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+          -d '{"event_type": "mediatek_mt7622 ${{ github.event.inputs.version }}", "client_payload": {"target": "mediatek_mt7622"}}'
+          curl \
+          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+          -d '{"event_type": "ramips_mt7621 ${{ github.event.inputs.version }}", "client_payload": {"target": "ramips_mt7621"}}'
+          curl \
+          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+          -d '{"event_type": "ipq807x ${{ github.event.inputs.version }}", "client_payload": {"target": "ipq807x"}}'
 

devices/phicomm-N1/patches/image.patch → devices/armvirt_64/patches/image.patch

@@ -25,7 +25,7 @@
 +	IMAGE_TYPE="sysupgrade" \
 +	IMAGE_FILESYSTEM="ext4" \
  	IMAGE_PREFIX="$(IMG_PREFIX)" \
- 	DEVICE_VENDOR="$$(DEVICE_VENDOR)" \
+ 	DEVICE_VENDOR="$(shell echo $($(PROFILE)_NAME) | cut -d " " -f1)" \
 @@ -320,5 +319,5 @@
  	VERSION_CODE="$(VERSION_CODE)" \
  	SUPPORTED_DEVICES="$($(PROFILE)_SUPPORTED_DEVICES)" \

devices/Rpi-4B/.config → devices/bcm27xx_bcm2711/.config

@@ -6,7 +6,3 @@ CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
 CONFIG_PACKAGE_kmod-drm-vc4=n
 CONFIG_PACKAGE_kmod-usb-net-lan78xx=n
 
-# Applications
-CONFIG_PACKAGE_luci-app-cpufreq=y
-
-CONFIG_PACKAGE_my-autocore-arm=y

devices/common/.config

@@ -12,6 +12,8 @@ CONFIG_SIGNATURE_CHECK=n
 # 设置固件大小:
 CONFIG_TARGET_ROOTFS_PARTSIZE=1004
 
+CONFIG_TESTING_KERNEL=y
+
 CONFIG_ALL_KMODS=y
 CONFIG_PACKAGE_kmod-ipt-coova=n
 CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
@@ -29,13 +31,19 @@ CONFIG_IPV6=y
 
 # Applications
 
+CONFIG_PACKAGE_luci-app-bypass=y
+
 # Themes
 
 CONFIG_PACKAGE_luci-theme-bootstrap=y
 CONFIG_PACKAGE_luci-theme-edge=y
 CONFIG_PACKAGE_luci-theme-argon=y
 
+CONFIG_PACKAGE_kmod-r8168=n
+CONFIG_PACKAGE_kmod-r8125=n
+
 # 其他需要安装的软件包:
+
 CONFIG_PACKAGE_dnsmasq=n
 CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_dhcp=y
@@ -73,6 +81,7 @@ CONFIG_PACKAGE_kmod-lib-zstd=y
 CONFIG_NODEJS_14=y
 
 CONFIG_OPENSSL_OPTIMIZE_SPEED=y
+CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
 CONFIG_OPENSSL_ENGINE_BUILTIN=y
 CONFIG_OPENSSL_ENGINE_BUILTIN_AFALG=y
 CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO=y
@@ -82,17 +91,11 @@ CONFIG_PACKAGE_kmod-tcp-bbr=y
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
-CONFIG_BUSYBOX_CONFIG_WGET=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO=y
 
 CONFIG_PACKAGE_bash=y
 CONFIG_PACKAGE_ca-bundle=y
 
-# USB3.0支持:
-CONFIG_PACKAGE_kmod-usb2=y
-CONFIG_PACKAGE_kmod-usb3=y
-CONFIG_PACKAGE_automount=y
-
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_REPO="https://op.supes.top"

devices/common/diy.sh

@@ -1,21 +1,15 @@
 #!/bin/bash
 #=================================================
 shopt -s extglob
-
+rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} tools/firmware-utils
 #latest="$(curl -sfL https://github.com/openwrt/openwrt/tree/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
-latest="master"
-current="$(git rev-parse HEAD)"
-[ "$latest" ] && git checkout $latest || git checkout master
-#git checkout HEAD^
+mkdir new; cp -rf .git new/.git
+cd new
+[ "$latest" ] && git reset --hard $latest || (git checkout master && git reset --hard HEAD)
+#git reset --hard HEAD^
 [ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $latest
-mv -f target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} .github/
-git checkout $current
-rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.15 include/kernel-defaults.mk
-mv -f .github/linux target/
-mv -f .github/kernel package/
-mv -f .github/boot package/
-mv -f .github/linux-firmware package/firmware/
-mv -f  .github/{kernel-*,netfilter.mk} include/
+cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} tools/firmware-utils ../
+cd -
 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 ' ')"
@@ -25,8 +19,7 @@ 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 \
 luci-app-wizard luci-app-attendedsysupgrade dnsmasq-full luci-base luci-compat luci-lib-ipkg fdisk \
-coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash \
-kmod-usb2 kmod-usb3 automount /" include/target.mk
+coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash /" include/target.mk
 sed -i "/dnsmasq \\\/d" include/target.mk
 
 sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward"
@@ -43,6 +36,7 @@ rm -rf package/{base-files,network/config/firewall,network/services/dnsmasq,netw
 ./scripts/feeds install -a
 cd feeds/kiddin9; git pull; cd -
 
+sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_generate
 rm -f package/feeds/packages/libpfring; svn export https://github.com/openwrt/packages/trunk/libs/libpfring package/feeds/kiddin9/libpfring
 rm -f package/feeds/packages/xtables-addons; svn export https://github.com/openwrt/packages/trunk/net/xtables-addons package/feeds/kiddin9/xtables-addons
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/packages/master/libs/xr_usb_serial_common/patches/0001-fix-build-with-kernel-5.15.patch -o package/feeds/packages/xr_usb_serial_common/patches/0001-fix-build-with-kernel-5.15.patch

devices/common/patches/imagebuilder.patch

@@ -116,8 +116,8 @@
 +	IMAGE_TYPE="rootfs" \
 +	IMAGE_FILESYSTEM="rootfs" \
 +	IMAGE_PREFIX="$(IMG_PREFIX)" \
-+	DEVICE_VENDOR="$$(DEVICE_VENDOR)" \
-+	DEVICE_MODEL="$($(PROFILE)_NAME)" \
++	DEVICE_VENDOR="$(shell echo $($(PROFILE)_NAME) | cut -d " " -f1)" \
++	DEVICE_MODEL="$(shell echo $($(PROFILE)_NAME) | cut -d " " -f2-)" \
 +	DEVICE_VARIANT="$$(DEVICE_VARIANT)" \
 +	DEVICE_TITLE="$($(PROFILE)_NAME)" \
 +	DEVICE_PACKAGES="$($(PROFILE)_PACKAGES)" \

devices/common/patches/usb.patch

@@ -0,0 +1,21 @@
+From f7845d71cf40a8bb6c586e6bb1427d8dbc0980c3 Mon Sep 17 00:00:00 2001
+From: kiddin9 <[email protected]>
+Date: Fri, 6 May 2022 12:04:28 +0800
+Subject: [PATCH] Update usb.mk
+
+---
+ package/kernel/linux/modules/usb.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
+index c9c1dfd75f92..ce858e9e5319 100644
+--- a/package/kernel/linux/modules/usb.mk
++++ b/package/kernel/linux/modules/usb.mk
+@@ -1708,6 +1708,7 @@ XHCI_AUTOLOAD := $(patsubst $(LINUX_DIR)/drivers/usb/host/%.ko,%,$(XHCI_FILES))
+ define KernelPackage/usb3
+   TITLE:=Support for USB3 controllers
+   DEPENDS:= \
++	+automount \
+ 	+kmod-usb-xhci-hcd \
+ 	+TARGET_bcm53xx:kmod-usb-bcma \
+ 	+TARGET_bcm53xx:kmod-phy-bcm-ns-usb3 \

devices/ipq807x/.config

@@ -0,0 +1,13 @@
+
+CONFIG_TARGET_ipq807x=y
+CONFIG_TARGET_ipq807x_generic=y
+CONFIG_TARGET_MULTI_PROFILE=y
+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_kmod-qca-mcs=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-qdisc=n
+CONFIG_PACKAGE_kmod-qca-nss-ecm=n
+CONFIG_PACKAGE_kmod-qca-nss-crypto=n
+

devices/ipq807x/diy.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+shopt -s extglob
+
+rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/qca
+svn export https://github.com/Boos4721/openwrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
+svn export https://github.com/Boos4721/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi
+svn export https://github.com/Boos4721/openwrt/trunk/package/qca package/qca
+
+rm -rf target/linux/ipq807x/!(patches-5.15)
+svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/linux/ipq807x
+rm -rf target/linux/ipq807x/{.svn,patches-5.15/.svn}
+svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x/patches-5.15 target/linux/ipq807x/patches-5.15
+
+sed -i 's/autocore-arm /my-autocore-arm /' target/linux/ipq807x/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-turboacc/' target/linux/ipq807x/Makefile
+
+echo '
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_AES_ARM64=y
+CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64=y
+CONFIG_CRYPTO_SIMD=y
+CONFIG_REALTEK_PHY=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_MOTORCOMM_PHY=y
+CONFIG_SENSORS_PWM_FAN=y
+' >> ./target/linux/ipq807x/config-5.15

devices/mediatek_mt7622/.config

@@ -0,0 +1,9 @@
+
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_mt7622=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_mediatek_mt7622_DEVICE_xiaomi_redmi-router-ax6s=y
+CONFIG_TARGET_DEVICE_mediatek_mt7622_DEVICE_linksys_e8450-ubi=y
+
+
+

devices/redmi-ax6s/diy.sh → devices/mediatek_mt7622/diy.sh

@@ -2,12 +2,9 @@
 
 shopt -s extglob
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq luci-app-natflow-users natflow-boot/' target/linux/mediatek/Makefile
+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/mediatek/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch
 
-rm -rf target/linux/mediatek/!(patches-5.15)
-svn co https://github.com/x-wrt/x-wrt/trunk/target/linux/mediatek target/linux/mediatek
-rm -rf target/linux/mediatek/{.svn,patches-5.15/.svn}
-svn co https://github.com/x-wrt/x-wrt/trunk/target/linux/mediatek/patches-5.15 target/linux/mediatek/patches-5.15
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq luci-app-natflow-users natflow-boot/' target/linux/mediatek/Makefile
 
 echo '
 CONFIG_ARM64_CRYPTO=y
@@ -33,4 +30,4 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_MOTORCOMM_PHY=y
 CONFIG_SENSORS_PWM_FAN=y
-' >> ./target/linux/rockchip/armv8/config-5.15
+' >> ./target/linux/mediatek/mt7622/config-5.15

devices/nanopi-r2s/.config

@@ -1,34 +0,0 @@
-
-CONFIG_TARGET_rockchip=y
-CONFIG_TARGET_rockchip_armv8=y
-CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y
-CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y
-CONFIG_TARGET_ROOTFS_EXT4FS=n
-
-CONFIG_PACKAGE_arm-trusted-firmware-rk3399=y
-CONFIG_PACKAGE_kmod-ptp=n
-CONFIG_PACKAGE_kmod-bnx2x=n
-CONFIG_PACKAGE_kmod-mlx4-core=n
-CONFIG_PACKAGE_kmod-mlx5-core=n
-CONFIG_PACKAGE_kmod-igc=n
-CONFIG_PACKAGE_kmod-sfc=n
-CONFIG_PACKAGE_kmod-e1000e=n
-CONFIG_PACKAGE_kmod-igb=n
-CONFIG_PACKAGE_kmod-igbvf=n
-CONFIG_PACKAGE_kmod-ixgbe=n
-CONFIG_PACKAGE_kmod-ixgbevf=n
-CONFIG_PACKAGE_kmod-i40e=n
-CONFIG_PACKAGE_kmod-tg3=n
-
-
-
-# Applications
-CONFIG_PACKAGE_luci-app-cpufreq=y
-
-CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
-
-# 其他需要安装的软件包:
-CONFIG_PACKAGE_my-autocore-arm=y
-
-CONFIG_PACKAGE_kmod-r8168=n

devices/nanopi-r4s/.config

@@ -1,12 +0,0 @@
-
-CONFIG_TARGET_rockchip=y
-CONFIG_TARGET_rockchip_armv8=y
-CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y
-CONFIG_TARGET_ROOTFS_EXT4FS=n
-
-# Applications
-CONFIG_PACKAGE_luci-app-cpufreq=y
-CONFIG_PACKAGE_luci-app-zerotier=n
-
-CONFIG_PACKAGE_my-autocore-arm=y
-CONFIG_PACKAGE_kmod-hwmon-pwmfan=y

devices/nanopi-r4s/diy.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../nanopi-r2s/diy.sh
-
-find "$SHELL_FOLDER/../nanopi-r2s/patches" -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"

devices/ramips_mt7621/.config

@@ -0,0 +1,13 @@
+
+CONFIG_TARGET_ramips=y
+CONFIG_TARGET_ramips_mt7621=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-cr660x=y
+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_xiaoyu_xy-c5=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_d-team_newifi-d2=y
+
+

devices/ramips_mt7621/diy.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+shopt -s extglob
+
+svn export --force https://github.com/x-wrt/x-wrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
+
+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
+
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-natflow-users natflow-boot/' target/linux/ramips/Makefile

devices/ramips_mt7621/patches/tblsection.patch

@@ -0,0 +1,19 @@
+--- a/package/feeds/luci/luci-compat/luasrc/view/cbi/tblsection.htm
++++ b/package/feeds/luci/luci-compat/luasrc/view/cbi/tblsection.htm
+@@ -123,6 +123,7 @@ <h3><%=self.title%></h3>
+ 
+ 			local isempty, section, i, k = true, nil, nil
+ 		    for i, k in ipairs(self:cfgsections()) do
++		    	if i <= 100 then
+ 				isempty = false
+ 				section = k
+ 
+@@ -165,6 +166,8 @@ <h3><%=self.title%></h3>
+ 				</td>
+ 			<%- end -%>
+ 		</tr>
++			<%- i=i+1 -%>
++			<%- end -%>
+ 		<%- end -%>
+ 
+ 		<%- if isempty then -%>

devices/redmi-ax6s/.config

@@ -1,9 +0,0 @@
-
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_mt7622=y
-CONFIG_TARGET_mediatek_mt7622_DEVICE_xiaomi_redmi-router-ax6s=y
-
-
-CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
-
-

devices/rockchip/.config

@@ -0,0 +1,26 @@
+
+CONFIG_TARGET_rockchip=y
+CONFIG_TARGET_rockchip_armv8=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-neo3=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_embedfire_doornet1=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_embedfire_doornet2=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus-lts=y
+
+CONFIG_PACKAGE_kmod-ptp=n
+CONFIG_PACKAGE_kmod-bnx2x=n
+CONFIG_PACKAGE_kmod-mlx4-core=n
+CONFIG_PACKAGE_kmod-mlx5-core=n
+CONFIG_PACKAGE_kmod-igc=n
+CONFIG_PACKAGE_kmod-sfc=n
+CONFIG_PACKAGE_kmod-e1000e=n
+CONFIG_PACKAGE_kmod-igb=n
+CONFIG_PACKAGE_kmod-igbvf=n
+CONFIG_PACKAGE_kmod-ixgbe=n
+CONFIG_PACKAGE_kmod-ixgbevf=n
+CONFIG_PACKAGE_kmod-i40e=n
+CONFIG_PACKAGE_kmod-tg3=n
+

devices/nanopi-r2s/diy.sh → devices/rockchip/diy.sh

@@ -16,8 +16,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 "s/BUILD_DEVICES:=/BUILD_DEVICES:=friendlyarm_nanopi-r2s/" package/boot/uboot-rockchip/Makefile
-
 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

devices/x86_64/.config

@@ -2,19 +2,13 @@
 CONFIG_TARGET_x86=y
 CONFIG_TARGET_x86_64=y
 
-CONFIG_TESTING_KERNEL=y
-
 # EFI支持:
 CONFIG_GRUB_IMAGES=y
 CONFIG_GRUB_EFI_IMAGES=y
 CONFIG_VMDK_IMAGES=n
 
 # 其他需要安装的软件包:
-CONFIG_PACKAGE_my-autocore-x86=y
 
-# x86
-CONFIG_PACKAGE_kmod-vmxnet3=y
-CONFIG_PACKAGE_kmod-r8125=y
-CONFIG_PACKAGE_kmod-igc=y
+CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n
 
 CONFIG_PACKAGE_kmod-r8169=n

devices/x86_64/diy.sh

@@ -3,7 +3,7 @@
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.15 target/linux/x86/patches-5.15
 rm -rf target/linux/x86/patches-5.15/.svn
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-r8125 kmod-vmxnet3 kmod-igc kmod-drm-i915 kmod-mlx4-core/' target/linux/x86/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-r8125 kmod-vmxnet3 kmod-igc kmod-drm-i915 kmod-mlx4-core kmod-usb2 kmod-usb3/' target/linux/x86/Makefile
 
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk