diff --git a/config/Config-kernel.in b/config/Config-kernel.in index bdb6b91cbb..472cb87c7c 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -46,7 +46,7 @@ config KERNEL_DEBUG_FS config KERNEL_MIPS_FPU_EMULATOR bool "Compile the kernel with MIPS FPU Emulator" - default y if TARGET_pistachio + default y depends on (mips || mipsel || mips64 || mips64el) config KERNEL_ARM_PMU diff --git a/package/lean/luci-app-docker/Makefile b/package/lean/luci-app-docker/Makefile index a40573ea38..7a1784fca0 100755 --- a/package/lean/luci-app-docker/Makefile +++ b/package/lean/luci-app-docker/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=Luci for Docker-CE LUCI_DEPENDS:=+docker-ce LUCI_PKGARCH:=all PKG_VERSION:=1 -PKG_RELEASE:=6 +PKG_RELEASE:=7 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/target/linux/x86/base-files/etc/docker-init b/package/lean/luci-app-docker/root/etc/docker-init similarity index 100% rename from target/linux/x86/base-files/etc/docker-init rename to package/lean/luci-app-docker/root/etc/docker-init diff --git a/target/linux/x86/base-files/etc/docker-web b/package/lean/luci-app-docker/root/etc/docker-web similarity index 100% rename from target/linux/x86/base-files/etc/docker-web rename to package/lean/luci-app-docker/root/etc/docker-web diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 654d216724..b5231681b1 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=1 -PKG_RELEASE:=103 +PKG_RELEASE:=105 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua index dcc11166b4..4e8d824349 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua @@ -59,7 +59,7 @@ local v2ray = { type = server.kcp_guise } } or nil, - wsSettings = (server.transport == "ws") and { + wsSettings = (server.transport == "ws") and (server.ws_path ~= nil or server.ws_host ~= nil) and { path = server.ws_path, headers = (server.ws_host ~= nil) and { Host = server.ws_host diff --git a/tools/libelf/Makefile b/tools/libelf/Makefile index ab7360ffee..33cc7e8577 100644 --- a/tools/libelf/Makefile +++ b/tools/libelf/Makefile @@ -13,7 +13,7 @@ PKG_HASH:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.mr511.de/software/ +PKG_SOURCE_URL:=https://fossies.org/linux/misc/old/ HOST_BUILD_PARALLEL:=1