fix 22.03 build, totally untested

README.md

@@ -22,9 +22,9 @@ Automated builds of OpenWrt for FriendlyARM NanoPi R2S & R4S boards
 - Full build with LuCI, docker and extra packages
 - vpn-routing-policy latest version from https://github.com/stangri/source.openwrt.melmac.net
 
-## OpenWrt branch 22.03 (experimental)
+## OpenWrt branch 22.03 (WIP experimental)
 
-### Downloads [Releases master](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=m22.03&expanded=true)
+### Downloads [Releases 22.03](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=m22.03&expanded=true)
 
 ### Configuration
 - OpenWRT master Vanilla / Kernel 5.10

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

@@ -17,7 +17,7 @@ define Device/friendlyarm_nanopi-r2s
   DEVICE_MODEL := NanoPi R2S
   SOC := rk3328
   UBOOT_DEVICE_NAME := nanopi-r2s-rk3328
-  IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata
+  IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-img | gzip | append-metadata
   DEVICE_PACKAGES := kmod-usb-net-rtl8152
 endef
 TARGET_DEVICES += friendlyarm_nanopi-r2s
@@ -27,7 +27,7 @@ define Device/friendlyarm_nanopi-r4s
   DEVICE_MODEL := NanoPi R4S
   SOC := rk3399
   UBOOT_DEVICE_NAME := nanopi-r4s-rk3399
-  IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata
+  IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-img | gzip | append-metadata
   DEVICE_PACKAGES := kmod-r8168 -urngd
 endef
 TARGET_DEVICES += friendlyarm_nanopi-r4s

openwrt-22.03/release-info.md

@@ -1,4 +1,9 @@
-## OpenWrt branch 22.03 (experimental)
+## OpenWrt branch 22.03 (experimental WIP)
+
+### Warning
+- Fully experimental build, still WIP.
+- R2S / R4S patches will be reviwed if still needed
+- Goal is to get rid of iptables if possible.
 
 ### Configuration
 - OpenWRT 22.03 Vanilla / Kernel 5.10
@@ -9,5 +14,5 @@
 - A useful set of applications from official OpenWrt package feed
 - Mini build without UI
 - Full build with LuCI, docker and extra packages
-- firewall4 based (nftables) + iptables compatibility packages
+- firewall4 based (nftables) + iptables compatibility packages for now, might change later.
 - pbr latest version from https://github.com/stangri/source.openwrt.melmac.netkage

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

@@ -155,36 +155,22 @@ CONFIG_PACKAGE_iftop=y
 CONFIG_PACKAGE_igmpproxy=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_ip-tiny=y
-CONFIG_PACKAGE_ip6tables-extra=y
-CONFIG_PACKAGE_ip6tables-mod-nat=y
+CONFIG_PACKAGE_ip6tables-nft=y
 CONFIG_PACKAGE_iperf=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables-legacy=y
-CONFIG_PACKAGE_iptables-mod-cluster=y
-CONFIG_PACKAGE_iptables-mod-clusterip=y
-CONFIG_PACKAGE_iptables-mod-condition=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-extra=y
 CONFIG_PACKAGE_iptables-mod-iface=y
 CONFIG_PACKAGE_iptables-mod-ipmark=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
-CONFIG_PACKAGE_iptables-mod-iprange=y
 CONFIG_PACKAGE_iptables-mod-ipsec=y
-CONFIG_PACKAGE_iptables-mod-length2=y
-CONFIG_PACKAGE_iptables-mod-logmark=y
-CONFIG_PACKAGE_iptables-mod-nat-extra=y
-CONFIG_PACKAGE_iptables-mod-nflog=y
-CONFIG_PACKAGE_iptables-mod-nfqueue=y
 CONFIG_PACKAGE_iptables-mod-physdev=y
 CONFIG_PACKAGE_iptables-mod-proto=y
