bryan/openwrtbuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidy up for 22.03.0-rc1

Browse Source
This commit is contained in:
Bryan Roessler
2022-04-22 12:20:11 -04:00
parent 21db10f5cb
commit 7b0e749294
2 changed files with 73 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openwrtbuilder
View File

@@ -6,6 +6,9 @@
# #
# Apache 2.0 License # Apache 2.0 License
# Set default release
: "${RELEASE:="22.03.0-rc1"}"
printHelp() { printHelp() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
@@ -40,7 +43,7 @@ readInput() {
unset RESET 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" eval set -- "$_input"
while true; do while true; do
case "$1" in case "$1" in
@@ -386,7 +389,6 @@ main() {
: "${BUILDDIR:=$SCRIPTDIR}" : "${BUILDDIR:=$SCRIPTDIR}"
: "${FILESDIR:=$BUILDDIR/files}" : "${FILESDIR:=$BUILDDIR/files}"
: "${RELEASE:="21.02.1"}"
: "${P_ARR[release]:=$RELEASE}" : "${P_ARR[release]:=$RELEASE}"
: "${P_ARR[source_archive]:=$BUILDDIR/sources/${P_ARR[profile]}-${P_ARR[release]}.tar.xz}" : "${P_ARR[source_archive]:=$BUILDDIR/sources/${P_ARR[profile]}-${P_ARR[release]}.tar.xz}"

95
profiles
View File

@@ -76,7 +76,7 @@ r2s['packages']="\
ethtool" ethtool"
declare -Ag r4s declare -Ag r4s
r4s['release']="snapshot" r4s['release']="22.03.0-rc1"
r4s['profile']="friendlyarm_nanopi-r4s" r4s['profile']="friendlyarm_nanopi-r4s"
r4s['target']="rockchip/armv8" r4s['target']="rockchip/armv8"
r4s['filesystem']="ext4" r4s['filesystem']="ext4"
@@ -109,31 +109,56 @@ r4s['repo']="src/gz stangri_repo https://repo.openwrt.melmac.net"
# kmod-ipt-offload" # kmod-ipt-offload"
# fw3 + pbr # fw3 + pbr
r4s['packages']="\ # r4s['packages']="\
$default_packages \ # $default_packages \
luci-app-upnp \ # luci-app-upnp \
luci-app-wireguard \ # luci-app-wireguard \
luci-app-pbr \ # luci-app-pbr \
pbr-ipt \ # pbr-ipt \
-dnsmasq \ # -dnsmasq \
dnsmasq-full \ # dnsmasq-full \
luci-app-ddns \ # luci-app-ddns \
luci-app-sqm \ # luci-app-sqm \
luci-app-statistics \ # luci-app-statistics \
collectd-mod-sensors \ # collectd-mod-sensors \
collectd-mod-thermal \ # collectd-mod-thermal \
collectd-mod-conntrack \ # collectd-mod-conntrack \
smcroute \ # smcroute \
curl \ # curl \
ethtool \ # ethtool \
kmod-ipt-nat6 \ # kmod-ipt-nat6 \
-firewall4 \ # -firewall4 \
-nftables \ # -nftables \
-kmod-nft-offload \ # -kmod-nft-offload \
firewall \ # firewall \
ip6tables \ # ip6tables \
iptables \ # iptables \
kmod-ipt-offload" # 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 # fw4 + pbr
# r4s['packages']="\ # r4s['packages']="\
@@ -155,6 +180,24 @@ r4s['packages']="\
# ethtool \ # ethtool \
# kmod-nft-nat6" # 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 declare -Ag x5000r
x5000r['profile']="totolink_x5000r" x5000r['profile']="totolink_x5000r"
x5000r['target']="ramips/mt7621" x5000r['target']="ramips/mt7621"