update

.github/workflows/Openwrt-AutoBuild.yml

@@ -142,7 +142,7 @@ jobs:
         if [ "${{matrix.target}}" == "ipq807x_ipq60xx" ]; then
             git clone https://github.com/gl-inet/gl-infra-builder.git
             cd gl-infra-builder
-            python3 setup.py -c configs/config-wlan-ap-5.4.yml
+            python3 setup.py -c configs/config-wlan-ap.yml
             ln -sf gl-infra-builder/wlan-ap/openwrt ../openwrt
             cd -
         elif [ "${{matrix.target}}" == "mediatek_gl_mt7981" ]; then
@@ -257,14 +257,15 @@ jobs:
       run: |
         shopt -s extglob
         mkdir -p firmware/${{matrix.target}}
+        cd openwrt; kernel_v="$(make --file=info.mk kernel_version)"; cd -
         cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
         cd openwrt/bin/targets/*/*/
         mv -f profiles.json profiles.json.b
         cp $GITHUB_WORKSPACE/openwrt/.config ${{matrix.target}}.config || true
         cp $GITHUB_WORKSPACE/openwrt/build_dir/target-*/linux-*/linux-*/.config ${{matrix.target}}_kernel.config || true
-        mv -f packages ${{ env.KERNEL }}
+        mv -f packages $kernel_v
         mkdir packages
