From 9f68660b59500f765654b284269c731273cdaa8c Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sat, 12 Oct 2019 02:31:07 -0700 Subject: [PATCH 1/4] luci-app-docker: move docker sh files --- package/lean/luci-app-docker/Makefile | 2 +- .../lean/luci-app-docker/root}/etc/docker-init | 0 .../lean/luci-app-docker/root}/etc/docker-web | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {target/linux/x86/base-files => package/lean/luci-app-docker/root}/etc/docker-init (100%) rename {target/linux/x86/base-files => package/lean/luci-app-docker/root}/etc/docker-web (100%) 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 From 3580e0f1d50f677fcc4e7bef5992f3cda25cfc6a Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sat, 12 Oct 2019 02:33:54 -0700 Subject: [PATCH 2/4] luci-ssr-plus: fix v2ray ws json format issue --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../root/usr/share/shadowsocksr/genv2config.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 411b6ce79d977b7938091719b38fb115e005ef51 Mon Sep 17 00:00:00 2001 From: rookietribe <48111330+rookietribe@users.noreply.github.com> Date: Sat, 12 Oct 2019 17:34:35 +0800 Subject: [PATCH 3/4] Update libelf Makefile Update PKG_SOURCE_URL --- tools/libelf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c78939e05c500aa6e77fc5d51f8864af9f6f67c9 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sat, 12 Oct 2019 02:41:29 -0700 Subject: [PATCH 4/4] mips: enable KERNEL_MIPS_FPU_EMULATOR by default --- config/Config-kernel.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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