kiddin9 3 лет назад
Родитель
Сommit
b2ead75f25

+ 14 - 31
.github/workflows/Openwrt-AutoBuild.yml

@@ -118,26 +118,8 @@ jobs:
         [ "${{ 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//')"
+               -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, 'sdk') }}" == "true" ]]; then
-        cd openwrt
-        if [[ ${{matrix.target}} == "x86_64" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/x86/64/openwrt-sdk-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "rockchip_armv8" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/rockchip/armv8/openwrt-sdk-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "bcm27xx_bcm2711" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/$REPO_BRANCH/targets/bcm27xx/bcm2711/openwrt-sdk-bcm27xx-bcm2711_gcc-8.4.0_musl.Linux-x86_64.tar.xz || true
-        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"
@@ -198,11 +180,9 @@ jobs:
         sleep 5
 
     - name: Cache
-      uses: klever1988/cachewrtbuild@main
-      with:
-        ccache: 'true'
-        clean: ${{ contains(github.event.action, 'nocache') }}
-        prefix: ${{ github.workspace }}/openwrt
+      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
@@ -211,7 +191,6 @@ jobs:
         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"
-        mv -f .config ${{matrix.target}}.config
    
     - name: Check space usage
       run: df -hT
@@ -222,14 +201,18 @@ jobs:
         shopt -s extglob
         mkdir -p firmware/${{matrix.target}}
         cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
-        cp openwrt/${{matrix.target}}.config  ./firmware/${{matrix.target}}/${{matrix.target}}.config || true
-        cp openwrt/build_dir/target-*/linux-*/linux-*/.config ./firmware/${{matrix.target}}/${{matrix.target}}_kernel.config
+        cd openwrt/bin/targets/*/*/
+        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 }}
+        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
         rename -v "s/xiaomi_redmi-router/redmi/" ./firmware/*/*bin || true
-        mkdir ${{ env.REPO_BRANCH }}
-        cp -rf openwrt/bin/targets ${{ env.REPO_BRANCH }}/
         Emoji=("🎉" "🤞" "✨" "🎁" "🎈" "🎄" "🎨" "💋" "🍓" "🍕" "🍉" "💐" "🌴" "🚀" "🛸" "🗽" "⛅" "🌈" "🔥" "⛄" "🐶" "🏅" "🦄" "🐤")
         echo "EMOJI=${Emoji[$[$RANDOM % ${#Emoji[@]}]]}" >> $GITHUB_ENV
         if [ ${{matrix.target}} == "x86_64" ]; then
@@ -254,7 +237,7 @@ jobs:
       with:
         SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
         ARGS: "-avzr"
-        SOURCE: ${{ env.REPO_BRANCH }}
+        SOURCE: openwrt/bin/targets
         REMOTE_HOST: op.supes.top
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/releases/tmp/"
@@ -289,7 +272,7 @@ jobs:
       with:
         name: ${{ env.VERSION }}_${{matrix.target}}
         path: |
-          ${{ env.REPO_BRANCH }}
+          openwrt/bin/targets
 
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'

+ 1 - 1
.github/workflows/repo-dispatcher.yml

@@ -59,7 +59,7 @@ 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": "rockchip ${{ github.event.inputs.version }}", "client_payload": {"target": "rockchip"}}'
+          -d '{"event_type": "rockchip_armv8 ${{ github.event.inputs.version }}", "client_payload": {"target": "rockchip_armv8"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \

+ 3 - 1
devices/armvirt_64/.config

@@ -6,4 +6,6 @@ CONFIG_TARGET_ROOTFS_SQUASHFS=n
 CONFIG_PACKAGE_kmod-brcmfmac=y
 CONFIG_BRCMFMAC_SDIO=y
 
-CONFIG_TESTING_KERNEL=y
+CONFIG_TESTING_KERNEL=y
+
+CONFIG_JSON_OVERVIEW_IMAGE_INFO=n

+ 1 - 1
devices/armvirt_64/diy.sh

@@ -1,4 +1,4 @@
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs my-autocore-arm luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade/' target/linux/armvirt/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs my-autocore-arm luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk kmod-usb2 kmod-usb3/' target/linux/armvirt/Makefile
 
 echo '
 CONFIG_ARM64_CRYPTO=y

+ 10 - 27
devices/armvirt_64/patches/image.patch

@@ -1,35 +1,18 @@
 --- a/include/image.mk
 +++ b/include/image.mk
-@@ -293,20 +293,19 @@
+@@ -294,5 +294,5 @@
  endef
  
 -ROOTFSTZ = $(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz
++ROOTFSTZ = $(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).tar.gz
  ifdef CONFIG_TARGET_ROOTFS_TARGZ
    define Image/Build/targz
- 	$(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \
- 		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
--		-C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(ROOTFSTZ)
-+		-C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).tar.gz
- 
- 	mkdir $(BUILD_DIR)/json_info_files
--	touch $(BUILD_DIR)/json_info_files/$(ROOTFSTZ).json
-+	touch $(BUILD_DIR)/json_info_files/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).tar.gz.json
- 	@mkdir -p $$(shell dirname $$@)
- 	DEVICE_ID="$(PROFILE_SANITIZED)" \
- 	BIN_DIR="$(BIN_DIR)" \
- 	SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
--	IMAGE_NAME="$(ROOTFSTZ)" \
--	IMAGE_TYPE="rootfs" \
--	IMAGE_FILESYSTEM="rootfs" \
-+	IMAGE_NAME="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).tar.gz" \
-+	IMAGE_TYPE="sysupgrade" \
-+	IMAGE_FILESYSTEM="ext4" \
- 	IMAGE_PREFIX="$(IMG_PREFIX)" \
+@@ -308,6 +308,6 @@
+ 	FILE_NAME="$(ROOTFSTZ)" \
+ 	FILE_DIR="$(BIN_DIR)" \
+-	FILE_TYPE="rootfs" \
+-	FILE_FILESYSTEM="rootfs" \
++	FILE_TYPE="sysupgrade" \
++	FILE_FILESYSTEM="ext4" \
+ 	DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
  	DEVICE_VENDOR="$(shell echo $($(PROFILE)_NAME) | cut -d " " -f1)" \
-@@ -320,5 +319,5 @@
- 	VERSION_CODE="$(VERSION_CODE)" \
- 	SUPPORTED_DEVICES="$($(PROFILE)_SUPPORTED_DEVICES)" \
--	$(TOPDIR)/scripts/json_add_image_info.py $(BUILD_DIR)/json_info_files/$(ROOTFSTZ).json
-+	$(TOPDIR)/scripts/json_add_image_info.py $(BUILD_DIR)/json_info_files/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).tar.gz.json
-   endef
- endif

+ 1 - 1
devices/bcm27xx_bcm2711/diy.sh

@@ -7,7 +7,7 @@ sed -i "s?packages/%A/kmods/.*'?packages/%A/kmods/$kernel_v'?" include/feeds.mk
 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*}
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/bcm27xx/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm fdisk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile
 
 sed -i 's/factory.img.gz //' target/linux/bcm27xx/image/Makefile
 

+ 0 - 3
devices/common/.config

@@ -39,9 +39,6 @@ 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

+ 13 - 22
devices/common/diy.sh

@@ -2,25 +2,24 @@
 #=================================================
 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="$(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)"
 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^
+git checkout HEAD^
 [ "$(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} tools/firmware-utils ../
+cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} tools/firmware-utils package/utils/ucode ../
 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 ' ')"
 echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
-# sed -i "s?targets/%S/packages?packages/%A/kmods/$kernel_v?" include/feeds.mk
+sed -i "s?targets/%S/packages?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/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 \
+luci-app-wizard luci-app-attendedsysupgrade luci-base luci-compat luci-lib-ipkg \
 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
+sed -i "s/procd-ujail//" include/target.mk
 
 sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward"
 
@@ -29,13 +28,15 @@ 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/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}
 
 ./scripts/feeds update -a
 ./scripts/feeds install -a -p kiddin9
 ./scripts/feeds install -a
 cd feeds/kiddin9; git pull; cd -
 
+mv -f feeds/kiddin9/r81* tmp/
+
 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
@@ -73,19 +74,9 @@ sed -i \
 	package/feeds/kiddin9/*/Makefile
 
 (
-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
+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/.*
 fi
 ) &