-        cp -rf ${{ env.KERNEL }}/Packages* packages/
+        cp -rf kernel_v/Packages* packages/
         cd -
         rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
         rename -v "s/friendlyarm_//" ./firmware/*/*gz || true

.github/workflows/repo-dispatcher.yml

@@ -34,7 +34,7 @@ jobs:
 
     - name: cancel running workflows
       uses: styfle/cancel-workflow-action@main
-      if: contains(${{ github.event.inputs.param }}, 'cw')
+      if: contains(github.event.inputs.param, ' cw')
       with:
         workflow_id: all
         access_token: ${{ github.token }}

devices/armvirt_64/patches/rootfs.patch

@@ -1,12 +1,11 @@
 --- a/include/image.mk
 +++ b/include/image.mk
-@@ -768,7 +768,7 @@
- define Device
+@@ -770,5 +770,7 @@
    $(call Device/InitProfile,$(1))
--  $(call Device/Init,$(1))
+   $(call Device/Init,$(1))
 +  $(call Device/Init,$(PROFILE_SANITIZED))
    $(call Device/Default,$(1))
--  $(call Device/$(1),$(1))
 +  $(call Device/$(PROFILE_SANITIZED),$(1))
    $(call Device/Check,$(1))
    $(call Device/$(if $(DUMP),Dump,Build),$(1))
+

devices/bcm27xx_bcm2708/.config

@@ -8,3 +8,4 @@ CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
 
+

devices/bcm27xx_bcm2709/.config

@@ -7,3 +7,4 @@ CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
 
+

devices/bcm27xx_bcm2710/.config

@@ -6,4 +6,7 @@ CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
+CONFIG_PACKAGE_kmod-rtl8821cu=m
+CONFIG_PACKAGE_kmod-rtl88x2bu=m
+
 

devices/bcm27xx_bcm2711/.config

@@ -6,5 +6,8 @@ CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
+CONFIG_PACKAGE_kmod-rtl8821cu=m
+CONFIG_PACKAGE_kmod-rtl88x2bu=m
+
 CONFIG_PACKAGE_kmod-of-mdio=n
 

devices/bcm4908_generic/diy.sh

@@ -5,3 +5,6 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 #bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
+rm -rf package/boot/uboot-bcm4908
+svn co https://github.com/openwrt/openwrt/trunk/package/boot/uboot-bcm4908 package/boot/uboot-bcm4908
+

devices/bcm53xx/.config

@@ -4,6 +4,7 @@ CONFIG_TARGET_bcm53xx_generic=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_phicomm_k3=y
 CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_asus_rt-ac88u=y
+CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_dlink_dir-885l=y
 
 CONFIG_KERNEL_DEVMEM=y
 CONFIG_BUSYBOX_CONFIG_ARPING=y

devices/bcm53xx/diy.sh

@@ -5,6 +5,8 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 #bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-
-
-
+sed -i "s/^TARGET_DEVICES /# TARGET_DEVICES /" target/linux/bcm53xx/image/Makefile
+sed -i "s/# TARGET_DEVICES += phicomm_k3/TARGET_DEVICES += phicomm_k3/" target/linux/bcm53xx/image/Makefile
+sed -i "s/# TARGET_DEVICES += asus_rt-ac88u/TARGET_DEVICES += asus_rt-ac88u/" target/linux/bcm53xx/image/Makefile
+sed -i "s/# TARGET_DEVICES += dlink_dir-885l/TARGET_DEVICES += dlink_dir-885l/" target/linux/bcm53xx/image/Makefile
+sed -i "s/DEVICE_PACKAGES := \$(BRCMFMAC_4366C0) \$(USB3_PACKAGES)/DEVICE_PACKAGES := \$(IEEE8021X) kmod-brcmfmac k3wifi \$(USB3_PACKAGES) k3screenctrl wireless-tools/" target/linux/bcm53xx/image/Makefile

devices/bcm53xx/patches/k3.patch

@@ -1,323 +0,0 @@
---- a/target/linux/bcm53xx/image/Makefile
-+++ b/target/linux/bcm53xx/image/Makefile
-@@ -143,30 +143,6 @@ define Device/asus
-   IMAGE/trx := append-ubi | trx-nand | asus-trx
- endef
- 
--define Device/asus_rt-ac56u
--  $(call Device/asus)
--  DEVICE_MODEL := RT-AC56U
--  DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
--  ASUS_PRODUCTID := RT-AC56U
--endef
--TARGET_DEVICES += asus_rt-ac56u
--
--define Device/asus_rt-ac68u
--  $(call Device/asus)
--  DEVICE_MODEL := RT-AC68U
--  DEVICE_PACKAGES := $(USB3_PACKAGES)
--  ASUS_PRODUCTID := RT-AC68U
--endef
--TARGET_DEVICES += asus_rt-ac68u
--
--define Device/asus_rt-ac87u
--  $(call Device/asus)
--  DEVICE_MODEL := RT-AC87U
--  DEVICE_PACKAGES := $(USB3_PACKAGES)
--  ASUS_PRODUCTID := RT-AC87U
--endef
--TARGET_DEVICES += asus_rt-ac87u
--
- define Device/asus_rt-ac88u
-   $(call Device/asus)
-   DEVICE_MODEL := RT-AC88U
-@@ -175,288 +151,12 @@ define Device/asus_rt-ac88u
- endef
- TARGET_DEVICES += asus_rt-ac88u
- 
--define Device/asus_rt-n18u
--  $(call Device/asus)
--  DEVICE_MODEL := RT-N18U
--  DEVICE_PACKAGES := $(USB3_PACKAGES)
--  ASUS_PRODUCTID := RT-N18U
--endef
--TARGET_DEVICES += asus_rt-n18u
--
--# Buffalo devices have TFTP recovery mode which can work nicely with initramfs
--# kernels.
--# We should have two initramfs images for Buffalo: plain initramfs kernel and
--# TRX with initramfs kernel. It's not possible right now so let's just build
--# plain initramfs kernel as it may be more useful.
--define Device/buffalo/Default
--  DEVICE_VENDOR := Buffalo
--  KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
--  KERNEL_INITRAMFS = $$(KERNEL)
--endef
--
--define Device/buffalo_wxr-1900dhp
--  $(call Device/buffalo/Default)
--  DEVICE_MODEL := WXR-1900DHP
--  DEVICE_PACKAGES := $(USB3_PACKAGES)
--endef
--TARGET_DEVICES += buffalo_wxr-1900dhp
--
--define Device/buffalo_wzr-600dhp2
--  $(call Device/buffalo/Default)
--  DEVICE_MODEL := WZR-600DHP2
--  DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES)
--endef
--TARGET_DEVICES += buffalo_wzr-600dhp2
--
--define Device/buffalo_wzr-900dhp
--  $(call Device/buffalo/Default)
--  DEVICE_MODEL := WZR-900DHP
--  DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
--  BUFFALO_TAG_PLATFORM := bcm
--  BUFFALO_TAG_VERSION := 9.99
--  BUFFALO_TAG_MINOR := 9.99
--  IMAGES += factory-DHP-EU.bin factory-DHP2-JP.bin
--  IMAGE/factory-DHP-EU.bin := \
--	append-ubi | trx-nand | buffalo-wzr-header WZR-900DHP EU | \
--	buffalo-enc WZR-900DHP $$(BUFFALO_TAG_VERSION) | \
--	buffalo-tag-dhp WZR-900DHP EU mlang20 | buffalo-enc-tag | \
--	buffalo-dhp-image
--  IMAGE/factory-DHP2-JP.bin := \
--	append-ubi | trx-nand | buffalo-wzr-header WZR-900DHP2 JP | \
--	buffalo-enc WZR-900DHP2 $$(BUFFALO_TAG_VERSION) | \
--	buffalo-tag-dhp WZR-900DHP2 JP jp | buffalo-enc-tag | \
--	buffalo-dhp-image
--  BROKEN := y
--endef
--TARGET_DEVICES += buffalo_wzr-900dhp
--
--define Device/buffalo_wzr-1750dhp
--  $(call Device/buffalo/Default)
--  DEVICE_MODEL := WZR-1750DHP
--  DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
--endef
--TARGET_DEVICES += buffalo_wzr-1750dhp
--
--define Device/dlink
--  DEVICE_VENDOR := D-Link
--  IMAGES := bin
--  IMAGE/bin := append-ubi | seama-nand
--endef
--
--define Device/dlink_dir-885l
--  DEVICE_MODEL := DIR-885L
--  DEVICE_PACKAGES := $(BRCMFMAC_4366B1) $(USB3_PACKAGES)
--  $(Device/dlink)
--  SIGNATURE := wrgac42_dlink.2015_dir885l
--endef
--TARGET_DEVICES += dlink_dir-885l
--
--define Device/linksys_ea6300-v1
--  DEVICE_VENDOR := Linksys
--  DEVICE_MODEL := EA6300
--  DEVICE_VARIANT := v1
--  DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
--endef
--TARGET_DEVICES += linksys_ea6300-v1
--
--define Device/linksys_ea6500-v2
--  DEVICE_VENDOR := Linksys
--  DEVICE_MODEL := EA6500
--  DEVICE_VARIANT := v2
--  DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
--endef
--TARGET_DEVICES += linksys_ea6500-v2
--
--define Device/linksys_ea9200
--  DEVICE_VENDOR := Linksys
--  DEVICE_MODEL := EA9200
--  DEVICE_VARIANT := v1
--  DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES)
--endef
--TARGET_DEVICES += linksys_ea9200
--
--define Device/linksys_ea9500
--  DEVICE_VENDOR := Linksys
--  DEVICE_MODEL := EA9500
--  DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES)
--  DEVICE_DTS := bcm47094-linksys-panamera
--endef
--TARGET_DEVICES += linksys_ea9500
--
--define Device/luxul
--  DEVICE_VENDOR := Luxul
--  IMAGES := lxl
--  IMAGE/lxl := append-ubi | trx-nand | luxul-lxl
--endef
--
--define Device/luxul_abr-4500
--  $(Device/luxul)
--  DEVICE_MODEL := ABR-4500
--  DEVICE_PACKAGES := $(USB3_PACKAGES)
--  LUXUL_BOARD := ABR-4500
--endef
--TARGET_DEVICES += luxul_abr-4500
--
--define Device/luxul_xap-1610
--  $(Device/luxul)
--  DEVICE_MODEL := XAP-1610
--  DEVICE_PACKAGES := $(BRCMFMAC_4366C0)
--  IMAGE/lxl := append-rootfs | trx-serial | luxul-lxl
--  LUXUL_BOARD := XAP-1610
--endef
--TARGET_DEVICES += luxul_xap-1610
--
--define Device/luxul_xbr-4500
--  $(Device/luxul)
--  DEVICE_MODEL := XBR-4500
--  DEVICE_PACKAGES := $(USB3_PACKAGES)
--  LUXUL_BOARD := XBR-4500
--endef
--TARGET_DEVICES += luxul_xbr-4500
--
--define Device/luxul_xwr-3150
--  $(Device/luxul)
--  DEVICE_MODEL := XWR-3150
--  DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES)
--  DEVICE_DTS := bcm47094-luxul-xwr-3150-v1
--  LUXUL_BOARD := XWR-3150
--endef
--TARGET_DEVICES += luxul_xwr-3150
--
--define Device/meraki_mr32
--  DEVICE_VENDOR := Meraki
--  DEVICE_MODEL := MR32
--  DEVICE_PACKAGES := $(B43) kmod-i2c-bcm-iproc kmod-eeprom-at24 \
--	kmod-leds-pwm kmod-hwmon-ina2xx kmod-bluetooth
--  DEVICE_DTS := bcm53016-meraki-mr32
--# Meraki FW r23 tries to resize the part.safe partition before it will
--# flash the image. This is a bit of a problem, since resizing will fail
--# if the partition is smaller than the old one.
--  KERNEL_LOADADDR := 0x00008000
--  KERNEL_INITRAMFS_SUFFIX := .bin
--  DEVICE_DTS_DELIMITER := @
--  DEVICE_DTS_CONFIG := config@1
--  KERNEL_INITRAMFS := kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb | \
--	pad-to 10362880
--  KERNEL := kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb
--  IMAGES += sysupgrade.bin
--# Currently the only device that uses the new image check
--  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
--
--# The loader is specifically looking for fdt@2:
--# [    3.190000] find_itb_subimage: error finding fdt@2: FDT_ERR_NOTFOUND
--# The image won't boot, if it isn't found. :(
--  DEVICE_FDT_NUM := 2
--endef
--TARGET_DEVICES += meraki_mr32
--
--define Device/netgear
--  DEVICE_VENDOR := NETGEAR
--  IMAGES := chk
--  IMAGE/chk := append-ubi | trx-nand | netgear-chk
--  NETGEAR_REGION := 1
--endef
--
--define Device/netgear_r6250
--  DEVICE_MODEL := R6250
--  DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
--  $(Device/netgear)
--  NETGEAR_BOARD_ID := U12H245T00_NETGEAR
--endef
--TARGET_DEVICES += netgear_r6250
--
--define Device/netgear_r6300-v2
--  DEVICE_MODEL := R6300
--  DEVICE_VARIANT := v2
--  DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
--  $(Device/netgear)
--  NETGEAR_BOARD_ID := U12H240T00_NETGEAR
--endef
--TARGET_DEVICES += netgear_r6300-v2
--
--define Device/netgear_r7000
--  DEVICE_MODEL := R7000
--  DEVICE_PACKAGES := $(USB3_PACKAGES)
--  $(Device/netgear)
--  NETGEAR_BOARD_ID := U12H270T00_NETGEAR
--endef
--TARGET_DEVICES += netgear_r7000
--
--define Device/netgear_r7900
--  DEVICE_MODEL := R7900
--  DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES)
--  $(Device/netgear)
--  NETGEAR_BOARD_ID := U12H315T30_NETGEAR
--endef
--TARGET_DEVICES += netgear_r7900
--
--define Device/netgear_r8000
--  DEVICE_MODEL := R8000
--  DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES)
--  $(Device/netgear)
--  NETGEAR_BOARD_ID := U12H315T00_NETGEAR
--endef
--TARGET_DEVICES += netgear_r8000
--
--define Device/netgear_r8500
--  DEVICE_MODEL := R8500
--  DEVICE_PACKAGES := $(BRCMFMAC_4366B1) $(USB3_PACKAGES)
--  $(Device/netgear)
--  NETGEAR_BOARD_ID := U12H334T00_NETGEAR
--  DEFAULT := n
--endef
--TARGET_DEVICES += netgear_r8500
--
--define Device/smartrg_sr400ac
--  DEVICE_VENDOR := SmartRG
--  DEVICE_MODEL := SR400ac
--  DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES)
--  IMAGES := trx
--  IMAGE/trx := append-rootfs | trx-serial
--  KERNEL_INITRAMFS_SUFFIX := .bin
--  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma-d16
--endef
--TARGET_DEVICES += smartrg_sr400ac
--
- define Device/phicomm_k3
-   DEVICE_VENDOR := PHICOMM
-   DEVICE_MODEL := K3
--  DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES)
-+  DEVICE_PACKAGES := $(IEEE8021X) kmod-brcmfmac k3wifi $(USB3_PACKAGES) k3screenctrl wireless-tools
-   IMAGES := trx
- endef
- TARGET_DEVICES += phicomm_k3
- 
--define Device/tenda_ac9
--  DEVICE_VENDOR := Tenda
--  DEVICE_MODEL := AC9
--  DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES)
--  IMAGES := trx
--  IMAGE/trx := append-rootfs | trx-serial
--endef
--TARGET_DEVICES += tenda_ac9
--
--define Device/tplink_archer-c5-v2
--  DEVICE_VENDOR := TP-Link
--  DEVICE_MODEL := Archer C5
--  DEVICE_VARIANT := v2
--  DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES)
--  IMAGES := bin
--  IMAGE/bin := append-rootfs | bcm53xx-tplink-safeloader
--  TPLINK_BOARD := ARCHER-C5-V2
--  BROKEN := y
--endef
--#TARGET_DEVICES += tplink_archer-c5-v2
--
--define Device/tplink_archer-c9-v1
--  DEVICE_VENDOR := TP-Link
--  DEVICE_MODEL := Archer C9
--  DEVICE_VARIANT := v1
--  DEVICE_PACKAGES := $(USB3_PACKAGES)
--  IMAGES := bin
--  IMAGE/bin := append-rootfs | bcm53xx-tplink-safeloader
--  TPLINK_BOARD := ARCHERC9
--  BROKEN := y
--endef
--#TARGET_DEVICES += tplink_archer-c9-v1
--
- $(eval $(call BuildImage))

devices/common/.config

@@ -4,6 +4,7 @@ CONFIG_GRUB_CONSOLE=n
 CONFIG_TARGET_ROOTFS_EXT4FS=n
 
 CONFIG_TARGET_ROOTFS_CPIOGZ=n
+CONFIG_TARGET_ROOTFS_TARGZ=n
 CONFIG_LUCI_CSSTIDY=n
 CONFIG_GRUB_CONSOLE=n
 CONFIG_SIGNED_PACKAGES=n
@@ -87,6 +88,10 @@ CONFIG_PACKAGE_kmod-hermes-plx=n
 CONFIG_PACKAGE_kmod-ipw2100=n
 CONFIG_PACKAGE_kmod-ipw2200=n
 CONFIG_PACKAGE_kmod-libipw=n
+CONFIG_PACKAGE_kmod-rtl8189es=n
+CONFIG_PACKAGE_kmod-drm-nouveau=n
+CONFIG_PACKAGE_kmod-rtl8821cu=n
+CONFIG_PACKAGE_kmod-rtl88x2bu=n
 
 
 CONFIG_IMAGEOPT=y

devices/common/diy.sh

@@ -6,16 +6,14 @@ shopt -s extglob
 sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default
 }
 
+sed -i "s?targets/%S/packages?targets/%S/\$(LINUX_VERSION)?" include/feeds.mk
+
 sed -i '/	refresh_config();/d' scripts/feeds
 
 ./scripts/feeds update -a
 ./scripts/feeds install -a -p kiddin9 -f
 ./scripts/feeds install -a
 
-kernel_v="$(cat include/kernel-5.10 | 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?targets/%S/$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/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite --force-depends/' package/Makefile
@@ -35,10 +33,11 @@ done
 mv -f feeds/kiddin9/{r81*,igb-intel} tmp/
 
 sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_generate
+sed -i "s/192.168.1/10.0.0/" package/base-files/files/bin/config_generate
 
 (
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.10 target/linux/generic/hack-5.10
-rm -rf target/linux/generic/hack-5.10/{220-gc_sections*,781-dsa-register*,780-drivers-net*,996-fs-ntfs3*}
+rm -rf target/linux/generic/hack-5.10/{220-gc_sections*,781-dsa-register*,780-drivers-net*,996-fs-ntfs3*,100-update-mtk_wed_h.patch}
 ) &
 
 sed -i "/BuildPackage,miniupnpd-iptables/d" feeds/packages/net/miniupnpd/Makefile

devices/common/info.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2007 OpenWrt.org
+
+TOPDIR:=${CURDIR}
+export OPENWRT_VERBOSE=s
+
+include rules.mk
+include $(INCLUDE_DIR)/target.mk
+
+kernel_version: FORCE
+	@echo "$(LINUX_VERSION)"

devices/common/kernel_5.15.sh

@@ -1,25 +1,26 @@
 #!/bin/bash
 
-rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk}
+rm -rf tools target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk}
 latest="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
 latest=""
 mkdir new; cp -rf .git new/.git
 cd new
-[ "$latest" ] && git reset --hard $latest || git reset --hard origin/master
-git checkout HEAD^
+[ "$latest" ] && (git reset --hard $latest  && git checkout HEAD^) || git reset --hard origin/master
+
 [ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $latest
 
-cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} ../
+cp -rf --parents tools target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} ../
 cd -
 
-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/.*'?targets/%S/$kernel_v'?" include/feeds.mk
-
+curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/master/include/image-commands.mk -o include/image-commands.mk
+sed -i "s/\$(STAGING_DIR_HOST)\/bin\/gzip/gzip/" include/image-commands.mk
 svn export --force https://github.com/openwrt/packages/trunk/kernel feeds/packages/kernel
 svn export --force  https://github.com/openwrt/packages/trunk/net/xtables-addons feeds/packages/net/xtables-addons
 
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/backport-5.15 target/linux/generic/backport-5.15
+find target/linux/generic/backport-5.15 -name "[0-9][0-9][0-9]-[a-z][a-z]*" -exec rm -f {} \;
+rm -rf target/linux/generic/backport-5.15/{802-v6.1-nvmem*,803-v5.19-nvmem*}
 
 sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab
 

devices/ipq807x/diy.sh

@@ -27,13 +27,9 @@ rm -rf package/network feeds/kiddin9/{rtl8821cu,rtl88x2bu}
 svn co https://github.com/robimarko/openwrt/branches/ipq807x-5.15-pr/package/network package/network
 
 curl -sfL https://raw.githubusercontent.com/robimarko/openwrt/ipq807x-5.15-pr/include/kernel-5.15 -o include/kernel-5.15
-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/.*'?targets/%S/$kernel_v'?" include/feeds.mk
 
 curl -sfL https://raw.githubusercontent.com/robimarko/openwrt/ipq807x-5.15-pr/package/kernel/linux/modules/netsupport.mk -o package/kernel/linux/modules/netsupport.mk
 
-curl -sfL https://raw.githubusercontent.com/Boos4721/openwrt/master/target/linux/ipq807x/patches-5.15/700-ipq8074-overclock-cpu-2.2ghz.patch -o target/linux/ipq807x/patches-5.15/700-ipq8074-overclock-cpu-2.2ghz.patch
 
 rm -rf package/kernel/mt76
 

devices/ipq807x/patches/default_packages.patch

@@ -12,7 +12,7 @@
 
 --- a/target/linux/ipq807x/image/generic.mk
 +++ b/target/linux/ipq807x/image/generic.mk
-@@ -74,7 +74,7 @@ define Device/qnap_301w
+@@ -84,7 +84,7 @@ define Device/qnap_301w
  	IMAGES += factory.bin sysupgrade.bin
  	IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k
  	IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to 64k | sysupgrade-tar rootfs=$$$$@ | append-metadata
@@ -21,11 +21,12 @@
  endef
  TARGET_DEVICES += qnap_301w
  
-@@ -109,6 +109,6 @@ define Device/xiaomi_ax9000
- 	DEVICE_DTS_CONFIG := config@hk14
+@@ -127,7 +127,7 @@ define Device/xiaomi_ax9000
  	SOC := ipq8072
+ 	KERNEL_SIZE := 57344k
  	DEVICE_PACKAGES := ipq-wifi-xiaomi_ax9000 kmod-ath11k-pci ath11k-firmware-qcn9074 \
 -	kmod-ath10k-ct ath10k-firmware-qca9887-ct
 +	kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom
- endef
- TARGET_DEVICES += xiaomi_ax9000
+ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+ 	ARTIFACTS := initramfs-factory.ubi
+ 	ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel

devices/ipq807x_ipq60xx/.config

@@ -0,0 +1,66 @@
+
+CONFIG_TARGET_ipq807x=y
+CONFIG_TARGET_ipq807x_ipq60xx=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_ipq807x_ipq60xx_DEVICE_glinet_axt1800=y
+CONFIG_TARGET_DEVICE_ipq807x_ipq60xx_DEVICE_glinet_ax1800=y
+
+CONFIG_CCACHE=n
+
+CONFIG_PACKAGE_kmod-dm-raid=n
+CONFIG_PACKAGE_kmod-dm=n
+CONFIG_PACKAGE_kmod-siit=n
+CONFIG_PACKAGE_kmod-gl-mifi-mcu=n
+CONFIG_PACKAGE_kmod-pf-ring=n
+CONFIG_PACKAGE_kmod-pptp=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-pptp=n
+CONFIG_PACKAGE_kmod-bt_tty=n
+CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
+CONFIG_PACKAGE_kmod-jool=n
+
+CONFIG_PACKAGE_kmod-qca-nss-drv-clmapmgr=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-eogremgr=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-gre=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-lag-mgr=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-map-t=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-match=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-pppoe=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-profile=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-pvxlanmgr=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-tun6rd=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-tunipip6=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-vxlanmgr=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-wifi-meshmgr=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-igs=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-mirror=n
+CONFIG_PACKAGE_kmod-qca-nss-drv-qdisc=n
+
+CONFIG_PACKAGE_kmod-batman-adv=n
+
+CONFIG_PACKAGE_kmod-bpf-test=n
+CONFIG_PACKAGE_kmod-rtc-pt7c4338=n
+CONFIG_PACKAGE_kmod-video-pwc=n
+
+CONFIG_PACKAGE_spidev-test=n
+
+CONFIG_PACKAGE_kmod-scsi-cdrom=n
+CONFIG_PACKAGE_kmod-scsi-core=n
+CONFIG_PACKAGE_kmod-scsi-generic=n
+CONFIG_PACKAGE_kmod-scsi-tape=n
+
+CONFIG_PACKAGE_kmod-mac80211-hwsim=n
+CONFIG_PACKAGE_kmod-ath6kl=n
+CONFIG_PACKAGE_kmod-ath6kl-sdio=n
+CONFIG_PACKAGE_kmod-ath6kl-usb=n
+CONFIG_PACKAGE_kmod-lib80211=n
+CONFIG_PACKAGE_kmod-ath5k=n
+CONFIG_PACKAGE_kmod-ath10k=n
+CONFIG_PACKAGE_kmod-ath9k=n
+CONFIG_PACKAGE_kmod-ath9k-common=n
+CONFIG_PACKAGE_kmod-ath9k-htc=n
+CONFIG_PACKAGE_kmod-carl9170=n
+
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+

devices/ipq807x_ipq60xx/diy.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+shopt -s extglob
+
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+
+mv -f ../feeds/ipq807x/ipq807x target/linux/
+./scripts/feeds install -a -p wifi_ax -f
+
+rm -rf package/feeds/wifi_ax/hostapd
+
+sed -i "/gl_feeds_common/d" feeds.conf
+sed -i "/ipq807x/d" feeds.conf
+sed -i "/wifi_ax/d" feeds.conf
+
+rm -rf package/feeds/kiddin9/{firewall,rtl*,base-files,netifd,nft-fullcone,mbedtls,oaf,shortcut-fe,simulated-driver,fast-classifier,fullconenat}
+
+rm -rf package/kernel/{nat46,ath10k-ct,mt76,rtl8812au-ct}
+rm -rf feeds/packages/net/xtables-addons package/feeds/packages/openvswitch
+
+sed -i "s/PKG_HASH:=.*/PKG_HASH:=skip/" package/feeds/wifi_ax/mac80211/Makefile
+
+rm -rf devices/common/patches/{glinet,imagebuilder.patch,iptables.patch,targets.patch,kernel-defaults.patch,disable_flock.patch}
+
+rm -rf toolchain/musl
+
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/toolchain/musl toolchain/musl
+
+svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/network/services/fullconenat feeds/kiddin9/fullconenat
+
+make defconfig