-CONFIG_PACKAGE_iptables-mod-rpfilter=y
-CONFIG_PACKAGE_iptables-mod-tproxy=y
-CONFIG_PACKAGE_iptables-mod-u32=y
 CONFIG_PACKAGE_iw=y
 CONFIG_PACKAGE_iwinfo=y
 CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_kmod-arptables=y
 CONFIG_PACKAGE_kmod-backlight=y
 CONFIG_PACKAGE_kmod-backlight-pwm=y
 CONFIG_PACKAGE_kmod-br-netfilter=y
@@ -229,7 +215,6 @@ CONFIG_PACKAGE_kmod-drm=y
 CONFIG_PACKAGE_kmod-drm-kms-helper=y
 CONFIG_PACKAGE_kmod-drm-rockchip=y
 CONFIG_PACKAGE_kmod-dummy=y
-CONFIG_PACKAGE_kmod-ebtables=y
 CONFIG_PACKAGE_kmod-fb=y
 CONFIG_PACKAGE_kmod-fb-cfb-copyarea=y
 CONFIG_PACKAGE_kmod-fb-cfb-fillrect=y
@@ -251,40 +236,24 @@ CONFIG_PACKAGE_kmod-ip-vti=y
 CONFIG_PACKAGE_kmod-ip6-tunnel=y
 CONFIG_PACKAGE_kmod-ip6-vti=y
 CONFIG_PACKAGE_kmod-ip6tables=y
-CONFIG_PACKAGE_kmod-ip6tables-extra=y
 CONFIG_PACKAGE_kmod-ipsec=y
 CONFIG_PACKAGE_kmod-ipsec4=y
 CONFIG_PACKAGE_kmod-ipsec6=y
-CONFIG_PACKAGE_kmod-ipt-cluster=y
-CONFIG_PACKAGE_kmod-ipt-clusterip=y
 CONFIG_PACKAGE_kmod-ipt-compat-xtables=y
-CONFIG_PACKAGE_kmod-ipt-condition=y
 CONFIG_PACKAGE_kmod-ipt-conntrack=y
 CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
-CONFIG_PACKAGE_kmod-ipt-conntrack-label=y
 CONFIG_PACKAGE_kmod-ipt-core=y
 CONFIG_PACKAGE_kmod-ipt-extra=y
 CONFIG_PACKAGE_kmod-ipt-iface=y
 CONFIG_PACKAGE_kmod-ipt-ipmark=y
 CONFIG_PACKAGE_kmod-ipt-ipopt=y
-CONFIG_PACKAGE_kmod-ipt-iprange=y
 CONFIG_PACKAGE_kmod-ipt-ipsec=y
 CONFIG_PACKAGE_kmod-ipt-ipset=y
-CONFIG_PACKAGE_kmod-ipt-ipv4options=y
-CONFIG_PACKAGE_kmod-ipt-length2=y
-CONFIG_PACKAGE_kmod-ipt-logmark=y
 CONFIG_PACKAGE_kmod-ipt-nat=y
 CONFIG_PACKAGE_kmod-ipt-nat-extra=y
-CONFIG_PACKAGE_kmod-ipt-nat6=y
-CONFIG_PACKAGE_kmod-ipt-nflog=y
-CONFIG_PACKAGE_kmod-ipt-nfqueue=y
 CONFIG_PACKAGE_kmod-ipt-physdev=y
 CONFIG_PACKAGE_kmod-ipt-proto=y
 CONFIG_PACKAGE_kmod-ipt-raw=y
-CONFIG_PACKAGE_kmod-ipt-raw6=y
-CONFIG_PACKAGE_kmod-ipt-rpfilter=y
-CONFIG_PACKAGE_kmod-ipt-tproxy=y
-CONFIG_PACKAGE_kmod-ipt-u32=y
 CONFIG_PACKAGE_kmod-iptunnel=y
 CONFIG_PACKAGE_kmod-iptunnel4=y
 CONFIG_PACKAGE_kmod-iptunnel6=y