+ 3 - 3
devices/common/feeds.conf

@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-21.02
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-22.03
+src-git luci https://git.openwrt.org/project/luci.git;openwrt-22.03
+src-git routing https://git.openwrt.org/feed/routing.git;openwrt-22.03
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

+ 3 - 3
devices/common/patches/image-commands.patch

@@ -1,9 +1,9 @@
 --- a/include/image-commands.mk
 +++ b/include/image-commands.mk
-@@ -329,6 +329,17 @@ endef
+@@ -419,6 +419,17 @@ endef
  
  # Convert a raw image into a $1 type image.
- # E.g. | qemu-image vdi
+ # E.g. | qemu-image vdi <optional extra arguments to qemu-img binary>
 +define Build/qemu-exsi
 +	if command -v qemu-img; then \
 +		name="$(subst .vmdk.zip,,$@)"; \
@@ -17,4 +17,4 @@
 +
  define Build/qemu-image
  	if command -v qemu-img; then \
- 		qemu-img convert -f raw -O $1 $@ [email protected]; \
+ 		qemu-img convert -f raw -O $1 $@ [email protected]; \

+ 7 - 21
devices/common/patches/imagebuilder.patch

@@ -82,20 +82,7 @@
  
  ifndef IB
    ifdef CONFIG_TARGET_PER_DEVICE_ROOTFS