devices/ipq807x_ipq60xx/feeds.conf

@@ -0,0 +1,7 @@
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
+src-git luci https://github.com/openwrt/luci.git;openwrt-21.02
+src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
+src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
+src-git gl_feeds_common https://github.com/gl-inet/gl-feeds.git^f86ec7f77b7a36c96a9b5a9b7fea30ccc9ac5fe6
+src-link ipq807x ../../feeds/ipq807x
+src-link wifi_ax ../../feeds/wifi-ax

devices/ipq807x_ipq60xx/patches/0999-depends.patch

@@ -0,0 +1,28 @@
+--- a/target/linux/ipq807x/image/ipq60xx.mk
++++ b/target/linux/ipq807x/image/ipq60xx.mk
+@@ -68,5 +68,5 @@
+   SUPPORTED_DEVICES := glinet,ax1800
+   DEVICE_DTS_CONFIG := config@cp03-c1
+-  DEVICE_PACKAGES := ath11k-wifi-gl-ax1800 -kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom kmod-usb3
++  DEVICE_PACKAGES := ath11k-wifi-gl-ax1800 -kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom kmod-usb3 kmod-hwmon-pwmfan wireless-regdb kmod-sched-cake ath11k-fwtest ftm
+   IMAGE/sysupgrade.tar := sysupgrade-tar | append-gl-metadata
+ endef
+@@ -78,5 +78,5 @@
+   SUPPORTED_DEVICES := glinet,axt1800
+   DEVICE_DTS_CONFIG := config@cp03-c1
+-  DEVICE_PACKAGES := ath11k-wifi-gl-axt1800 -kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom kmod-usb3
++  DEVICE_PACKAGES := ath11k-wifi-gl-axt1800 -kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom kmod-usb3 kmod-hwmon-pwmfan wireless-regdb kmod-sched-cake ath11k-fwtest ftm
+   IMAGE/sysupgrade.tar := sysupgrade-tar | append-gl-metadata
+ endef
+
+--- a/target/linux/ipq807x/Makefile
++++ b/target/linux/ipq807x/Makefile
+@@ -15,7 +15,7 @@ include $(INCLUDE_DIR)/target.mk
+ DEFAULT_PACKAGES += kmod-qca-nss-dp kmod-qca-ssdk swconfig \
+ 	kmod-qca-nss-drv \
+ 	kmod-usb-phy-ipq807x kmod-usb-dwc3-of-simple \
+-	kmod-ath11k-ahb kmod-qrtr_mproc wpad \
++	kmod-ath11k-ahb kmod-qrtr_mproc wpad-basic-wolfssl \
+ 	kmod-gpio-button-hotplug \
+ 	qca-thermald-10.4 qca-ssdk-shell kmod-qca-nss-drv-bridge-mgr \
+ 	uboot-envtools