@@ -310,6 +279,7 @@ CONFIG_PACKAGE_kmod-nf-tproxy=y
 CONFIG_PACKAGE_kmod-nfnetlink-log=y
 CONFIG_PACKAGE_kmod-nfnetlink-queue=y
 CONFIG_PACKAGE_kmod-nft-bridge=y
+CONFIG_PACKAGE_kmod-nft-compat=y
 CONFIG_PACKAGE_kmod-nft-queue=y
 CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-nls-cp437=y
@@ -366,6 +336,7 @@ CONFIG_PACKAGE_libip4tc=y
 CONFIG_PACKAGE_libip6tc=y
 CONFIG_PACKAGE_libipset=y
 CONFIG_PACKAGE_libiptext=y
+CONFIG_PACKAGE_libiptext-nft=y
 CONFIG_PACKAGE_libiptext6=y
 CONFIG_PACKAGE_libiwinfo=y
 CONFIG_PACKAGE_libiwinfo-data=y
@@ -428,6 +399,7 @@ CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-ntpc=y
 CONFIG_PACKAGE_luci-app-openvpn=y
 CONFIG_PACKAGE_luci-app-opkg=y
+CONFIG_PACKAGE_luci-app-pbr=y
 CONFIG_PACKAGE_luci-app-qos=y
 CONFIG_PACKAGE_luci-app-sqm=y
 CONFIG_PACKAGE_luci-app-statistics=y
@@ -477,6 +449,7 @@ CONFIG_PACKAGE_nstat=y
 CONFIG_PACKAGE_ntpclient=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_PACKAGE_openvpn-openssl=y
+CONFIG_PACKAGE_pbr-ipt=y
 CONFIG_PACKAGE_picocom=y
 CONFIG_PACKAGE_qos-scripts=y
 CONFIG_PACKAGE_r8152-firmware=y
@@ -504,11 +477,11 @@ CONFIG_PACKAGE_tinyproxy=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
 CONFIG_PACKAGE_urngd=y
-CONFIG_PACKAGE_vpn-policy-routing=y
 CONFIG_PACKAGE_wget-ssl=y
 CONFIG_PACKAGE_wireguard-tools=y
 CONFIG_PACKAGE_wireless-regdb=y
 CONFIG_PACKAGE_xtables-legacy=y
+CONFIG_PACKAGE_xtables-nft=y
 CONFIG_PACKAGE_zlib=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y

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

@@ -131,33 +131,21 @@ CONFIG_PACKAGE_igmpproxy=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_ip-tiny=y
 CONFIG_PACKAGE_ip6tables-extra=y
+CONFIG_PACKAGE_ip6tables-legacy=y
 CONFIG_PACKAGE_ip6tables-mod-nat=y
+CONFIG_PACKAGE_ip6tables-nft=y
 CONFIG_PACKAGE_iperf=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables-legacy=y
-CONFIG_PACKAGE_iptables-mod-cluster=y
-CONFIG_PACKAGE_iptables-mod-clusterip=y
-CONFIG_PACKAGE_iptables-mod-condition=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
-CONFIG_PACKAGE_iptables-mod-extra=y
 CONFIG_PACKAGE_iptables-mod-iface=y
 CONFIG_PACKAGE_iptables-mod-ipmark=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
-CONFIG_PACKAGE_iptables-mod-iprange=y
-CONFIG_PACKAGE_iptables-mod-length2=y
-CONFIG_PACKAGE_iptables-mod-logmark=y
-CONFIG_PACKAGE_iptables-mod-nat-extra=y
-CONFIG_PACKAGE_iptables-mod-nflog=y
-CONFIG_PACKAGE_iptables-mod-nfqueue=y
 CONFIG_PACKAGE_iptables-mod-physdev=y
 CONFIG_PACKAGE_iptables-mod-proto=y
 CONFIG_PACKAGE_iptables-mod-rpfilter=y
