update

.github/workflows/Openwrt-AutoBuild.yml

@@ -120,6 +120,24 @@ 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 v22 | tail -n 1 | sed -e 's/v//')"
         git clone $REPO_URL -b v$REPO_BRANCH openwrt
+        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://op.supes.top/releases/targets/x86/64/openwrt-sdk-x86-64_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true
+        elif [[ ${{matrix.target}} == "rockchip_armv8" ]]; then
+            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/rockchip/armv8/openwrt-sdk-rockchip-armv8_gcc-11.2.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/targets/bcm27xx/bcm2711/openwrt-sdk-bcm27xx-bcm2711_gcc-11.2.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/targets/armvirt/64/openwrt-sdk-armvirt-64_gcc-11.2.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/targets/ramips/mt7621/openwrt-sdk-ramips-mt7621_gcc-11.2.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/targets/mediatek/mt7622/openwrt-sdk-mediatek-mt7622_gcc-11.2.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/targets/ipq807x/generic/openwrt-sdk-ipq807x-generic_gcc-11.2.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"
@@ -179,24 +197,23 @@ jobs:
         make download -j$(($(nproc)+1)) &
         sleep 5
 
-    - name: Cache
-      if: contains(github.event.action, 'nocache') != 'true'
-      run: |
-        curl -fL -m 60 -o openwrt/cache.tar.gz https://op.supes.top/releases/targets/cache.tar.gz || true
-
     - name: Compile the firmware
       id: compile
       run: |
         cd openwrt
         echo -e "$(($(nproc)+1)) thread compile"
         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"
+        sed -i "s/# CONFIG_IB is not set/CONFIG_IB=y/" .config
+        make defconfig
+        make target/imagebuilder/compile -j$(($(nproc)+1))
+        make checksum V=s
    
     - name: Check space usage
       run: df -hT
 
     - name: Organize files
       id: organize
+      continue-on-error: true
       run: |
         shopt -s extglob
         mkdir -p firmware/${{matrix.target}}
@@ -208,7 +225,6 @@ jobs:
         mkdir packages
         cp -rf ${{ env.KERNEL }}/Packages* packages/
         cd -
-        tar -zcf openwrt/bin/targets/cache.tar.gz build_dir/host* build_dir/tool* staging_dir/host* staging_dir/tool*
         rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
         rename -v "s/friendlyarm_//" ./firmware/*/*gz || true
         rename -v "s/embedfire_//" ./firmware/*/*gz || true
@@ -272,7 +288,7 @@ jobs:
       with:
         name: ${{ env.VERSION }}_${{matrix.target}}
         path: |
-          openwrt/bin/targets
+          openwrt/bin/targets/
 
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'

.github/workflows/repo-dispatcher.yml

@@ -29,12 +29,6 @@ jobs:
   build:
     runs-on: Ubuntu-20.04
     steps:
-    - name: cancel running workflows
-      uses: styfle/cancel-workflow-action@main
-      with:
-        workflow_id: Openwrt-AutoBuild.yml,repo-dispatcher.yml
-        access_token: ${{ github.token }}
-
     - name: Checkout
       uses: actions/checkout@main
 

devices/armvirt_64/.config

@@ -5,7 +5,9 @@ CONFIG_TARGET_ROOTFS_EXT4FS=y
 CONFIG_TARGET_ROOTFS_SQUASHFS=n
 CONFIG_PACKAGE_kmod-brcmfmac=y
 CONFIG_BRCMFMAC_SDIO=y
+CONFIG_TARGET_ROOTFS_TARGZ=y
 
-CONFIG_TESTING_KERNEL=y
+CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
+CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
-CONFIG_JSON_OVERVIEW_IMAGE_INFO=n
+CONFIG_TESTING_KERNEL=y

devices/bcm27xx_bcm2711/.config

@@ -3,6 +3,9 @@ CONFIG_TARGET_bcm27xx=y
 CONFIG_TARGET_bcm27xx_bcm2711=y
 CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
 
+CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
+CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
+
 CONFIG_PACKAGE_kmod-drm-vc4=n
 CONFIG_PACKAGE_kmod-usb-net-lan78xx=n
 

devices/common/.config

@@ -1,7 +1,7 @@
 
 CONFIG_GRUB_TIMEOUT="0"
+CONFIG_GRUB_CONSOLE=n
 CONFIG_TARGET_ROOTFS_EXT4FS=n
-CONFIG_TARGET_ROOTFS_TARGZ=y
 CONFIG_TARGET_ROOTFS_INITRAMFS=n
 CONFIG_TARGET_ROOTFS_CPIOGZ=n
 CONFIG_LUCI_CSSTIDY=n
@@ -20,7 +20,6 @@ CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
 
 CONFIG_SDK=y
 