devices/ipq807x_ipq60xx/patches/base-files.patch

@@ -0,0 +1,108 @@
+--- a/package/base-files/files/etc/rc.common
++++ b/package/base-files/files/etc/rc.common
+@@ -28,7 +28,10 @@ restart() {
+ }
+ 
+ boot() {
+-	start "$@"
++	name="$(basename "${initscript}")"
++	name="${name##S[0-9][0-9]}"
++	[[ "$(uci -q get $name.$name[0].enabled)" == 0 || "$(uci -q get $name.config.enabled)" == 0 || "$(uci -q get $name.$name.enabled)" == 0 || "$(uci -q get $name.main.enabled)" == 0 || "$(uci -q get $name.$name[0].enable)" == 0 || "$(uci -q get $name.config.enable)" == 0 || "$(uci -q get $name.$name.enable)" == 0 || "$(uci -q get $name.main.enable)" == 0 ]] || start "$@";
++	
+ }
+ 
+ shutdown() {
+
+--- a/package/base-files/files/lib/functions.sh
++++ b/package/base-files/files/lib/functions.sh
+@@ -283,10 +283,13 @@ default_postinst() {
+ 			if [ "$PKG_UPGRADE" != "1" ]; then
+ 				"$i" enable
+ 			fi
+-			"$i" start
++			if "$i" enabled; then
++				"$i" start
++			fi
+ 		fi
+ 	done
+ 
++	[ -x /etc/init.d/ucitrack ] && /etc/init.d/ucitrack reload
+ 	return $ret
+ }
+ 
+
+--- a/package/base-files/files/etc/shinit
++++ b/package/base-files/files/etc/shinit
+@@ -2,6 +2,8 @@
+ [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi
+ 
+ alias ll='ls -alF --color=auto'
++alias reboot='(/bin/busybox reboot &);sleep 3;/bin/busybox reboot -f'
++PS1='\[\e[32m\][\[\e[m\]\[\e[31m\]\u\[\e[m\]\[\e[33m\]@\[\e[m\]\[\e[32m\]\h\[\e[m\]:\[\e[m\]\[\e[32m\]\[\e[1;32m\]\@\[\e[36m\] \w\[\e[m\]\[\e[32m\]]\[\e[0m\] \$\[\e[m\] '
+ 
+ [ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc
+
+--- a/package/base-files/files/sbin/sysupgrade
++++ b/package/base-files/files/sbin/sysupgrade
+@@ -231,24 +231,15 @@ do_save_conffiles() {
+ 	ask_bool 0 "Edit config file list" && vi "$CONFFILES"
+ 
+ 	if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
+-		echo "${INSTALLED_PACKAGES}" >> "$CONFFILES"
+-		mkdir -p "$ETCBACKUP_DIR"
+-		# Avoid touching filesystem on each backup
+-		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"
+-		mkdir -p "$RAMFS/upper" "$RAMFS/work"
+-		mount -t overlay overlay -o lowerdir=$ETCBACKUP_DIR,upperdir=$RAMFS/upper,workdir=$RAMFS/work $ETCBACKUP_DIR &&
+-			UMOUNT_ETCBACKUP_DIR=1 || {
+-				echo "Cannot mount '$ETCBACKUP_DIR' as tmpfs to avoid touching disk while saving the list of installed packages." >&2
+-				ask_bool 0 "Abort" && exit
+-			}
+-
+-		# Format: pkg-name<TAB>{rom,overlay,unkown}
+-		# rom is used for pkgs in /rom, even if updated later
+-		find /usr/lib/opkg/info -name "*.control" \( \
+-			\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
+-			\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
+-			\( -exec echo {} unknown \; \) \
+-			\) | sed -e 's,.*/,,;s/\.control /\t/' > ${INSTALLED_PACKAGES}
++		. /etc/profile.d/opkg.sh && opkg save
++		[ -f /rom/etc/uci-defaults/zz-asu-defaults ] && {
++		 cp -f /rom/etc/uci-defaults/zz-asu-defaults /etc/uci-defaults/zz-asu-defaults
++		 echo "/etc/uci-defaults/zz-asu-defaults" >> $CONFFILES
++		}
++	else
++		uci -q del opkg.auto
++		uci -q del opkg.custom
++		uci commit opkg
+ 	fi
+ 
+ 	v "Saving config files..."
+
+--- a/package/base-files/files/etc/profile
++++ b/package/base-files/files/etc/profile
+@@ -22,7 +23,11 @@ esac
+ 
+ [ -n "$FAILSAFE" ] || {
+ 	for FILE in /etc/profile.d/*.sh; do
+-		[ -e "$FILE" ] && . "$FILE"
++		if [ "$FILE" == "/etc/profile.d/sysinfo.sh" ]; then
++		 [ "$(which bash)" ] && env -i bash "$FILE"
++		else
++		 [ -e "$FILE" ] && . "$FILE"
++		fi
+ 	done
+ 	unset FILE
+ }
+
+--- a/package/base-files/files/lib/preinit/02_sysinfo
++++ b/package/base-files/files/lib/preinit/02_sysinfo
+@@ -5,6 +5,7 @@ do_sysinfo_generic() {
+ 		echo "$(strings /proc/device-tree/compatible | head -1)" > /tmp/sysinfo/board_name
+ 	[ ! -e /tmp/sysinfo/model -a -e /proc/device-tree/model ] && \
+ 		echo "$(cat /proc/device-tree/model)" > /tmp/sysinfo/model
++	sed -i "s/friendlyelec/friendlyarm/" /tmp/sysinfo/board_name
+ }
+ 
+ boot_hook_add preinit_main do_sysinfo_generic
+

devices/ipq807x_ipq60xx/patches/imagebuilder.patch

@@ -0,0 +1,122 @@
+--- a/target/imagebuilder/Makefile
++++ b/target/imagebuilder/Makefile
+@@ -38,13 +38,15 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+ 		./files/repositories.conf \
+ 		$(TMP_DIR)/.targetinfo \
+ 		$(TMP_DIR)/.packageinfo \
+-		$(PKG_BUILD_DIR)/
++		$(TOPDIR)/files \
++		$(PKG_BUILD_DIR)/ || true
+ 
+-ifeq ($(CONFIG_IB_STANDALONE),)
+ 	echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf
+ 	$(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
+ 	$(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
+ 	# create an empty package index so `opkg` doesn't report an error
+
+--- a/target/imagebuilder/files/Makefile
++++ b/target/imagebuilder/files/Makefile
+@@ -115,17 +115,32 @@ BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(fi
+ PACKAGES:=
+ 
+ _call_image: staging_dir/host/.prereq-build
++	[ "$(DATE)" ] && DATE="$(DATE)" || DATE="`date +'%m.%d.%Y'`"; \
++	mkdir -p $(USER_FILES)/etc/uci-defaults || true; \
++	echo -e " \
++	sed -i \"s/[0-9]\+.[0-9]\+.[0-9]\{4\}/$$DATE/\" /etc/openwrt_release \n \
++	sed -i \"s/DISTRIB_ID=.*/DISTRIB_ID='$(PARTSIZE)'/\" /etc/openwrt_release \n \
++	sed -i \"s/OpenWrt .* by/OpenWrt $$DATE by/\" /etc/banner \n \
++	echo \"$$DATE\" >/etc/openwrt_version \n \
++	"> $(USER_FILES)/etc/uci-defaults/99-version; \
+ 	echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
+ 	echo 'Packages: $(BUILD_PACKAGES)'
+ 	echo
+ 	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
+ 	mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
++	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
++		echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(TOPDIR)/repositories.conf; \
++	else \
++		sed -i "/smflash/d" $(TOPDIR)/repositories.conf; \
++	fi
+ 	$(MAKE) package_reload
+ 	$(MAKE) package_install
+ 	$(MAKE) -s prepare_rootfs
+ 	$(MAKE) -s build_image
+ 	$(MAKE) -s json_overview_image_info
+ 	$(MAKE) -s checksum
++	rm -rf $(KERNEL_BUILD_DIR)/tmp
++	rm -rf $(KERNEL_BUILD_DIR)/root.*
+ 
+ _call_manifest: FORCE
+ 	rm -rf $(TARGET_DIR)
+@@ -166,7 +181,14 @@ package_install: FORCE
+ 	@echo Installing packages...
+ 	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk))
+ 	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
+-	$(OPKG) install $(BUILD_PACKAGES)
++	for p in $(BUILD_PACKAGES); do \
++		if [[ $$p == luci-app-* && "`$(OPKG) list | grep luci-i18n-\`echo $$p | cut -d - -f 3-\`-zh-cn`" ]]; then \
++			packages+="luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn "; \
++		fi \
++	done; \
++	$(OPKG) install --force-overwrite --force-checksum --force-depends $(BUILD_PACKAGES) luci-i18n-base-zh-cn luci-i18n-base-en; \
++	$(OPKG) install $$packages || true
++	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer --force-reinstall my-default-settings
+ 
+ prepare_rootfs: FORCE
+ 	@echo
+@@ -180,12 +202,15 @@ prepare_rootfs: FORCE
+ 		) \
+ 	)
+ 	$(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES),$(DISABLED_SERVICES))
++	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
++		echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(BUILD_DIR)/root-ramips/etc/opkg/distfeeds.conf; \
++	fi
+ 
+ build_image: FORCE
+ 	@echo
+ 	@echo Building images...
+ 	rm -rf $(BUILD_DIR)/json_info_files/
+-	$(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
++	nice -n 19 $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
+ 		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
+ 
+ $(BIN_DIR)/profiles.json: FORCE
+
+--- a/scripts/json_overview_image_info.py
++++ b/scripts/json_overview_image_info.py
+@@ -47,7 +47,7 @@ def get_initial_output(image_info):
+ 
+ 
+ if output:
+-    default_packages, output["arch_packages"] = run(
++    default_packages, output["arch_packages"], output["kernel_version"], output["initramfs"] = run(
+         [
+             "make",
+             "--no-print-directory",
+@@ -55,6 +55,8 @@ def get_initial_output(image_info):
+             "target/linux/",
+             "val.DEFAULT_PACKAGES",
+             "val.ARCH_PACKAGES",
++            "val.LINUX_VERSION",
++            "val.KERNEL_INITRAMFS",
+         ],
+         stdout=PIPE,
+         stderr=PIPE,
+
+--- a/rules.mk
++++ b/rules.mk
+@@ -59,6 +59,7 @@ _SINGLE=export MAKEFLAGS=$(space);
+ CFLAGS:=
+ ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
+ ARCH_PACKAGES:=$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES))
++KERNEL_INITRAMFS:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_INITRAMFS))
+ BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
+ SUBTARGET:=$(call qstrip,$(CONFIG_TARGET_SUBTARGET))
+ TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))