-CONFIG_PACKAGE_iptables-mod-tproxy=y
-CONFIG_PACKAGE_iptables-mod-u32=y
-CONFIG_PACKAGE_iw=y
 CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_kmod-arptables=y
 CONFIG_PACKAGE_kmod-backlight=y
 CONFIG_PACKAGE_kmod-backlight-pwm=y
 CONFIG_PACKAGE_kmod-br-netfilter=y
@@ -202,7 +190,6 @@ CONFIG_PACKAGE_kmod-drm=y
 CONFIG_PACKAGE_kmod-drm-kms-helper=y
 CONFIG_PACKAGE_kmod-drm-rockchip=y
 CONFIG_PACKAGE_kmod-dummy=y
-CONFIG_PACKAGE_kmod-ebtables=y
 CONFIG_PACKAGE_kmod-fb=y
 CONFIG_PACKAGE_kmod-fb-cfb-copyarea=y
 CONFIG_PACKAGE_kmod-fb-cfb-fillrect=y
@@ -222,35 +209,22 @@ CONFIG_PACKAGE_kmod-ip6-tunnel=y
 CONFIG_PACKAGE_kmod-ip6tables=y
 CONFIG_PACKAGE_kmod-ip6tables-extra=y
 CONFIG_PACKAGE_kmod-ipsec=y
-CONFIG_PACKAGE_kmod-ipt-cluster=y
-CONFIG_PACKAGE_kmod-ipt-clusterip=y
 CONFIG_PACKAGE_kmod-ipt-compat-xtables=y
-CONFIG_PACKAGE_kmod-ipt-condition=y
 CONFIG_PACKAGE_kmod-ipt-conntrack=y
 CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
-CONFIG_PACKAGE_kmod-ipt-conntrack-label=y
 CONFIG_PACKAGE_kmod-ipt-core=y
-CONFIG_PACKAGE_kmod-ipt-extra=y
 CONFIG_PACKAGE_kmod-ipt-iface=y
 CONFIG_PACKAGE_kmod-ipt-ipmark=y
 CONFIG_PACKAGE_kmod-ipt-ipopt=y
-CONFIG_PACKAGE_kmod-ipt-iprange=y
 CONFIG_PACKAGE_kmod-ipt-ipset=y
-CONFIG_PACKAGE_kmod-ipt-ipv4options=y
-CONFIG_PACKAGE_kmod-ipt-length2=y
-CONFIG_PACKAGE_kmod-ipt-logmark=y
 CONFIG_PACKAGE_kmod-ipt-nat=y
 CONFIG_PACKAGE_kmod-ipt-nat-extra=y
 CONFIG_PACKAGE_kmod-ipt-nat6=y
-CONFIG_PACKAGE_kmod-ipt-nflog=y
-CONFIG_PACKAGE_kmod-ipt-nfqueue=y
 CONFIG_PACKAGE_kmod-ipt-physdev=y
 CONFIG_PACKAGE_kmod-ipt-proto=y
 CONFIG_PACKAGE_kmod-ipt-raw=y
 CONFIG_PACKAGE_kmod-ipt-raw6=y
 CONFIG_PACKAGE_kmod-ipt-rpfilter=y
-CONFIG_PACKAGE_kmod-ipt-tproxy=y
-CONFIG_PACKAGE_kmod-ipt-u32=y
 CONFIG_PACKAGE_kmod-iptunnel=y
 CONFIG_PACKAGE_kmod-iptunnel6=y
 CONFIG_PACKAGE_kmod-keys-encrypted=y
@@ -261,6 +235,7 @@ CONFIG_PACKAGE_kmod-lib-zlib-deflate=y
 CONFIG_PACKAGE_kmod-lib-zlib-inflate=y
 CONFIG_PACKAGE_kmod-lib-zstd=y
 CONFIG_PACKAGE_kmod-libphy=y
+CONFIG_PACKAGE_kmod-mii=y
 CONFIG_PACKAGE_kmod-multimedia-input=y
 CONFIG_PACKAGE_kmod-nf-conntrack-netlink=y
 CONFIG_PACKAGE_kmod-nf-ipt=y
