From 44159fdd5593fe1babc69f4f48ac330c8d346571 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 20 Sep 2020 22:17:45 +0800 Subject: [PATCH] Revert "naiveproxy: add RAM detection" This reverts commit d359dac91cff9557b143cc7f57d914459bd82ff0. --- package/ctcgfw/naiveproxy/Makefile | 2 +- package/ctcgfw/naiveproxy/src/init_env.sh | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/ctcgfw/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile index b3884d9465..f3cf2d291e 100644 --- a/package/ctcgfw/naiveproxy/Makefile +++ b/package/ctcgfw/naiveproxy/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=naiveproxy PKG_VERSION:=85.0.4183.83-3 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)? diff --git a/package/ctcgfw/naiveproxy/src/init_env.sh b/package/ctcgfw/naiveproxy/src/init_env.sh index ee8e2b0c57..fd781a0651 100755 --- a/package/ctcgfw/naiveproxy/src/init_env.sh +++ b/package/ctcgfw/naiveproxy/src/init_env.sh @@ -4,9 +4,6 @@ # -------------------------------------------------------- # Init build dependencies for naiveproxy -# Exit immediately with any error -set -e - # Read args from shell target_arch="$1" target_board="$2" @@ -24,7 +21,6 @@ ldso_path="/lib/$(find "${toolchain_dir}/" | grep -Eo "ld-musl-[a-z0-9_-]+\\.so\ # OS detection [ "$(uname)" != "Linux" -o "$(uname -m)" != "x86_64" ] && { echo -e "Support Linux AMD64 only."; exit 1; } -[ "$(free | grep "Mem" | awk -F ' ' '{print $2}')" -lt "4000000" ] && { echo -e "Memory too low."; exit 1; } cd "$PWD/src"