devices/ipq807x_ipq60xx/patches/kernel-defaults.patch

@@ -0,0 +1,8 @@
+--- a/include/kernel-defaults.mk
++++ b/include/kernel-defaults.mk
+@@ -116,4 +116,5 @@
+ define Kernel/CompileModules/Default
+ 	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
++	+$(KERNEL_MAKE) olddefconfig
+ 	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all) modules
+ endef

devices/ipq807x_ipq60xx/patches/targets.patch

@@ -0,0 +1,36 @@
+--- a/include/target.mk
++++ b/include/target.mk
+@@ -44,9 +44,11 @@
+ # For router targets
+ DEFAULT_PACKAGES.router:=\
+-	dnsmasq \
++	dnsmasq-full \
+ 	firewall \
+ 	ip6tables \
+ 	iptables \
+ 	kmod-ipt-offload \
++	kmod-ipt-nat \
++	kmod-ipt-nat6 \
+ 	odhcp6c \
+ 	odhcpd-ipv6only \
+@@ -83,4 +85,20 @@
+     -include ./$(SUBTARGET)/target.mk
+   endif
++endif
++
++ifneq ($(CONFIG_SMALL_FLASH),)
++  DEFAULT_PACKAGES+=-coremark -htop -bash -openssh-sftp-server
++endif
++
++ifeq ($(ARCH),arm)
++  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
++endif
++
++ifeq ($(ARCH),aarch64)
++  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
++endif
++
++ifneq ($(CONFIG_USB_SUPPORT),)
++  DEFAULT_PACKAGES+=automount
+ endif
+ 