-CONFIG_IB=y
 CONFIG_IB_STANDALONE=y
 CONFIG_JSON_OVERVIEW_IMAGE_INFO=y
 
@@ -46,8 +45,6 @@ CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_dhcp=y
 CONFIG_PACKAGE_dnsmasq_full_ipset=y
 
-CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
-CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 CONFIG_NGINX_DAV=y
 CONFIG_PACKAGE_luci-base=y
 CONFIG_PACKAGE_luci-compat=y

devices/common/diy.sh

@@ -28,7 +28,7 @@ sed -i '/	refresh_config();/d' scripts/feeds
 sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default
 }
 
-rm -rf package/{base-files,network/config/firewall,network/config/firewall4,network/services/dnsmasq,network/services/ppp,system/opkg,libs/mbedtls}
+rm -rf package/{base-files,network/config/firewall,network/config/firewall4,network/services/dnsmasq,network/services/ppp,system/opkg,libs/mbedtls,firmware/wireless-regdb}
 
 ./scripts/feeds update -a
 ./scripts/feeds install -a -p kiddin9
@@ -36,11 +36,10 @@ rm -rf package/{base-files,network/config/firewall,network/config/firewall4,netw
 cd feeds/kiddin9; git pull; cd -
 
 mv -f feeds/kiddin9/r81* tmp/
-
+svn export --force https://github.com/openwrt/packages/trunk/kernel feeds/packages/kernel
 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
 
 (
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx
@@ -74,9 +73,19 @@ sed -i \
 	package/feeds/kiddin9/*/Makefile
 
 (
-if [ -f cache.tar.gz ]; then
-	tar -zxf cache.tar.gz
-	rm -f cache.tar.gz
-	find build_dir/{host*,toolchain-*} -name .built* -exec touch {} \;; touch staging_dir/{host*,toolchain-*}/stamp/.*
+if [ -f sdk.tar.xz ]; then
+	sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/kiddin9/*/Makefile
+	mkdir sdk
+	tar -xJf sdk.tar.xz -C sdk
+	cp -rf sdk/*/staging_dir/* ./staging_dir/
+	rm -rf sdk.tar.xz sdk
+	rm -rf `find "staging_dir/host/" -maxdepth 2 -name 'libelf*'` || true
+	sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile
+	if [ -f /usr/bin/python ]; then
+		ln -sf /usr/bin/python staging_dir/host/bin/python
+	else
+		ln -sf /usr/bin/python3 staging_dir/host/bin/python
+	fi
+	ln -sf /usr/bin/python3 staging_dir/host/bin/python3
 fi
 ) &

devices/common/patches/disable-antfs.patch

@@ -1,24 +0,0 @@
---- a/package/feeds/packages/antfs/Makefile
-+++ b/package/feeds/packages/antfs/Makefile
-@@ -20,7 +20,7 @@ define KernelPackage/fs-antfs
- 	TITLE:=AVM NTFS Read/Write Driver
- 	FILES:=$(PKG_BUILD_DIR)/antfs.ko
- 	AUTOLOAD:=$(call AutoLoad,30,antfs,1)
--	DEPENDS:=+kmod-nls-base
-+	DEPENDS:=@!LINUX_5_15 +kmod-nls-base
- endef
- 
- define KernelPackage/fs-antfs/description
-diff --git a/utils/antfs-mount/Makefile b/utils/antfs-mount/Makefile
-index 48ffc6f1cc..a9ee67dd2c 100644
---- a/package/feeds/packages/antfs-mount/Makefile
-+++ b/package/feeds/packages/antfs-mount/Makefile
-@@ -11,7 +11,7 @@ define Package/antfs-mount
- 	SUBMENU:=Filesystem
- 	TITLE:=NTFS mount script for AVM NTFS driver
- 	PKGARCH:=all
--	DEPENDS:=+kmod-fs-antfs
-+	DEPENDS:=@!LINUX_5_15 +kmod-fs-antfs
- endef
- 
- define Build/Configure

devices/common/patches/targets.patch

@@ -10,7 +10,7 @@
 -	kmod-nft-offload \
 +	dnsmasq-full \
 +	firewall \
-+	nftables iptables-legacy ip6tables-legacy \
++	iptables-legacy ip6tables-legacy kmod-ipt-nat6  ip6tables-mod-nat \
 +	kmod-ipt-offload \
  	odhcp6c \
  	odhcpd-ipv6only \

devices/ipq807x/.config

@@ -6,6 +6,8 @@ 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-ssl=y # uhttpd服务
+
 CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE_DRV=n
 CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE=y
 

devices/ipq807x/diy.sh

@@ -2,16 +2,19 @@
 
 shopt -s extglob
 
-rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat package/kernel/mac80211
-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/firmware/ath11k-board package/firmware/ath11k-board
-svn export https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-firmware package/firmware/ath11k-firmware
-svn export https://github.com/Boos4721/openwrt/trunk/package/qca package/qca
-svn export https://github.com/Boos4721/openwrt/trunk/package/qat package/qat
-svn export https://github.com/Boos4721/openwrt/trunk/package/kernel/mac80211 package/kernel/mac80211
+rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat package/kernel
+svn export --force https://github.com/Boos4721/openwrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
+svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi
+svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-board package/firmware/ath11k-board
+svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-firmware package/firmware/ath11k-firmware
+svn export --force https://github.com/Boos4721/openwrt/trunk/package/qca package/qca
+svn export --force https://github.com/Boos4721/openwrt/trunk/package/qat package/qat
+svn export --force https://github.com/Boos4721/openwrt/trunk/package/kernel package/kernel
 
-rm -rf target/linux/ipq807x/!(patches-5.15)
+
+rm -rf target/linux/generic target/linux/ipq807x/!(patches-5.15)
+svn export --force https://github.com/Boos4721/openwrt/trunk/target/linux/generic target/linux/generic
+rm -rf target/linux/generic/hack-5.15/531-debloat_lzma.patch target/linux/generic/hack-5.15/600-bridge_offload.patch
 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

devices/mediatek_mt7622/.config

@@ -3,7 +3,8 @@ 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
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 
 
 

devices/ramips_mt7621/.config

@@ -12,4 +12,6 @@ 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
 
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+
 

devices/ramips_mt7621/patches/cr660x.patch

@@ -1,12 +1,23 @@
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
-@@ -1832,5 +1832,4 @@
+@@@ -1847,7 +1847,6 @@ define Device/xiaomi_nand_separate
+   PAGESIZE := 2048
    KERNEL_SIZE := 4096k
    UBINIZE_OPTS := -E 5
 -  IMAGES += kernel1.bin rootfs0.bin
    IMAGE/kernel1.bin := append-kernel
    IMAGE/rootfs0.bin := append-ubi | check-size
-@@ -1916,28 +1915,12 @@
+   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+@@ -1885,7 +1884,6 @@ define Device/xiaomi_mi-router-3-pro
+   IMAGE_SIZE := 255488k
+   DEVICE_VENDOR := Xiaomi
+   DEVICE_MODEL := Mi Router 3 Pro
+-  IMAGES += factory.bin
+   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
+ 	check-size
+@@ -1931,30 +1929,14 @@ define Device/xiaomi_mi-router-cr660x
+   KERNEL_SIZE := 4096k
    UBINIZE_OPTS := -E 5
    IMAGE_SIZE := 128512k
 -  IMAGES += firmware.bin
@@ -16,13 +27,13 @@
 +  IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
  	check-size
    DEVICE_PACKAGES += kmod-mt7915e uboot-envtools
--endef
++  DEVICE_MODEL := Mi Router CR6606 / CR6608 / CR6609
+ endef
 -
 -define Device/xiaomi_mi-router-cr6606
 -  $(Device/xiaomi_mi-router-cr660x)
 -  DEVICE_MODEL := Mi Router CR6606
-+  DEVICE_MODEL := Mi Router CR6606 / CR6608 / CR6609
- endef
+-endef
 -TARGET_DEVICES += xiaomi_mi-router-cr6606
 -
 -define Device/xiaomi_mi-router-cr6608
@@ -39,6 +50,7 @@
 +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

devices/rockchip_armv8/.config

@@ -11,6 +11,9 @@ 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_luci-ssl=n # uhttpd服务
+CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
+
 CONFIG_PACKAGE_kmod-ptp=n
 CONFIG_PACKAGE_kmod-bnx2x=n
 CONFIG_PACKAGE_kmod-mlx4-core=n

devices/x86_64/.config

@@ -1,6 +1,7 @@
 
 CONFIG_TARGET_x86=y
 CONFIG_TARGET_x86_64=y
+CONFIG_TARGET_ROOTFS_TARGZ=y
 
 # EFI支持:
 CONFIG_GRUB_IMAGES=y
@@ -8,6 +9,8 @@ CONFIG_GRUB_EFI_IMAGES=y
 CONFIG_VMDK_IMAGES=n
 
 # 其他需要安装的软件包:
-CONFIG_PACKAGE_kmod-r8168=n
+CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
+CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
+#CONFIG_PACKAGE_kmod-r8168=n
 
 CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n

devices/x86_64/diy.sh

@@ -6,7 +6,8 @@ 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 kmod-usb2 kmod-usb3 fdisk/' target/linux/x86/Makefile
 
 mv -f tmp/r81* feeds/kiddin9/
-#sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
+sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
+sed -i 's/256/1024/g' target/linux/x86/image/Makefile
 
 echo '
 CONFIG_CRYPTO_CHACHA20_X86_64=y