From 7b0e7492947a7cedacc06cf5e36431e9bc5c964c Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Fri, 22 Apr 2022 12:20:11 -0400
Subject: [PATCH] Tidy up for 22.03.0-rc1

---
 openwrtbuilder |  6 ++--
 profiles       | 95 ++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/openwrtbuilder b/openwrtbuilder
index e0e97a8..7c2c6fd 100755
--- a/openwrtbuilder
+++ b/openwrtbuilder
@@ -6,6 +6,9 @@
 #
 # Apache 2.0 License
 
+# Set default release
+: "${RELEASE:="22.03.0-rc1"}"
+
 printHelp() {
     debug "${FUNCNAME[0]}"
 
@@ -40,7 +43,7 @@ readInput() {
 
     unset RESET
 
-    if _input=$(getopt -o +v:p:i:lb:f:dh -l release:,profile:,info:,list-profiles,builddir:,ssh-upgrade:,ssh-backup:,flash:,reset,debug,help -- "$@"); then
+    if _input=$(getopt -o +r:v:p:i:lb:f:dh -l release:,profile:,info:,list-profiles,builddir:,ssh-upgrade:,ssh-backup:,flash:,reset,debug,help -- "$@"); then
         eval set -- "$_input"
         while true; do
             case "$1" in
@@ -386,7 +389,6 @@ main() {
 
     : "${BUILDDIR:=$SCRIPTDIR}"
     : "${FILESDIR:=$BUILDDIR/files}"
-    : "${RELEASE:="21.02.1"}"
 
     : "${P_ARR[release]:=$RELEASE}"
     : "${P_ARR[source_archive]:=$BUILDDIR/sources/${P_ARR[profile]}-${P_ARR[release]}.tar.xz}"
diff --git a/profiles b/profiles
index 3a8c52c..af0c7d3 100644
--- a/profiles
+++ b/profiles
@@ -76,7 +76,7 @@ r2s['packages']="\
 	ethtool"
 
 declare -Ag r4s
-r4s['release']="snapshot"
+r4s['release']="22.03.0-rc1"
 r4s['profile']="friendlyarm_nanopi-r4s"
 r4s['target']="rockchip/armv8"
 r4s['filesystem']="ext4"
@@ -109,31 +109,56 @@ r4s['repo']="src/gz stangri_repo https://repo.openwrt.melmac.net"
 # 	kmod-ipt-offload"
 
 # fw3 + pbr
-r4s['packages']="\
-	$default_packages \
-	luci-app-upnp \
-	luci-app-wireguard \
-	luci-app-pbr \
-	pbr-ipt \
-	-dnsmasq \
-	dnsmasq-full \
-	luci-app-ddns \
-	luci-app-sqm \
-	luci-app-statistics \
-	collectd-mod-sensors \
-	collectd-mod-thermal \
-	collectd-mod-conntrack \
-	smcroute \
-	curl \
-	ethtool \
-	kmod-ipt-nat6 \
-	-firewall4 \
-	-nftables \
-	-kmod-nft-offload \
-	firewall \
-	ip6tables \
-	iptables \
-	kmod-ipt-offload"
+# r4s['packages']="\
+# 	$default_packages \
+# 	luci-app-upnp \
+# 	luci-app-wireguard \
+# 	luci-app-pbr \
+# 	pbr-ipt \
+# 	-dnsmasq \
+# 	dnsmasq-full \
+# 	luci-app-ddns \
+# 	luci-app-sqm \
+# 	luci-app-statistics \
+# 	collectd-mod-sensors \
+# 	collectd-mod-thermal \
+# 	collectd-mod-conntrack \
+# 	smcroute \
+# 	curl \
+# 	ethtool \
+# 	kmod-ipt-nat6 \
+# 	-firewall4 \
+# 	-nftables \
+# 	-kmod-nft-offload \
+# 	firewall \
+# 	ip6tables \
+# 	iptables \
+# 	kmod-ipt-offload"
+
+# fw3
+# r4s['packages']="\
+# 	$default_packages \
+# 	luci-app-upnp \
+# 	luci-app-wireguard \
+# 	-dnsmasq \
+# 	dnsmasq-full \
+# 	luci-app-ddns \
+# 	luci-app-sqm \
+# 	luci-app-statistics \
+# 	collectd-mod-sensors \
+# 	collectd-mod-thermal \
+# 	collectd-mod-conntrack \
+# 	smcroute \
+# 	curl \
+# 	ethtool \
+# 	kmod-ipt-nat6 \
+# 	-firewall4 \
+# 	-nftables \
+# 	-kmod-nft-offload \
+# 	firewall \
+# 	ip6tables \
+# 	iptables \
+# 	kmod-ipt-offload"
 
 # fw4 + pbr
 # r4s['packages']="\
@@ -155,6 +180,24 @@ r4s['packages']="\
 # 	ethtool \
 # 	kmod-nft-nat6"
 
+# fw4
+r4s['packages']="\
+	$default_packages \
+	luci-app-upnp \
+	luci-app-wireguard \
+	-dnsmasq \
+	dnsmasq-full \
+	luci-app-ddns \
+	luci-app-sqm \
+	luci-app-statistics \
+	collectd-mod-sensors \
+	collectd-mod-thermal \
+	collectd-mod-conntrack \
+	smcroute \
+	curl \
+	ethtool \
+	kmod-nft-nat6"
+
 declare -Ag x5000r
 x5000r['profile']="totolink_x5000r"
 x5000r['target']="ramips/mt7621"