devices/mediatek_filogic/.config

@@ -3,6 +3,7 @@ CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_filogic=y
 CONFIG_TARGET_MULTI_PROFILE=y
 #CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_bananapi_bpi-r3=y
-CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_redmi-router-ax6000=y
+CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_redmi-router-ax6000-stock=y
+CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_redmi-router-ax6000-ubootmod=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务

devices/mediatek_filogic/diy.sh

@@ -5,7 +5,5 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-sh -c "curl -sfL https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/11115.patch | patch -d './' -p1 --forward"
-
 rm -rf tools/mkimage
 svn co https://github.com/openwrt/openwrt/trunk/tools/mkimage tools/mkimage

devices/mediatek_filogic/patches/AX6000.patch

@@ -0,0 +1,20 @@
+--- a/target/linux/mediatek/image/filogic.mk
++++ b/target/linux/mediatek/image/filogic.mk
+@@ -127,7 +127,7 @@ TARGET_DEVICES += mediatek_mt7986b-rfb
+ 
+ define Device/xiaomi_redmi-router-ax6000-stock
+   DEVICE_VENDOR := Xiaomi
+-  DEVICE_MODEL := Redmi Router AX6000 (stock layout)
++  DEVICE_MODEL := Redmi Router AX6000 (原厂布局)
+   DEVICE_DTS := mt7986a-xiaomi-redmi-router-ax6000-stock
+   DEVICE_DTS_DIR := ../dts
+   DEVICE_PACKAGES := kmod-leds-ws2812b
+@@ -145,7 +145,7 @@ TARGET_DEVICES += xiaomi_redmi-router-ax6000-stock
+ 
+ define Device/xiaomi_redmi-router-ax6000-ubootmod
+   DEVICE_VENDOR := Xiaomi
+-  DEVICE_MODEL := Redmi Router AX6000 (OpenWrt U-Boot layout)
++  DEVICE_MODEL := Redmi Router AX6000 (U-boot mod layout)
+   DEVICE_DTS := mt7986a-xiaomi-redmi-router-ax6000-ubootmod
+   DEVICE_DTS_DIR := ../dts
+   DEVICE_PACKAGES := kmod-leds-ws2812b

