Skip to content

Commit f6bea11

Browse files
anaelorlinskianaelorlinski
committed
use iptables-nft variant / fix R2C
1 parent c3f5231 commit f6bea11

4 files changed

Lines changed: 23 additions & 53 deletions

File tree

‎openwrt-22.03/patches/immortalwrt/target/linux/rockchip/image/armv8.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ define Device/friendlyarm_nanopi-r2c
77
DEVICE_MODEL := NanoPi R2C
88
SOC := rk3328
99
UBOOT_DEVICE_NAME := nanopi-r2c-rk3328
10-
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata
10+
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-img | gzip | append-metadata
1111
DEVICE_PACKAGES := kmod-usb-net-rtl8152
1212
endef
1313
TARGET_DEVICES += friendlyarm_nanopi-r2c

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

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ CONFIG_DOCKER_OPTIONAL_FEATURES=y
1414
CONFIG_DOCKER_STO_BTRFS=y
1515
CONFIG_DOCKER_STO_EXT4=y
1616
CONFIG_EXPERIMENTAL=y
17-
CONFIG_GCC_USE_VERSION_10=y
18-
# CONFIG_GCC_USE_VERSION_11 is not set
19-
CONFIG_GCC_VERSION="10.3.0"
20-
CONFIG_GCC_VERSION_10=y
2117
CONFIG_IFSTAT_SNMP=y
2218
CONFIG_IPERF_ENABLE_MULTICAST=y
2319
CONFIG_KERNEL_ARM_PMU=y
@@ -54,6 +50,7 @@ CONFIG_LIBCURL_WOLFSSL=y
5450
CONFIG_LUCI_LANG_en=y
5551
CONFIG_OPENSSL_ENGINE=y
5652
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
53+
CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
5754
CONFIG_OPENSSL_WITH_ASM=y
5855
CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
5956
CONFIG_OPENSSL_WITH_CMS=y
@@ -77,8 +74,8 @@ CONFIG_PACKAGE_adblock=y
7774
CONFIG_PACKAGE_alsa-lib=y
7875
CONFIG_PACKAGE_alsa-ucm-conf=y
7976
CONFIG_PACKAGE_alsa-utils=y
77+
CONFIG_PACKAGE_arptables-nft=y
8078
CONFIG_PACKAGE_avahi-dbus-daemon=y
81-
CONFIG_PACKAGE_banip=y
8279
CONFIG_PACKAGE_bind-check=y
8380
CONFIG_PACKAGE_bind-client=y
8481
CONFIG_PACKAGE_bind-dig=y
@@ -137,12 +134,12 @@ CONFIG_PACKAGE_dnsmasq_full_conntrack=y
137134
CONFIG_PACKAGE_dnsmasq_full_dhcp=y
138135
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
139136
CONFIG_PACKAGE_dnsmasq_full_dnssec=y
140-
CONFIG_PACKAGE_dnsmasq_full_ipset=y
141137
CONFIG_PACKAGE_dnsmasq_full_noid=y
142138
CONFIG_PACKAGE_dnsmasq_full_tftp=y
143139
CONFIG_PACKAGE_docker=y
144140
CONFIG_PACKAGE_dockerd=y
145141
CONFIG_PACKAGE_ds-lite=y
142+
CONFIG_PACKAGE_ebtables-nft=y
146143
CONFIG_PACKAGE_etherwake=y
147144
CONFIG_PACKAGE_f2fs-tools=y
148145
CONFIG_PACKAGE_f2fsck=y
@@ -154,25 +151,18 @@ CONFIG_PACKAGE_ifstat=y
154151
CONFIG_PACKAGE_iftop=y
155152
CONFIG_PACKAGE_igmpproxy=y
156153
CONFIG_PACKAGE_ip-full=y
157-
CONFIG_PACKAGE_ip-tiny=y
158154
CONFIG_PACKAGE_ip6tables-nft=y
159155
CONFIG_PACKAGE_iperf=y
160156
CONFIG_PACKAGE_iperf3=y
161157
CONFIG_PACKAGE_ipset=y
162-
CONFIG_PACKAGE_iptables-legacy=y
163158
CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
164159
CONFIG_PACKAGE_iptables-mod-extra=y
165-
CONFIG_PACKAGE_iptables-mod-iface=y
166-
CONFIG_PACKAGE_iptables-mod-ipmark=y
167160
CONFIG_PACKAGE_iptables-mod-ipopt=y
168161
CONFIG_PACKAGE_iptables-mod-ipsec=y
169-
CONFIG_PACKAGE_iptables-mod-physdev=y
170-
CONFIG_PACKAGE_iptables-mod-proto=y
171-
CONFIG_PACKAGE_iw=y
172-
CONFIG_PACKAGE_iwinfo=y
162+
CONFIG_PACKAGE_iptables-nft=y
173163
CONFIG_PACKAGE_jq=y
164+
CONFIG_PACKAGE_kmod-arptables=y
174165
CONFIG_PACKAGE_kmod-backlight=y
175-
CONFIG_PACKAGE_kmod-backlight-pwm=y
176166
CONFIG_PACKAGE_kmod-br-netfilter=y
177167
CONFIG_PACKAGE_kmod-crypto-acompress=y
178168
CONFIG_PACKAGE_kmod-crypto-aead=y
@@ -215,6 +205,7 @@ CONFIG_PACKAGE_kmod-drm=y
215205
CONFIG_PACKAGE_kmod-drm-kms-helper=y
216206
CONFIG_PACKAGE_kmod-drm-rockchip=y
217207
CONFIG_PACKAGE_kmod-dummy=y
208+
CONFIG_PACKAGE_kmod-ebtables=y
218209
CONFIG_PACKAGE_kmod-fb=y
219210
CONFIG_PACKAGE_kmod-fb-cfb-copyarea=y
220211
CONFIG_PACKAGE_kmod-fb-cfb-fillrect=y
@@ -244,15 +235,9 @@ CONFIG_PACKAGE_kmod-ipt-conntrack=y
244235
CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
245236
CONFIG_PACKAGE_kmod-ipt-core=y
246237
CONFIG_PACKAGE_kmod-ipt-extra=y
247-
CONFIG_PACKAGE_kmod-ipt-iface=y
248-
CONFIG_PACKAGE_kmod-ipt-ipmark=y
249238
CONFIG_PACKAGE_kmod-ipt-ipopt=y
250239
CONFIG_PACKAGE_kmod-ipt-ipsec=y
251240
CONFIG_PACKAGE_kmod-ipt-ipset=y
252-
CONFIG_PACKAGE_kmod-ipt-nat=y
253-
CONFIG_PACKAGE_kmod-ipt-nat-extra=y
254-
CONFIG_PACKAGE_kmod-ipt-physdev=y
255-
CONFIG_PACKAGE_kmod-ipt-proto=y
256241
CONFIG_PACKAGE_kmod-ipt-raw=y
257242
CONFIG_PACKAGE_kmod-iptunnel=y
258243
CONFIG_PACKAGE_kmod-iptunnel4=y
@@ -278,6 +263,7 @@ CONFIG_PACKAGE_kmod-nf-nathelper=y
278263
CONFIG_PACKAGE_kmod-nf-tproxy=y
279264
CONFIG_PACKAGE_kmod-nfnetlink-log=y
280265
CONFIG_PACKAGE_kmod-nfnetlink-queue=y
266+
CONFIG_PACKAGE_kmod-nft-arp=y
281267
CONFIG_PACKAGE_kmod-nft-bridge=y
282268
CONFIG_PACKAGE_kmod-nft-compat=y
283269
CONFIG_PACKAGE_kmod-nft-queue=y
@@ -392,7 +378,6 @@ CONFIG_PACKAGE_luci=y
392378
CONFIG_PACKAGE_luci-app-acl=y
393379
CONFIG_PACKAGE_luci-app-acme=y
394380
CONFIG_PACKAGE_luci-app-adblock=y
395-
CONFIG_PACKAGE_luci-app-banip=y
396381
CONFIG_PACKAGE_luci-app-commands=y
397382
CONFIG_PACKAGE_luci-app-ddns=y
398383
CONFIG_PACKAGE_luci-app-firewall=y
@@ -409,7 +394,6 @@ CONFIG_PACKAGE_luci-compat=y
409394
CONFIG_PACKAGE_luci-i18n-acl-en=y
410395
CONFIG_PACKAGE_luci-i18n-acme-en=y
411396
CONFIG_PACKAGE_luci-i18n-adblock-en=y
412-
CONFIG_PACKAGE_luci-i18n-banip-en=y
413397
CONFIG_PACKAGE_luci-i18n-base-en=y
414398
CONFIG_PACKAGE_luci-i18n-commands-en=y
415399
CONFIG_PACKAGE_luci-i18n-dashboard-en=y
@@ -497,3 +481,4 @@ CONFIG_TARGET_KERNEL_PARTSIZE=40
497481
CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -mcpu=cortex-a72.cortex-a53+crypto+crc"
498482
CONFIG_TARGET_OPTIONS=y
499483
CONFIG_TARGET_ROOTFS_PARTSIZE=1024
484+
# CONFIG_PACKAGE_dnsmasq_full_ipset is not set

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

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ CONFIG_COREMARK_ENABLE_MULTITHREADING=y
88
CONFIG_COREMARK_NUMBER_OF_THREADS=16
99
CONFIG_COREMARK_OPTIMIZE_O3=y
1010
CONFIG_EXPERIMENTAL=y
11-
CONFIG_GCC_USE_VERSION_10=y
12-
# CONFIG_GCC_USE_VERSION_11 is not set
13-
CONFIG_GCC_VERSION="10.3.0"
14-
CONFIG_GCC_VERSION_10=y
1511
CONFIG_IFSTAT_SNMP=y
1612
CONFIG_IPERF_ENABLE_MULTICAST=y
1713
CONFIG_KERNEL_ARM_PMU=y
@@ -39,6 +35,7 @@ CONFIG_LIBCURL_WOLFSSL=y
3935
CONFIG_LUCI_LANG_en=y
4036
CONFIG_OPENSSL_ENGINE=y
4137
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
38+
CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
4239
CONFIG_OPENSSL_WITH_ASM=y
4340
CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
4441
CONFIG_OPENSSL_WITH_CMS=y
@@ -62,8 +59,8 @@ CONFIG_PACKAGE_adblock=y
6259
CONFIG_PACKAGE_alsa-lib=y
6360
CONFIG_PACKAGE_alsa-ucm-conf=y
6461
CONFIG_PACKAGE_alsa-utils=y
62+
CONFIG_PACKAGE_arptables-nft=y
6563
CONFIG_PACKAGE_avahi-dbus-daemon=y
66-
CONFIG_PACKAGE_banip=y
6764
CONFIG_PACKAGE_bind-check=y
6865
CONFIG_PACKAGE_bind-client=y
6966
CONFIG_PACKAGE_bind-dig=y
@@ -115,10 +112,10 @@ CONFIG_PACKAGE_dnsmasq_full_conntrack=y
115112
CONFIG_PACKAGE_dnsmasq_full_dhcp=y
116113
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
117114
CONFIG_PACKAGE_dnsmasq_full_dnssec=y
118-
CONFIG_PACKAGE_dnsmasq_full_ipset=y
119115
CONFIG_PACKAGE_dnsmasq_full_noid=y
120116
CONFIG_PACKAGE_dnsmasq_full_tftp=y
121117
CONFIG_PACKAGE_ds-lite=y
118+
CONFIG_PACKAGE_ebtables-nft=y
122119
CONFIG_PACKAGE_etherwake=y
123120
CONFIG_PACKAGE_f2fs-tools=y
124121
CONFIG_PACKAGE_f2fsck=y
@@ -129,25 +126,16 @@ CONFIG_PACKAGE_ifstat=y
129126
CONFIG_PACKAGE_iftop=y
130127
CONFIG_PACKAGE_igmpproxy=y
131128
CONFIG_PACKAGE_ip-full=y
132-
CONFIG_PACKAGE_ip-tiny=y
133-
CONFIG_PACKAGE_ip6tables-extra=y
134-
CONFIG_PACKAGE_ip6tables-legacy=y
135-
CONFIG_PACKAGE_ip6tables-mod-nat=y
136129
CONFIG_PACKAGE_ip6tables-nft=y
137130
CONFIG_PACKAGE_iperf=y
138131
CONFIG_PACKAGE_iperf3=y
139132
CONFIG_PACKAGE_ipset=y
140-
CONFIG_PACKAGE_iptables-legacy=y
141133
CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
142-
CONFIG_PACKAGE_iptables-mod-iface=y
143-
CONFIG_PACKAGE_iptables-mod-ipmark=y
144134
CONFIG_PACKAGE_iptables-mod-ipopt=y
145-
CONFIG_PACKAGE_iptables-mod-physdev=y
146-
CONFIG_PACKAGE_iptables-mod-proto=y
147-
CONFIG_PACKAGE_iptables-mod-rpfilter=y
135+
CONFIG_PACKAGE_iptables-nft=y
148136
CONFIG_PACKAGE_jq=y
137+
CONFIG_PACKAGE_kmod-arptables=y
149138
CONFIG_PACKAGE_kmod-backlight=y
150-
CONFIG_PACKAGE_kmod-backlight-pwm=y
151139
CONFIG_PACKAGE_kmod-br-netfilter=y
152140
CONFIG_PACKAGE_kmod-crypto-acompress=y
153141
CONFIG_PACKAGE_kmod-crypto-aead=y
@@ -190,6 +178,7 @@ CONFIG_PACKAGE_kmod-drm=y
190178
CONFIG_PACKAGE_kmod-drm-kms-helper=y
191179
CONFIG_PACKAGE_kmod-drm-rockchip=y
192180
CONFIG_PACKAGE_kmod-dummy=y
181+
CONFIG_PACKAGE_kmod-ebtables=y
193182
CONFIG_PACKAGE_kmod-fb=y
194183
CONFIG_PACKAGE_kmod-fb-cfb-copyarea=y
195184
CONFIG_PACKAGE_kmod-fb-cfb-fillrect=y
@@ -207,24 +196,13 @@ CONFIG_PACKAGE_kmod-ikconfig=y
207196
CONFIG_PACKAGE_kmod-input-core=y
208197
CONFIG_PACKAGE_kmod-ip6-tunnel=y
209198
CONFIG_PACKAGE_kmod-ip6tables=y
210-
CONFIG_PACKAGE_kmod-ip6tables-extra=y
211199
CONFIG_PACKAGE_kmod-ipsec=y
212-
CONFIG_PACKAGE_kmod-ipt-compat-xtables=y
213200
CONFIG_PACKAGE_kmod-ipt-conntrack=y
214201
CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
215202
CONFIG_PACKAGE_kmod-ipt-core=y
216-
CONFIG_PACKAGE_kmod-ipt-iface=y
217-
CONFIG_PACKAGE_kmod-ipt-ipmark=y
218203
CONFIG_PACKAGE_kmod-ipt-ipopt=y
219204
CONFIG_PACKAGE_kmod-ipt-ipset=y
220-
CONFIG_PACKAGE_kmod-ipt-nat=y
221-
CONFIG_PACKAGE_kmod-ipt-nat-extra=y
222-
CONFIG_PACKAGE_kmod-ipt-nat6=y
223-
CONFIG_PACKAGE_kmod-ipt-physdev=y
224-
CONFIG_PACKAGE_kmod-ipt-proto=y
225205
CONFIG_PACKAGE_kmod-ipt-raw=y
226-
CONFIG_PACKAGE_kmod-ipt-raw6=y
227-
CONFIG_PACKAGE_kmod-ipt-rpfilter=y
228206
CONFIG_PACKAGE_kmod-iptunnel=y
229207
CONFIG_PACKAGE_kmod-iptunnel6=y
230208
CONFIG_PACKAGE_kmod-keys-encrypted=y
@@ -245,6 +223,7 @@ CONFIG_PACKAGE_kmod-nf-nathelper=y
245223
CONFIG_PACKAGE_kmod-nf-tproxy=y
246224
CONFIG_PACKAGE_kmod-nfnetlink-log=y
247225
CONFIG_PACKAGE_kmod-nfnetlink-queue=y
226+
CONFIG_PACKAGE_kmod-nft-arp=y
248227
CONFIG_PACKAGE_kmod-nft-bridge=y
249228
CONFIG_PACKAGE_kmod-nft-compat=y
250229
CONFIG_PACKAGE_kmod-nft-queue=y
@@ -379,7 +358,6 @@ CONFIG_PACKAGE_urngd=y
379358
CONFIG_PACKAGE_wget-ssl=y
380359
CONFIG_PACKAGE_wireguard-tools=y
381360
CONFIG_PACKAGE_wireless-regdb=y
382-
CONFIG_PACKAGE_xtables-legacy=y
383361
CONFIG_PACKAGE_xtables-nft=y
384362
CONFIG_PACKAGE_zlib=y
385363
CONFIG_PACKAGE_zoneinfo-core=y
@@ -390,3 +368,4 @@ CONFIG_TARGET_KERNEL_PARTSIZE=20
390368
CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -mcpu=cortex-a72.cortex-a53+crypto+crc"
391369
CONFIG_TARGET_OPTIONS=y
392370
CONFIG_TARGET_ROOTFS_PARTSIZE=1024
371+
# CONFIG_PACKAGE_dnsmasq_full_ipset is not set

‎openwrt-22.03/steps/06-create_config_from_seed.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,10 @@ if [[ "$1" == "R2S" ]]; then
2020
sed -i 's/cortex-a72.cortex-a53/cortex-a53/' .config
2121
fi
2222

23+
if [[ "$1" == "R2C" ]]; then
24+
echo "NanoPi R2C model, post patching .config"
25+
sed -i 's/nanopi-r4s/nanopi-r2c/' .config
26+
sed -i 's/cortex-a72.cortex-a53/cortex-a53/' .config
27+
fi
28+
2329
make defconfig

0 commit comments

Comments
 (0)