/usr/lib/lua/luci/model/cbi/passwall/api/v2ray.lua:6: module 'luci.model.ipkg' not found: no field package.preload['luci.model.ipkg'] nofile'./luci/model/ipkg.lua' nofile'/usr/share/lua/luci/model/ipkg.lua' nofile'/usr/share/lua/luci/model/ipkg/init.lua' nofile'/usr/lib/lua/luci/model/ipkg.lua' nofile'/usr/lib/lua/luci/model/ipkg/init.lua' nofile'./luci/model/ipkg.so' nofile'/usr/lib/lua/luci/model/ipkg.so' nofile'/usr/lib/lua/loadall.so' nofile'./luci.so' nofile'/usr/lib/lua/luci.so' nofile'/usr/lib/lua/loadall.so' stack traceback: [C]: in function'require' /usr/lib/lua/luci/model/cbi/passwall/api/v2ray.lua:6: in main chunk [C]: in function'require' /usr/lib/lua/luci/controller/passwall.lua:8: in main chunk [C]: in function'require' /usr/lib/lua/luci/dispatcher.lua:1076: in function'createindex' /usr/lib/lua/luci/dispatcher.lua:1187: in function'createtree' /usr/lib/lua/luci/dispatcher.lua:694: in function'menu_json' /usr/lib/lua/luci/dispatcher.lua:795: in function'dispatch' /usr/lib/lua/luci/dispatcher.lua:478: in function </usr/lib/lua/luci/dispatcher.lua:477>
Saved working directory and index state WIP on master: 522f6b7eee ath79: add SUPPORTED_DEVICES based on ar71xx for some devices
5,git pull提示‘在合并之前,请提交更改或存储更改。’解决方法使用:git stash命令
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
csjtl@ubuntu:~/OpenWRT/openwrt$ git pull Updating 522f6b7eee..3a79e3b185 error:Your local changes to the following files would be overwritten by merge: package/base-files/files/bin/config_generate Please commit your changes or stash them before you merge. Aborting csjtl@ubuntu:~/OpenWRT/openwrt$ git stash Saved working directory and index state WIP on master: 522f6b7eee ath79: add SUPPORTED_DEVICES based on ar71xx for some devices csjtl@ubuntu:~/OpenWRT/openwrt$ git pull Updating 522f6b7eee..3a79e3b185 Fast-forward include/kernel-version.mk 4 +- include/prereq-build.mk 4 +- package/base-files/files/bin/config_generate 2 + package/firmware/wireless-regdb/Makefile4 +-