Merge branch 'sbwml:master' into master

Q2297045667 · Dec 25, 2024 · b5324af · b5324af
2 parents caebcda + 6f39294
commit b5324af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/openwrt/build.sh b/openwrt/build.sh
@@ -246,6 +246,7 @@ bash 03-convert_translation.sh
 bash 04-fix_kmod.sh
 bash 05-fix-source.sh
 [ -f "10-custom.sh" ] && bash 10-custom.sh
+find feeds -type f -name "*.orig" -exec rm -f {} \;
 [ "$(whoami)" = "runner" ] && endgroup
 
 rm -f 0*-*.sh 10-custom.sh

diff --git a/openwrt/patch/odhcpd/luci-mod-network-add-option-for-ipv6-max-plt-vlt.patch b/openwrt/patch/odhcpd/luci-mod-network-add-option-for-ipv6-max-plt-vlt.patch
@@ -1,6 +1,6 @@
 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
 +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
-@@ -847,6 +847,20 @@ return view.extend({
+@@ -854,6 +854,20 @@ return view.extend({
  					so.depends('ra', 'server');
  					so.depends({ ra: 'hybrid', master: '0' });