-@@ -225,10 +226,10 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
- $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
- 
- define Image/mkfs/squashfs-common
-+	echo -998 > /proc/$$$$/oom_score_adj || true
- 	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
- 		-nopad -noappend -root-owned \
--		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
--		-processors 1
-+		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT)
- endef
- 
- ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y)
-@@ -291,11 +292,34 @@ define Image/gzip-ext4-padded-squashfs
+@@ -292,11 +293,34 @@ define Image/gzip-ext4-padded-squashfs
  
  endef
  
@@ -111,15 +98,15 @@
 +	touch $(BUILD_DIR)/json_info_files/$(ROOTFSTZ).json
 +	@mkdir -p $$(shell dirname $$@)
 +	DEVICE_ID="$(PROFILE_SANITIZED)" \
-+	BIN_DIR="$(BIN_DIR)" \
 +	SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
-+	IMAGE_NAME="$(ROOTFSTZ)" \
-+	IMAGE_TYPE="rootfs" \
-+	IMAGE_FILESYSTEM="rootfs" \
-+	IMAGE_PREFIX="$(IMG_PREFIX)" \
++	FILE_NAME="$(ROOTFSTZ)" \
++	FILE_DIR="$(BIN_DIR)" \
++	FILE_TYPE="rootfs" \
++	FILE_FILESYSTEM="rootfs" \
++	DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
 +	DEVICE_VENDOR="$(shell echo $($(PROFILE)_NAME) | cut -d " " -f1)" \
 +	DEVICE_MODEL="$(shell echo $($(PROFILE)_NAME) | cut -d " " -f2-)" \
-+	DEVICE_VARIANT="$$(DEVICE_VARIANT)" \
++	DEVICE_VARIANT="$(DEVICE_VARIANT)" \
 +	DEVICE_TITLE="$($(PROFILE)_NAME)" \
 +	DEVICE_PACKAGES="$($(PROFILE)_PACKAGES)" \
 +	TARGET="$(BOARD)" \
@@ -131,7 +118,6 @@
    endef
  endif
  
-
 --- a/scripts/json_overview_image_info.py
 +++ b/scripts/json_overview_image_info.py
 @@ -47,7 +47,7 @@ def get_initial_output(image_info):

+ 0 - 11
devices/common/patches/rule_MKHASH.patch

@@ -1,11 +0,0 @@
---- a/rules.mk
-+++ b/rules.mk
-@@ -266,6 +266,8 @@ TARGET_CXX:=$(TARGET_CROSS)g++
- KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
- SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
- ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e
-+MKHASH:=$(STAGING_DIR_HOST)/bin/mkhash
-+export MKHASH
- CP:=cp -fpR
- LN:=ln -sf
- XARGS:=xargs -r

+ 17 - 0
devices/common/patches/targets.patch

@@ -0,0 +1,17 @@
+--- a/include/target.mk
++++ b/include/target.mk
+@@ -53,10 +53,10 @@ DEFAULT_PACKAGES.nas:=\
+ 	mdadm
+ # For router targets
+ DEFAULT_PACKAGES.router:=\
+-	dnsmasq \
+-	firewall4 \
+-	nftables \
+-	kmod-nft-offload \
++	dnsmasq-full \
++	firewall \
++	nftables iptables-legacy ip6tables-legacy \
++	kmod-ipt-offload \
+ 	odhcp6c \
+ 	odhcpd-ipv6only \
+ 	ppp \

+ 5 - 1
devices/ipq807x/diy.sh

@@ -2,10 +2,14 @@
 
 shopt -s extglob
 
-rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/qca
+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 target/linux/ipq807x/!(patches-5.15)
 svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/linux/ipq807x

+ 1 - 0
devices/ramips_mt7621/.config

@@ -2,6 +2,7 @@
 CONFIG_TARGET_ramips=y
 CONFIG_TARGET_ramips_mt7621=y
 CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_ROOTFS_INITRAMFS=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

+ 5 - 10
devices/ramips_mt7621/patches/cr660x.patch

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

+ 1 - 0
devices/rockchip_armv8/.config

@@ -4,6 +4,7 @@ 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-r2c=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

+ 1 - 1
devices/rockchip_armv8/diy.sh

@@ -14,7 +14,7 @@ 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/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq/' target/linux/rockchip/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm fdisk luci-app-cpufreq kmod-drm-rockchip kmod-gpu-lima kmod-usb2 kmod-usb3/' target/linux/rockchip/Makefile
 
 echo '
 CONFIG_ARM64_CRYPTO=y

+ 1 - 2
devices/x86_64/.config

@@ -8,7 +8,6 @@ CONFIG_GRUB_EFI_IMAGES=y
 CONFIG_VMDK_IMAGES=n
 
 # 其他需要安装的软件包:
+CONFIG_PACKAGE_kmod-r8168=n
 
 CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n
-
-CONFIG_PACKAGE_kmod-r8169=n

+ 3 - 2
devices/x86_64/diy.sh

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