From 379324079807d057a4f1601b7f6460a04c58259d Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 31 Jul 2020 21:58:25 +0800 Subject: [PATCH 1/6] AdGuardHome: add goproxy and upx support --- package/ntlf9t/AdGuardHome/Makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/package/ntlf9t/AdGuardHome/Makefile b/package/ntlf9t/AdGuardHome/Makefile index fdc4e40aad..f37881fb50 100644 --- a/package/ntlf9t/AdGuardHome/Makefile +++ b/package/ntlf9t/AdGuardHome/Makefile @@ -23,6 +23,10 @@ PKG_BUILD_DEPENDS:=golang/host node/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_CONFIG_DEPENDS:= \ + CONFIG_ADGUARDHOME_COMPRESS_GOPROXY \ + CONFIG_ADGUARDHOME_COMPRESS_UPX + GO_PKG:=github.com/AdguardTeam/AdGuardHome GO_PKG_EXCLUDES:=dhcpd/standalone GO_PKG_LDFLAGS:=-s -w @@ -43,6 +47,16 @@ define Package/AdGuardHome/description Free and open source, powerful network-wide ads and trackers blocking DNS server. endef +define Package/$(PKG_NAME)/config +config ADGUARDHOME_COMPRESS_GOPROXY + bool "Compiling with GOPROXY proxy" + default n + +config ADGUARDHOME_COMPRESS_UPX + bool "Compress executable files with UPX" + default y +endef + define Build/Compile ( \ cd $(PKG_BUILD_DIR) ; \ @@ -56,6 +70,9 @@ endef define Package/AdGuardHome/install $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) +ifeq ($(CONFIG_ADGUARDHOME_COMPRESS_UPX),y) + $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/AdGuardHome +endif $(INSTALL_DIR) $(1)/usr/bin/AdGuardHome $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/AdGuardHome $(1)/usr/bin/AdGuardHome/AdGuardHome endef From afe923507adab26e847ff9aefb994e84730d2c45 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 31 Jul 2020 22:05:21 +0800 Subject: [PATCH 2/6] AdGuardHome: add missing goproxy config --- package/ntlf9t/AdGuardHome/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/ntlf9t/AdGuardHome/Makefile b/package/ntlf9t/AdGuardHome/Makefile index f37881fb50..171062c09a 100644 --- a/package/ntlf9t/AdGuardHome/Makefile +++ b/package/ntlf9t/AdGuardHome/Makefile @@ -57,6 +57,11 @@ config ADGUARDHOME_COMPRESS_UPX default y endef +ifeq ($(CONFIG_ADGUARDHOME_COMPRESS_GOPROXY),y) +export GO111MODULE=on +export GOPROXY=https://goproxy.cn +endif + define Build/Compile ( \ cd $(PKG_BUILD_DIR) ; \ From 2063d285872ebbebf6e48d39911205b274cfb4b5 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 31 Jul 2020 23:09:39 +0800 Subject: [PATCH 3/6] kernel: bump 4.9 to 4.9.232 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- .../linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch | 2 +- .../backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch | 4 ++-- .../024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 672653c063..20fe82ae76 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .231 +LINUX_VERSION-4.9 = .232 LINUX_VERSION-4.14 = .190 LINUX_VERSION-4.19 = .135 -LINUX_KERNEL_HASH-4.9.231 = 4f843ba02fda5217942225afdce020d5f2f9b24f4210bf71a7c4fb63ceece8eb +LINUX_KERNEL_HASH-4.9.232 = 58f472e82345dc719a1d6d7bae01e5aa73387cd83308acd2c92371f7d5bc4f60 LINUX_KERNEL_HASH-4.14.190 = 6f175a3793ef0a15ba73be458a642c303be10b0ae387614f4fc1424451ed3f41 LINUX_KERNEL_HASH-4.19.135 = 33d7cecaa6258233881d2a5ecf25d40134639da5b1d497222eb1cbed9e32af98 diff --git a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch index 5eb1853451..4318d64082 100644 --- a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch @@ -795,7 +795,7 @@ --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3934,14 +3934,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3935,14 +3935,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch b/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch index bd34507306..63cd4a1ade 100644 --- a/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch +++ b/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller --- a/include/linux/tcp.h +++ b/include/linux/tcp.h -@@ -368,7 +368,7 @@ struct tcp_sock { +@@ -370,7 +370,7 @@ struct tcp_sock { u32 *saved_syn; }; @@ -27,7 +27,7 @@ Signed-off-by: David S. Miller TSQ_THROTTLED, TSQ_QUEUED, TCP_TSQ_DEFERRED, /* tcp_tasklet_func() found socket was owned */ -@@ -379,6 +379,15 @@ enum tsq_flags { +@@ -381,6 +381,15 @@ enum tsq_flags { */ }; diff --git a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch index 61e4af65eb..3ebf2755a2 100644 --- a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch +++ b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch @@ -134,7 +134,7 @@ Signed-off-by: David S. Miller if (tcp_small_queue_check(sk, skb, 0)) break; -@@ -3571,8 +3571,6 @@ void __tcp_send_ack(struct sock *sk, u32 +@@ -3574,8 +3574,6 @@ void __tcp_send_ack(struct sock *sk, u32 /* We do not want pure acks influencing TCP Small Queues or fq/pacing * too much. * SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784 From c03c3488ec2055764b02456710abb2a00ceaa58c Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 31 Jul 2020 23:27:33 +0800 Subject: [PATCH 4/6] scripts/download.pl: add cqu mirror for kernel downloading --- scripts/download.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/download.pl b/scripts/download.pl index 46b839058f..be0bdbb3fc 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -246,6 +246,7 @@ foreach my $mirror (@ARGV) { push @extra, "$extra[0]/longterm/v$1"; } foreach my $dir (@extra) { + push @mirrors, "https://mirrors.cqu.edu.cn/kernel/$dir"; push @mirrors, "https://mirrors.ustc.edu.cn/kernel.org/$dir"; push @mirrors, "https://cdn.kernel.org/pub/$dir"; push @mirrors, "https://mirror.rackspace.com/kernel.org/pub/$dir"; From 7de73f9929796084d131268dd2f250ef5cd8bf1a Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 1 Aug 2020 00:32:03 +0800 Subject: [PATCH 5/6] kernel: bump 4.14 to 4.14.191 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- .../ar71xx/patches-4.14/910-unaligned_access_hacks.patch | 2 +- .../linux/ath79/patches-4.14/910-unaligned_access_hacks.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 20fe82ae76..a552cbcba7 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .232 -LINUX_VERSION-4.14 = .190 +LINUX_VERSION-4.14 = .191 LINUX_VERSION-4.19 = .135 LINUX_KERNEL_HASH-4.9.232 = 58f472e82345dc719a1d6d7bae01e5aa73387cd83308acd2c92371f7d5bc4f60 -LINUX_KERNEL_HASH-4.14.190 = 6f175a3793ef0a15ba73be458a642c303be10b0ae387614f4fc1424451ed3f41 +LINUX_KERNEL_HASH-4.14.191 = 53823ed386c370b6ae0576c14be33b6e17067230406e49da16f1315f7d0df671 LINUX_KERNEL_HASH-4.19.135 = 33d7cecaa6258233881d2a5ecf25d40134639da5b1d497222eb1cbed9e32af98 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index 94eab1138f..94a8f6dc4f 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -757,7 +757,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3878,14 +3878,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3879,14 +3879,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index 9af21ceaad..63d6bc6ded 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -737,7 +737,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3878,14 +3878,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3879,14 +3879,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); From 745a67766505889e4d6b68e61375795cf9d85094 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 1 Aug 2020 01:15:48 +0800 Subject: [PATCH 6/6] kernel: bump 4.19 to 4.19.136 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- .../linux/ath79/patches-4.19/910-unaligned_access_hacks.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index a552cbcba7..a861efe9c9 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .232 LINUX_VERSION-4.14 = .191 -LINUX_VERSION-4.19 = .135 +LINUX_VERSION-4.19 = .136 LINUX_KERNEL_HASH-4.9.232 = 58f472e82345dc719a1d6d7bae01e5aa73387cd83308acd2c92371f7d5bc4f60 LINUX_KERNEL_HASH-4.14.191 = 53823ed386c370b6ae0576c14be33b6e17067230406e49da16f1315f7d0df671 -LINUX_KERNEL_HASH-4.19.135 = 33d7cecaa6258233881d2a5ecf25d40134639da5b1d497222eb1cbed9e32af98 +LINUX_KERNEL_HASH-4.19.136 = 91f93b432db62a0e2c71b0764eb2b099027b2ba2f331f4fb982db2524dd6163e remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index 3dbbfdccb8..cb182b5f11 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -728,7 +728,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3906,14 +3906,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3907,14 +3907,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1);