@@ -271,6 +246,7 @@ CONFIG_PACKAGE_kmod-nf-tproxy=y
 CONFIG_PACKAGE_kmod-nfnetlink-log=y
 CONFIG_PACKAGE_kmod-nfnetlink-queue=y
 CONFIG_PACKAGE_kmod-nft-bridge=y
+CONFIG_PACKAGE_kmod-nft-compat=y
 CONFIG_PACKAGE_kmod-nft-queue=y
 CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-nls-cp437=y
@@ -294,6 +270,10 @@ CONFIG_PACKAGE_kmod-usb-dwc2=y
 CONFIG_PACKAGE_kmod-usb-dwc3=y
 CONFIG_PACKAGE_kmod-usb-ehci=y
 CONFIG_PACKAGE_kmod-usb-gadget=y
+CONFIG_PACKAGE_kmod-usb-net=y
+CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y
+CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y
+CONFIG_PACKAGE_kmod-usb-net-rtl8152=y
 CONFIG_PACKAGE_kmod-usb-roles=y
 CONFIG_PACKAGE_kmod-usb-xhci-hcd=y
 CONFIG_PACKAGE_kmod-usb2=y
@@ -318,6 +298,7 @@ CONFIG_PACKAGE_libip4tc=y
 CONFIG_PACKAGE_libip6tc=y
 CONFIG_PACKAGE_libipset=y
 CONFIG_PACKAGE_libiptext=y
+CONFIG_PACKAGE_libiptext-nft=y
 CONFIG_PACKAGE_libiptext6=y
 CONFIG_PACKAGE_libiwinfo=y
 CONFIG_PACKAGE_libiwinfo-data=y
@@ -368,9 +349,11 @@ CONFIG_PACKAGE_nstat=y
 CONFIG_PACKAGE_ntpclient=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_PACKAGE_openvpn-openssl=y
+CONFIG_PACKAGE_pbr-ipt=y
 CONFIG_PACKAGE_picocom=y
 # CONFIG_PACKAGE_ppp is not set
 CONFIG_PACKAGE_qos-scripts=y
+CONFIG_PACKAGE_r8152-firmware=y
 CONFIG_PACKAGE_r8169-firmware=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rng-tools=y
@@ -392,11 +375,12 @@ CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_tinyproxy=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
-CONFIG_PACKAGE_vpn-policy-routing=y
+CONFIG_PACKAGE_urngd=y
 CONFIG_PACKAGE_wget-ssl=y
 CONFIG_PACKAGE_wireguard-tools=y
 CONFIG_PACKAGE_wireless-regdb=y
 CONFIG_PACKAGE_xtables-legacy=y
+CONFIG_PACKAGE_xtables-nft=y
 CONFIG_PACKAGE_zlib=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y

openwrt-22.03/steps/03_patch_openwrt.sh

@@ -79,6 +79,24 @@ else
    echo "Already added $ADDON_PATH to $ADDON_DEST"
 fi
 
+# revert to fresh config
+cp $BUILDDIR/openwrt-fresh-$OPENWRT_SUFFIX/target/linux/generic/config-5.10 target/linux/generic/config-5.10
+# reset and fix missing generic config symbols (TODO check why this is needed)
+echo "# CONFIG_IR_SANYO_DECODER is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_SHARP_DECODER is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_MCE_KBD_DECODER is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_XMP_DECODER is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_IMON_DECODER is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_RCMM_DECODER is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_SPI is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_GPIO_TX is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_PWM_TX is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_SERIAL is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_SIR is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_RC_XBOX_DVD is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_IR_TOY is not set" >> target/linux/generic/config-5.10
+echo "# CONFIG_MEDIA_CEC_RC is not set" >> target/linux/generic/config-5.10
+
 #cleanup
 if [ -e .config ]; then
    echo "Cleaning up ..."