devices/mediatek_gl_mt7981/diy.sh

@@ -4,11 +4,7 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-kernel_v="$(cat include/kernel-version.mk | grep LINUX_KERNEL_HASH-5.* | cut -f 2 -d - | cut -f 1 -d ' ')"
-echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
-sed -i "s?targets/%S/.*'?targets/%S/$kernel_v'?" include/feeds.mk
-
-rm -rf package/feeds/kiddin9/{firewall,rtl88x2bu,base-files,netifd}
+rm -rf package/feeds/kiddin9/{firewall,rtl*,base-files,netifd}
 
 rm -rf devices/common/patches/{glinet,imagebuilder.patch,iptables.patch,targets.patch,kernel-defaults.patch,disable_flock.patch}
 
@@ -16,3 +12,13 @@ sed -i "s/BOARD:=mediatek$/BOARD:=mediatek_gl/" target/linux/mediatek/Makefile
 
 mv -f target/linux/mediatek target/linux/mediatek_gl
 
+rm -rf toolchain/musl
+
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/toolchain/musl toolchain/musl
+
+
+sed -i "/mtk_openwrt_feed/d" feeds.conf
+sed -i "/gl_feed_common/d" feeds.conf
+sed -i "/gl_feed_21_02/d" feeds.conf
+
+

devices/mediatek_gl_mt7981/patches/inet-diag.patch

@@ -0,0 +1,30 @@
+--- a/package/kernel/linux/modules/netsupport.mk
++++ b/package/kernel/linux/modules/netsupport.mk
+@@ -1259,4 +1259,27 @@
+ $(eval $(call KernelPackage,netlink-diag))
+ 
++define KernelPackage/inet-diag
++  SUBMENU:=$(NETWORK_SUPPORT_MENU)
++  TITLE:=INET diag support for ss utility
++  KCONFIG:= \
++	CONFIG_INET_DIAG \
++	CONFIG_INET_TCP_DIAG \
++	CONFIG_INET_UDP_DIAG \
++	CONFIG_INET_RAW_DIAG \
++	CONFIG_INET_DIAG_DESTROY=n
++  FILES:= \
++	$(LINUX_DIR)/net/ipv4/inet_diag.ko \
++	$(LINUX_DIR)/net/ipv4/tcp_diag.ko \
++	$(LINUX_DIR)/net/ipv4/udp_diag.ko \
++	$(LINUX_DIR)/net/ipv4/raw_diag.ko
++  AUTOLOAD:=$(call AutoLoad,31,inet_diag tcp_diag udp_diag raw_diag)
++endef
++
++define KernelPackage/inet-diag/description
++Support for INET (TCP, DCCP, etc) socket monitoring interface used by
++native Linux tools such as ss.
++endef
++
++$(eval $(call KernelPackage,inet-diag))
+ 
+ define KernelPackage/wireguard

devices/mediatek_mt7981/.config

@@ -24,6 +24,8 @@ CONFIG_PACKAGE_kmod-sched-ipset=n
 CONFIG_PACKAGE_kmod-sched-mqprio=n
 CONFIG_PACKAGE_dockerd=n
 
