Skip to content

Commit 902d410

Browse files
anaelorlinskianaelorlinski
committed
add/replace acme/adblock with uacme/adguardhome
1 parent f6bea11 commit 902d410

File tree

6 files changed

+233
-16
lines changed

6 files changed

+233
-16
lines changed

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,13 @@ Automated builds of OpenWrt for FriendlyARM NanoPi R2S & R4S boards
3838

3939

4040
## Changelog
41+
#### 2022-04-30
42+
- (21.02) Remove acme/adblock in favor of uacme/adguardhome (mini)
43+
- (21.02) Add uacme/adguardhome (full)
44+
#### 2022-04-28
45+
- (22.03) Add NanoPi R2C support
4146
#### 2022-04-12
42-
- Add NanoPi R2C in uboot and branch 21.02
47+
- (21.02) Add NanoPi R2C support
4348
#### 2022-03-28
4449
- Add branch 22.03
4550
#### 2022-02-12

‎openwrt-21.02/patches/node/010-execvp-arg-list-too-long.patch‎

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
2+
+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
3+
@@ -151,6 +151,32 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOL
4+
quiet_cmd_link = LINK($(TOOLSET)) $@
5+
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
6+
7+
+define xargs
8+
+ $(1) $(wordlist 1,100,$(2))
9+
+ $(if $(word 101,$(2)),$(call xargs,$(1),$(wordlist 101,$(words $(2)),$(2))))
10+
+endef
11+
+
12+
+define write-to-file
13+
+ @echo >$(1)
14+
+ $(call xargs,printf "%s\\n" >>$(1),$(2))
15+
+endef
16+
+
17+
+OBJ_FILE_LIST_SFX := ar-file-list
18+
+
19+
+define create_archive
20+
+ $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
21+
+ rm -f $(1) $(1).$(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
22+
+ $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
23+
+ $(AR.$(TOOLSET)) crs $(1) @$(1).$(OBJ_FILE_LIST)
24+
+endef
25+
+
26+
+define create_thin_archive
27+
+ $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
28+
+ rm -f $(1) $(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
29+
+ $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
30+
+ $(AR.$(TOOLSET)) crsT $(1) @$(1).$(OBJ_FILE_LIST)
31+
+endef
32+
+
33+
# We support two kinds of shared objects (.so):
34+
# 1) shared_library, which is just bundling together many dependent libraries
35+
# into a link line.
36+
@@ -195,6 +221,32 @@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET))
37+
quiet_cmd_alink_thin = AR($(TOOLSET)) $@
38+
cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
39+
40+
+define xargs
41+
+ $(1) $(wordlist 1,100,$(2))
42+
+ $(if $(word 101,$(2)),$(call xargs,$(1),$(wordlist 101,$(words $(2)),$(2))))
43+
+endef
44+
+
45+
+define write-to-file
46+
+ @echo >$(1)
47+
+ $(call xargs,printf "%s\\n" >>$(1),$(2))
48+
+endef
49+
+
50+
+OBJ_FILE_LIST_SFX := ar-file-list
51+
+
52+
+define create_archive
53+
+ $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
54+
+ rm -f $(1) $(1).$(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
55+
+ $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
56+
+ $(AR.$(TOOLSET)) crs $(1) @$(1).$(OBJ_FILE_LIST)
57+
+endef
58+
+
59+
+define create_thin_archive
60+
+ $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
61+
+ rm -f $(1) $(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
62+
+ $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
63+
+ $(AR.$(TOOLSET)) crsT $(1) @$(1).$(OBJ_FILE_LIST)
64+
+endef
65+
+
66+
# Due to circular dependencies between libraries :(, we wrap the
67+
# special "figure out circular dependencies" flags around the entire
68+
# input list during linking.
69+
@@ -1612,11 +1664,17 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
70+
"Spaces in alink input filenames not supported (%s)" % link_dep)
71+
if (self.flavor not in ('mac', 'openbsd', 'netbsd', 'win') and not
72+
self.is_standalone_static_library):
73+
- self.WriteDoCmd([self.output_binary], link_deps, 'alink_thin',
74+
- part_of_all, postbuilds=postbuilds)
75+
+ if self.flavor in ('linux', 'android'):
76+
+ self.WriteMakeRule([self.output_binary], link_deps, actions = ['$(call create_thin_archive,$@,$^)'])
77+
+ else:
78+
+ self.WriteDoCmd([self.output_binary], link_deps, 'alink_thin',
79+
+ part_of_all, postbuilds=postbuilds)
80+
else:
81+
- self.WriteDoCmd([self.output_binary], link_deps, 'alink', part_of_all,
82+
- postbuilds=postbuilds)
83+
+ if self.flavor in ('linux', 'android'):
84+
+ self.WriteMakeRule([self.output_binary], link_deps, actions = ['$(call create_archive,$@,$^)'])
85+
+ else:
86+
+ self.WriteDoCmd([self.output_binary], link_deps, 'alink', part_of_all,
87+
+ postbuilds=postbuilds)
88+
elif self.type == 'shared_library':
89+
self.WriteLn('%s: LD_INPUTS := %s' % (
90+
QuoteSpaces(self.output_binary),
91+
--- a/tools/gyp/pylib/gyp/generator/make.py
92+
+++ b/tools/gyp/pylib/gyp/generator/make.py
93+
@@ -155,6 +155,32 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOL
94+
quiet_cmd_link = LINK($(TOOLSET)) $@
95+
cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
96+
97+
+define xargs
98+
+ $(1) $(wordlist 1,100,$(2))
99+
+ $(if $(word 101,$(2)),$(call xargs,$(1),$(wordlist 101,$(words $(2)),$(2))))
100+
+endef
101+
+
102+
+define write-to-file
103+
+ @echo >$(1)
104+
+ $(call xargs,printf "%s\\n" >>$(1),$(2))
105+
+endef
106+
+
107+
+OBJ_FILE_LIST_SFX := ar-file-list
108+
+
109+
+define create_archive
110+
+ $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
111+
+ rm -f $(1) $(1).$(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
112+
+ $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
113+
+ $(AR.$(TOOLSET)) crs $(1) @$(1).$(OBJ_FILE_LIST)
114+
+endef
115+
+
116+
+define create_thin_archive
117+
+ $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
118+
+ rm -f $(1) $(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
119+
+ $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
120+
+ $(AR.$(TOOLSET)) crsT $(1) @$(1).$(OBJ_FILE_LIST)
121+
+endef
122+
+
123+
# We support two kinds of shared objects (.so):
124+
# 1) shared_library, which is just bundling together many dependent libraries
125+
# into a link line.
126+
@@ -199,6 +225,32 @@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET))
127+
quiet_cmd_alink_thin = AR($(TOOLSET)) $@
128+
cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
129+
130+
+define xargs
131+
+ $(1) $(wordlist 1,100,$(2))
132+
+ $(if $(word 101,$(2)),$(call xargs,$(1),$(wordlist 101,$(words $(2)),$(2))))
133+
+endef
134+
+
135+
+define write-to-file
136+
+ @echo >$(1)
137+
+ $(call xargs,printf "%s\\n" >>$(1),$(2))
138+
+endef
139+
+
140+
+OBJ_FILE_LIST_SFX := ar-file-list
141+
+
142+
+define create_archive
143+
+ $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
144+
+ rm -f $(1) $(1).$(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
145+
+ $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
146+
+ $(AR.$(TOOLSET)) crs $(1) @$(1).$(OBJ_FILE_LIST)
147+
+endef
148+
+
149+
+define create_thin_archive
150+
+ $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
151+
+ rm -f $(1) $(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
152+
+ $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
153+
+ $(AR.$(TOOLSET)) crsT $(1) @$(1).$(OBJ_FILE_LIST)
154+
+endef
155+
+
156+
# Due to circular dependencies between libraries :(, we wrap the
157+
# special "figure out circular dependencies" flags around the entire
158+
# input list during linking.
159+
@@ -1766,21 +1818,35 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
160+
self.flavor not in ("mac", "openbsd", "netbsd", "win")
161+
and not self.is_standalone_static_library
162+
):
163+
- self.WriteDoCmd(
164+
- [self.output_binary],
165+
- link_deps,
166+
- "alink_thin",
167+
- part_of_all,
168+
- postbuilds=postbuilds,
169+
- )
170+
+ if self.flavor in ('linux', 'android'):
171+
+ self.WriteMakeRule(
172+
+ [self.output_binary],
173+
+ link_deps,
174+
+ actions = ['$(call create_thin_archive,$@,$^)']
175+
+ )
176+
+ else:
177+
+ self.WriteDoCmd(
178+
+ [self.output_binary],
179+
+ link_deps,
180+
+ 'alink_thin',
181+
+ part_of_all,
182+
+ postbuilds=postbuilds
183+
+ )
184+
else:
185+
- self.WriteDoCmd(
186+
- [self.output_binary],
187+
- link_deps,
188+
- "alink",
189+
- part_of_all,
190+
- postbuilds=postbuilds,
191+
- )
192+
+ if self.flavor in ('linux', 'android'):
193+
+ self.WriteMakeRule(
194+
+ [self.output_binary],
195+
+ link_deps,
196+
+ actions = ['$(call create_archive,$@,$^)']
197+
+ )
198+
+ else:
199+
+ self.WriteDoCmd(
200+
+ [self.output_binary],
201+
+ link_deps,
202+
+ 'alink',
203+
+ part_of_all,
204+
+ postbuilds=postbuilds
205+
+ )
206+
elif self.type == "shared_library":
207+
self.WriteLn(
208+
"%s: LD_INPUTS := %s"

‎openwrt-21.02/release-info.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
- vpn-routing-policy latest version from https://github.com/stangri/source.openwrt.melmac.net
1414

1515
### Changelog
16-
- Add losetup, cfdisk in builds. Fix issue #11 : Check docs/resize-f2fs.md how to resize.
17-
- Branch 21.02 : use gcc 10.2
18-
- Optimized builds for devices R4S:-mcpu=cortex-a72.cortex-a53+crypto+crc R2S:-mcpu=cortex-a53+crypto+crc
16+
- Remove acme/adblock in favor of uacme/adguardhome (mini)
17+
- Add uacme/adguardhome (full)

‎openwrt-21.02/seed/ao-R4S-full.seed‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ CONFIG_KERNEL_PROC_PID_CPUSET=y
4343
CONFIG_KERNEL_TRANSPARENT_HUGEPAGE=y
4444
CONFIG_KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS=y
4545
CONFIG_LIBCURL_COOKIES=y
46+
CONFIG_LIBCURL_CRYPTO_AUTH=y
4647
CONFIG_LIBCURL_FILE=y
4748
CONFIG_LIBCURL_FTP=y
4849
CONFIG_LIBCURL_HTTP=y
4950
CONFIG_LIBCURL_NGHTTP2=y
50-
CONFIG_LIBCURL_NO_SMB="!"
51+
CONFIG_LIBCURL_OPENSSL=y
5152
CONFIG_LIBCURL_PROXY=y
52-
CONFIG_LIBCURL_WOLFSSL=y
5353
CONFIG_LUCI_LANG_en=y
5454
CONFIG_OPENSSL_ENGINE=y
5555
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
@@ -70,9 +70,8 @@ CONFIG_OPENVPN_openssl_ENABLE_MULTIHOME=y
7070
CONFIG_OPENVPN_openssl_ENABLE_PF=y
7171
CONFIG_OPENVPN_openssl_ENABLE_PORT_SHARE=y
7272
CONFIG_OPENVPN_openssl_ENABLE_SMALL=y
73-
CONFIG_PACKAGE_acme=y
74-
CONFIG_PACKAGE_acme-dnsapi=y
7573
CONFIG_PACKAGE_adblock=y
74+
CONFIG_PACKAGE_adguardhome=y
7675
CONFIG_PACKAGE_alsa-lib=y
7776
CONFIG_PACKAGE_alsa-ucm-conf=y
7877
CONFIG_PACKAGE_alsa-utils=y
@@ -414,7 +413,6 @@ CONFIG_PACKAGE_losetup=y
414413
CONFIG_PACKAGE_lua=y
415414
CONFIG_PACKAGE_luci=y
416415
CONFIG_PACKAGE_luci-app-acl=y
417-
CONFIG_PACKAGE_luci-app-acme=y
418416
CONFIG_PACKAGE_luci-app-adblock=y
419417
CONFIG_PACKAGE_luci-app-banip=y
420418
CONFIG_PACKAGE_luci-app-commands=y
@@ -430,7 +428,6 @@ CONFIG_PACKAGE_luci-app-tinyproxy=y
430428
CONFIG_PACKAGE_luci-base=y
431429
CONFIG_PACKAGE_luci-compat=y
432430
CONFIG_PACKAGE_luci-i18n-acl-en=y
433-
CONFIG_PACKAGE_luci-i18n-acme-en=y
434431
CONFIG_PACKAGE_luci-i18n-adblock-en=y
435432
CONFIG_PACKAGE_luci-i18n-banip-en=y
436433
CONFIG_PACKAGE_luci-i18n-base-en=y
@@ -495,6 +492,7 @@ CONFIG_PACKAGE_tc-tiny=y
495492
CONFIG_PACKAGE_tcpdump=y
496493
CONFIG_PACKAGE_tini=y
497494
CONFIG_PACKAGE_tinyproxy=y
495+
CONFIG_PACKAGE_uacme=y
498496
CONFIG_PACKAGE_uclibcxx=y
499497
CONFIG_PACKAGE_uhttpd=y
500498
CONFIG_PACKAGE_uhttpd-mod-ubus=y

‎openwrt-21.02/seed/ao-R4S-mini.seed‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ CONFIG_KERNEL_PERF_EVENTS=y
2828
CONFIG_KERNEL_TRANSPARENT_HUGEPAGE=y
2929
CONFIG_KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS=y
3030
CONFIG_LIBCURL_COOKIES=y
31+
CONFIG_LIBCURL_CRYPTO_AUTH=y
3132
CONFIG_LIBCURL_FILE=y
3233
CONFIG_LIBCURL_FTP=y
3334
CONFIG_LIBCURL_HTTP=y
3435
CONFIG_LIBCURL_NGHTTP2=y
35-
CONFIG_LIBCURL_NO_SMB="!"
36+
CONFIG_LIBCURL_OPENSSL=y
3637
CONFIG_LIBCURL_PROXY=y
37-
CONFIG_LIBCURL_WOLFSSL=y
3838
CONFIG_LUCI_LANG_en=y
3939
CONFIG_OPENSSL_ENGINE=y
4040
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
@@ -55,9 +55,7 @@ CONFIG_OPENVPN_openssl_ENABLE_MULTIHOME=y
5555
CONFIG_OPENVPN_openssl_ENABLE_PF=y
5656
CONFIG_OPENVPN_openssl_ENABLE_PORT_SHARE=y
5757
CONFIG_OPENVPN_openssl_ENABLE_SMALL=y
58-
CONFIG_PACKAGE_acme=y
59-
CONFIG_PACKAGE_acme-dnsapi=y
60-
CONFIG_PACKAGE_adblock=y
58+
CONFIG_PACKAGE_adguardhome=y
6159
CONFIG_PACKAGE_alsa-lib=y
6260
CONFIG_PACKAGE_alsa-ucm-conf=y
6361
CONFIG_PACKAGE_alsa-utils=y
@@ -156,7 +154,6 @@ CONFIG_PACKAGE_iptables-mod-proto=y
156154
CONFIG_PACKAGE_iptables-mod-rpfilter=y
157155
CONFIG_PACKAGE_iptables-mod-tproxy=y
158156
CONFIG_PACKAGE_iptables-mod-u32=y
159-
CONFIG_PACKAGE_iw=y
160157
CONFIG_PACKAGE_jq=y
161158
CONFIG_PACKAGE_kmod-arptables=y
162159
CONFIG_PACKAGE_kmod-backlight=y
@@ -388,6 +385,7 @@ CONFIG_PACKAGE_tc-mod-iptables=y
388385
CONFIG_PACKAGE_tc-tiny=y
389386
CONFIG_PACKAGE_tcpdump=y
390387
CONFIG_PACKAGE_tinyproxy=y
388+
CONFIG_PACKAGE_uacme=y
391389
CONFIG_PACKAGE_uclibcxx=y
392390
CONFIG_PACKAGE_uhttpd=y
393391
CONFIG_PACKAGE_uhttpd-mod-ubus=y

‎openwrt-21.02/steps/04-prepare_package.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,20 @@ cd openwrt
2525
# replace vpn routing packages
2626
rm -rf feeds/packages/net/vpn-policy-routing/
2727
cp -R ../stangri_repo/vpn-policy-routing feeds/packages/net/
28+
rm -rf feeds/luci/applications/luci-app-vpn-policy-routing
29+
cp -R ../stangri_repo/luci-app-vpn-policy-routing feeds/luci/applications/
30+
31+
# add pbr
32+
cp -R ../stangri_repo/pbr feeds/packages/net/
33+
cp -R ../stangri_repo/luci-app-pbr feeds/luci/applications/
2834

2935
# this does not work
3036
#./scripts/feeds uninstall luci-app-vpn-policy-routing
3137
#./scripts/feeds install -p stangri_repo luci-app-vpn-policy-routing
3238

39+
# copy patch for nodejs not building
40+
cp $ROOTDIR/openwrt-21.02/patches/node/010-execvp-arg-list-too-long.patch feeds/packages/lang/node/patches/
41+
3342
# Time stamp with $Build_Date=$(date +%Y.%m.%d)
3443
MANUAL_DATE="$(date +%Y.%m.%d) (manual build)"
3544
BUILD_STRING=${BUILD_STRING:-$MANUAL_DATE}

0 commit comments

Comments
 (0)