update

kiddin9 · Jan 24, 2025 · 6f93df6 · 6f93df6
1 parent d2aa9e8
commit 6f93df6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/devices/common/diy.sh b/devices/common/diy.sh
@@ -54,7 +54,7 @@ wget -N https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/go
 #sed -i "/call Build\/check-size,\$\$(KERNEL_SIZE)/d" include/image.mk
 
 git_clone_path master https://github.com/coolsnowwolf/lede mv target/linux/generic/hack-6.6
-rm -rf target/linux/generic/hack-6.6/929-Revert-genetlink*
+rm -rf target/linux/generic/hack-6.6/929-Revert-genetlink* target/linux/generic/hack-6.6/767-net-phy-realtek-add-led*
 wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch -P target/linux/generic/pending-6.6/
 
 wget -N https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/16414.patch -P devices/common/patches/

diff --git a/devices/common/patches/imagebuilder.patch b/devices/common/patches/imagebuilder.patch
@@ -113,7 +113,7 @@
 +        $(shell echo "`grep kwrt_kiddin9 $(TOPDIR)/repositories.conf | sed -e 's/kiddin9/small_flash/g'`" >>$(TOPDIR)/repositories.conf)
 +	endif
 +	ifneq ($(findstring /data/bcache/,$(BIN_DIR)),)
-+		BUILD_PACKAGES += -luci-app-homeproxy -luci-app-istorex -luci-theme-argon -htop -bash -openssh-sftp-server -luci-ssl-nginx luci-ssl
++		BUILD_PACKAGES += -luci-app-homeproxy -luci-app-istorex -luci-theme-argon -htop -bash -openssh-sftp-server -luci-nginx luci-ssl
 +	endif
 +else
 +        $(shell sed -i "/small_flash/d" $(TOPDIR)/repositories.conf)

diff --git a/devices/common/patches/luci-base.patch b/devices/common/patches/luci-base.patch
@@ -158,22 +158,6 @@
  	</body>
  </html>
 
---- a/package/feeds/luci/luci-base/htdocs/luci-static/resources/ui.js
-+++ b/package/feeds/luci/luci-base/htdocs/luci-static/resources/ui.js
-@@ -3129,12 +3129,6 @@ var UIMenu = baseclass.singleton(/** @lends LuCI.ui.menu.prototype */ {
-
- 				for (var i = 0; root != null && i < path.length; i++)
- 					root = L.isObject(root.children) ? root.children[path[i]] : null;
--
--				if (root)
--					subnode = Object.assign({}, subnode, {
--						children: root.children,
--						action: root.action
--					});
- 			}
-
- 			children.push(subnode);
-
 --- a/package/feeds/luci/luci-base/root/etc/init.d/ucitrack
 +++ b/package/feeds/luci/luci-base/root/etc/init.d/ucitrack
 @@ -8,7 +8,7 @@ register_init() {