+CONFIG_PACKAGE_kmod-i40e-vendor=n
+
 CONFIG_MTK_ACK_CTS_TIMEOUT_SUPPORT=y
 CONFIG_MTK_AIR_MONITOR=y
 CONFIG_MTK_AMPDU_CONF_SUPPORT=y

devices/mediatek_mt7981/diy.sh

@@ -4,10 +4,10 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-kernel_v="$(cat include/kernel-version.mk | grep LINUX_KERNEL_HASH-5.* | cut -f 2 -d - | cut -f 1 -d ' ')"
-echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
-sed -i "s?targets/%S/.*'?targets/%S/$kernel_v'?" include/feeds.mk
+rm -rf package/feeds/kiddin9/rtl*
 
 rm -rf devices/common/patches/{glinet,imagebuilder.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
+rm -rf toolchain/musl
 
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/toolchain/musl toolchain/musl

devices/meson_meson8b/.config

@@ -6,4 +6,3 @@ CONFIG_TARGET_DEVICE_meson_meson8b_DEVICE_thunder-onecloud=y
 
 CONFIG_TARGET_ROOTFS_SQUASHFS=n
 CONFIG_TARGET_ROOTFS_EXT4FS=y
-

devices/ramips_mt7621/patches/cr660x.patch

@@ -167,8 +167,8 @@ index bdaeac2cb16e..72fbd3930a80 100644
    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
 -	kmod-usb-ledtrig-usbport
 +	kmod-usb-ledtrig-usbport wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
- endef
- TARGET_DEVICES += youku_yk-l2
+   UIMAGE_MAGIC := 0x12291000
+   UIMAGE_NAME := 400000000000000000003000
  
 
 --- /dev/null

devices/rockchip_armv8/.config

@@ -5,6 +5,9 @@ CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_ALL_PROFILES=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus-lts=n
 
+CONFIG_PACKAGE_kmod-rtl8821cu=m
+CONFIG_PACKAGE_kmod-rtl88x2bu=m
+
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 

devices/rockchip_armv8/diy.sh

@@ -15,8 +15,6 @@ rm -rf target/linux/rockchip/patches-5.15/{002-net-usb*,003-dt-bindings*,006-roc
 
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 
-sed -i "s/#TARGET_DEVICES += hinlink_opc-h68k/TARGET_DEVICES += hinlink_opc-h68k/" target/linux/rockchip/image/armv8.mk
-
 sed -i "/KernelPackage,ptp/d" package/kernel/linux/modules/other.mk
 
 mv -f tmp/r8125 feeds/kiddin9/

devices/rockchip_armv8/patches/drm-rockchip-fix.patch

@@ -1,23 +0,0 @@
-From fe7d7074c4dc75eaf868addc4d4c602e4233e31f Mon Sep 17 00:00:00 2001
-From: kiddin9 <[email protected]>
-Date: Sat, 23 Apr 2022 22:14:29 +0800
-Subject: [PATCH] Update modules.mk
-
----
- target/linux/rockchip/modules.mk | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk
-index 4ad49b57e82..46f3e715624 100644
---- a/target/linux/rockchip/modules.mk
-+++ b/target/linux/rockchip/modules.mk
-@@ -35,7 +35,8 @@ define KernelPackage/drm-rockchip
- 	$(LINUX_DIR)/drivers/media/cec/core/[email protected] \
- 	$(LINUX_DIR)/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko \
- 	$(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \
--	$(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko
-+	$(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko \
-+	$(LINUX_DIR)/drivers/gpu/drm/[email protected]
-   AUTOLOAD:=$(call AutoProbe,rockchipdrm phy-rockchip-inno-hdmi dw-hdmi-cec)
- endef
- 

devices/rockchip_armv8/patches/r6s.patch

@@ -126,29 +126,24 @@
 
 --- a/target/linux/rockchip/image/Makefile
 +++ b/target/linux/rockchip/image/Makefile
-@@ -75,4 +75,17 @@ endef
- 
+@@ -80,3 +80,25 @@
  include $(SUBTARGET).mk
  
 +define Image/Build
-+	if [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r5c" ]; then \
++	if [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r6s" ]; then \
 +		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
 +		export BIN_DIR=$(BIN_DIR); \
 +		export TOPDIR=$(TOPDIR); \
-+		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/friendlywrt22-rk3568; \
++		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/friendlywrt22-rk3588; \
 +		. ../modify_packit.sh; \
 +		./build.sh sd-img; \
 +		[ "$(MORE)" == "eflasher" ] && ./build.sh emmc-img; \
-+		rm -rf $(BIN_DIR)/*r5c-squashfs-sysupgrade.img.gz $(BIN_DIR)/images-for-eflasher; \
-+	fi
-+endef
-+
-+define Image/Build
-+	if [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r6s" ]; then \
++		rm -rf $(BIN_DIR)/*r6s-squashfs-sysupgrade.img.gz $(BIN_DIR)/images-for-eflasher; \
++	elif [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r5c" ]; then \
 +		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
 +		export BIN_DIR=$(BIN_DIR); \
 +		export TOPDIR=$(TOPDIR); \
-+		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/friendlywrt22-rk3588; \
++		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/friendlywrt22-rk3568; \
 +		. ../modify_packit.sh; \
 +		./build.sh sd-img; \
 +		[ "$(MORE)" == "eflasher" ] && ./build.sh emmc-img; \
@@ -157,4 +152,3 @@
 +endef
 +
  $(eval $(call BuildImage))
- 

devices/sunxi_cortexa53/.config

@@ -10,6 +10,10 @@ CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_xunlong_orangepi-pc2=y
 CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_xunlong_orangepi-zero-plus=y
 #CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_xunlong_orangepi-zero2=y
 
+CONFIG_PACKAGE_kmod-rtl8189es=y
+CONFIG_PACKAGE_kmod-rtl8821cu=m
+CONFIG_PACKAGE_kmod-rtl88x2bu=m
+
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 
 

devices/sunxi_cortexa7/.config

@@ -15,6 +15,10 @@ CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-plus=y
 CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-r1=y
 CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-zero=y
 
+CONFIG_PACKAGE_kmod-rtl8189es=y
+CONFIG_PACKAGE_kmod-rtl8821cu=m
+CONFIG_PACKAGE_kmod-rtl88x2bu=m
+
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 
 

devices/x86_64/.config

@@ -12,5 +12,8 @@ CONFIG_VMDK_IMAGES=n
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
+CONFIG_PACKAGE_kmod-rtl8821cu=m
+CONFIG_PACKAGE_kmod-rtl88x2bu=m
+
 CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n
 

devices/x86_64/diy.sh

@@ -13,7 +13,7 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/ker
 
 sed -i "s/ +PACKAGE_kmod-backlight:kmod-backlight//" package/kernel/linux/modules/video.mk
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk/' target/linux/x86/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom/' target/linux/x86/Makefile
 
 mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk

devices/x86_generic/.config

@@ -12,5 +12,8 @@ CONFIG_VMDK_IMAGES=n
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
+CONFIG_PACKAGE_kmod-rtl8821cu=m
+CONFIG_PACKAGE_kmod-rtl88x2bu=m
+
 CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n