From 13971c5be4c477933cdfc1fb37387b980d929707 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 23 Aug 2024 00:43:53 +0800
Subject: [PATCH] update

---
 devices/common/diy.sh        | 7 +++++--
 devices/common/kernel_6.1.sh | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/devices/common/diy.sh b/devices/common/diy.sh
index dbd63f341bf8..c02d33e8c3d9 100644
--- a/devices/common/diy.sh
+++ b/devices/common/diy.sh
@@ -13,6 +13,9 @@ sed -i '/	refresh_config();/d' scripts/feeds
 ./scripts/feeds install -a -p kiddin9 -f
 ./scripts/feeds install -a
 
+rm -rf package/base-files
+mv -f feeds/kiddin9/base-files package/
+
 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-advancedplus luci-app-firewall luci-app-opkg luci-app-upnp luci-app-autoreboot \
@@ -38,7 +41,7 @@ mv -f feeds/kiddin9/r81* tmp/
 
 wget -N https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/golang/Makefile -P feeds/packages/lang/golang/golang/
 
-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
 
 #sed -i "/call Build\/check-size,\$\$(KERNEL_SIZE)/d" include/image.mk
 
@@ -80,4 +83,4 @@ sed -i \
 	-e 's?../../lang?$(TOPDIR)/feeds/packages/lang?' \
 	package/feeds/kiddin9/*/Makefile
 
-sed -i "s/OpenWrt/KWrt/g" feeds/kiddin9/base-files/files/bin/config_generate feeds/kiddin9/base-files/image-config.in config/Config-images.in Config.in include/u-boot.mk include/version.mk package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh || true
+sed -i "s/OpenWrt/KWrt/g" package/base-files/files/bin/config_generate package/base-files/image-config.in config/Config-images.in Config.in include/u-boot.mk include/version.mk package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh || true
diff --git a/devices/common/kernel_6.1.sh b/devices/common/kernel_6.1.sh
index 8a516680c255..c1fa7bb107cc 100644
--- a/devices/common/kernel_6.1.sh
+++ b/devices/common/kernel_6.1.sh
@@ -44,4 +44,4 @@ sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/
 
 sed -i "s/no-lto,/no-lto no-mold,/" include/package.mk
 
-sed -i "s/OpenWrt/KWrt/g" feeds/kiddin9/base-files/files/bin/config_generate feeds/kiddin9/base-files/image-config.in config/Config-images.in Config.in include/u-boot.mk include/version.mk package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh || true
\ No newline at end of file
+sed -i "s/OpenWrt/KWrt/g" package/base-files/files/bin/config_generate package/base-files/image-config.in config/Config-images.in Config.in include/u-boot.mk include/version.mk package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh || true
\ No newline at end of file