From ca06b70b5694a215c5646f1e7e8e424215c6bf64 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 25 Oct 2020 15:24:45 +0800 Subject: [PATCH 1/2] busybox: make busybox understand special cron time like @daily --- package/utils/busybox/Config-defaults.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in index 29724041f4..abac6af9ee 100644 --- a/package/utils/busybox/Config-defaults.in +++ b/package/utils/busybox/Config-defaults.in @@ -1954,7 +1954,7 @@ config BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL default n config BUSYBOX_DEFAULT_FEATURE_CROND_SPECIAL_TIMES bool - default n + default y config BUSYBOX_DEFAULT_FEATURE_CROND_DIR string default "/etc" From 89941c8fd3ade1079327123b2a810570d6a7ee7c Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 25 Oct 2020 17:55:24 +0800 Subject: [PATCH 2/2] naiveproxy: fix var setting Fixes: #216. --- package/ctcgfw/naiveproxy/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/ctcgfw/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile index 03e33cd923..a4daf1b034 100644 --- a/package/ctcgfw/naiveproxy/Makefile +++ b/package/ctcgfw/naiveproxy/Makefile @@ -65,7 +65,8 @@ endif AFDO_VER:=86.0.4237.0_rc-r1-merged AFDO_FILE:=chromeos-chrome-amd64-$$(AFDO_VER).afdo.bz2 define Download/AFDO_PROF - URL:=https://storage.googleapis.com/chromeos-prebuilt/afdo-job/llvm + URL:=https://storage.googleapis.com.cnpmjs.org/chromeos-prebuilt/afdo-job/llvm \ + https://storage.googleapis.com/chromeos-prebuilt/afdo-job/llvm URL_FILE:=$$(AFDO_FILE) FILE:=$$(URL_FILE) HASH:=d5730bd681766bcf4fd22c0e560ad500b2d6eb09164a9b80146cc327a156c98c @@ -80,12 +81,13 @@ define Download/CLANG HASH:=05df154999115386fb390a5ec7e6ca9e28aeae2ea1cbf76435247c0eee5b9ef3 endef -GN_VER:=git_revision\:e327ffdc503815916db2543ec000226a8df45163 +COLON:= : ++GN_VER:=git_revision$$(COLON)e327ffdc503815916db2543ec000226a8df45163 GN_FILE:=gn-$$(GN_VER).zip define Download/GN_TOOL URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+ - URL_FILE:=$$(GN_FILE) - FILE:=$$(URL_FILE) + URL_FILE:=$$(GN_VER) + FILE:=$$(GN_FILE) HASH:=6d141b84a541e31ed7d3cd4d938987fdfa7988d5081d3089bc1509a43d6b742f endef @@ -105,7 +107,7 @@ endef define Build/Compile ( \ cd $(PKG_BUILD_DIR)/src ; \ - . ../init_env.sh "$(ARCH)" "$(BOARD)" $(CPU_TYPE) $(CPU_SUBTYPE) "$(TOOLCHAIN_DIR)"; \ + . ../init_env.sh "$(ARCH)" "$(BOARD)" $(CPU_TYPE) $(CPU_SUBTYPE) "$(TOOLCHAIN_DIR)" ; \ export naive_flags="$$$${naive_flags} $$$${naive_ccache_flags}" ; \ export OP_STAGING_DIR="$(STAGING_DIR)" ; \ mkdir -p out ; \