bgme/openwrt-bgme-feed
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: bgme:075e4539d01a0104b8a4a70fa02bea70271ecffa
Branches Tags
bgme:main
bgme:smartdns-ui
..
compare: bgme:e6dbb845391c8e3bb9ee0e061e5a872faaf28091
Branches Tags
bgme:main
bgme:smartdns-ui

4 commits
075e4539d0 ... e6dbb84539

Author SHA1 Message Date
bgme
e6dbb84539 Merge commit '0befad0eae' 2025-10-13 05:05:07 +00:00
bgme
0befad0eae Squashed 'luci-app-smartdns/' changes from 26e7e29..d6163f5 
d6163f5 chore(i18n): Update PO files
751827d luci: add `-fallback` option to upstream dns server

git-subtree-dir: luci-app-smartdns
git-subtree-split: d6163f5fccb4e72e95632738678e5b9ab1df2454
 2025-10-13 05:05:07 +00:00
bgme
414da103ec Merge commit '3e338ef4ee' 2025-10-13 05:05:02 +00:00
bgme
3e338ef4ee Squashed 'smartdns/' changes from f7ef021..d7fafa4 
d7fafa4 Fix build failure issue with latest openwrt.

git-subtree-dir: smartdns
git-subtree-split: d7fafa4112ab0a3b2183ce98c64461f43aee1ad5
 2025-10-13 05:05:02 +00:00
4 changed files with 732 additions and 628 deletions
Download patch file Download diff file Expand all files Collapse all files

7
luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js
View file

@ -1038,6 +1038,13 @@ return view.extend({
return true; return true;
} }
// fallback
o = s.taboption("advanced", form.Flag, "fallback", _("Fallback"),
_("Mark this server as a fallback server, use it only when default servers fail."))
o.default = o.disabled
o.rmempty = true
o.modalonly = true
// other args // other args
o = s.taboption("advanced", form.Value, "addition_arg", _("Additional Server Args"), o = s.taboption("advanced", form.Value, "addition_arg", _("Additional Server Args"),
_("Additional Args for upstream dns servers")) _("Additional Args for upstream dns servers"))

757
luci-app-smartdns/po/templates/smartdns.pot
View file

File diff suppressed because it is too large Load diff

595
luci-app-smartdns/po/zh_Hans/smartdns.po
View file

File diff suppressed because it is too large Load diff

1
smartdns/Makefile
View file

@ -108,6 +108,7 @@ define Build/Compile/smartdns-ui
CARGO_BUILD_ARGS="$(if $(strip $(RUST_PKG_FEATURES)),--features "$(strip $(RUST_PKG_FEATURES))") --profile $(CARGO_PKG_PROFILE)" CARGO_BUILD_ARGS="$(if $(strip $(RUST_PKG_FEATURES)),--features "$(strip $(RUST_PKG_FEATURES))") --profile $(CARGO_PKG_PROFILE)"
+$(CARGO_PKG_VARS) CARGO_BUILD_ARGS="$(CARGO_BUILD_ARGS)" CC=$(TARGET_CC) \ +$(CARGO_PKG_VARS) CARGO_BUILD_ARGS="$(CARGO_BUILD_ARGS)" CC=$(TARGET_CC) \
PATH="$$(PATH):$(CARGO_HOME)/bin" \ PATH="$$(PATH):$(CARGO_HOME)/bin" \
AWS_LC_SYS_CFLAGS="-O0" \
make -C $(PKG_BUILD_DIR)/plugin/smartdns-ui make -C $(PKG_BUILD_DIR)/plugin/smartdns-ui
endef endef