Profiles: add x86 packages to n5100

openwrtbuilder

@@ -36,6 +36,8 @@ printHelp() {
 		        Example: /dev/sdX
 		    --reset
 		        Cleanup all source and output files
+		    --yes,-y
+		        Assume yes for all questions (automatic mode)
 		    --debug,-d
 		    --help,-h
 
@@ -143,13 +145,13 @@ init() {
 readInput() {
     debug "${FUNCNAME[0]}"
 
-    unset RESET
+    unset RESET YES
 
     declare -ga PROFILES
     declare long_opts='release:,version:,profile:,buildroot:,source,'
-    long_opts+='ssh-upgrade:,ssh-backup:,flash:,reset,debug,help'
+    long_opts+='ssh-upgrade:,ssh-backup:,flash:,reset,yes,debug,help'
 
-    if _input=$(getopt -o +r:v:p:b:sf:dh -l $long_opts -- "$@"); then
+    if _input=$(getopt -o +r:v:p:b:sf:ydh -l $long_opts -- "$@"); then
         eval set -- "$_input"
         while true; do
             case "$1" in
@@ -177,6 +179,9 @@ readInput() {
                 --reset)
                     RESET=1
                     ;;
+                --yes|-y)
+                    YES=1
+                    ;;
                 --debug|-d)
                     echo "Debugging on"
                     DEBUG=1
@@ -564,13 +569,10 @@ fromSource() {
         [0-9][0-9].[0-9][0-9].*)
             local branch="openwrt-${RELEASE%.*}"
             local tag="v$RELEASE"
-            local r
+            if askOk "Use HEAD of $branch branch (y, recommended) or $tag tag (n)?"; then
-            read -r -p "Use HEAD of $branch branch (y, recommended) or $tag tag (n)? (Y/n): " r
-            r=${r,,}
-            if [[ "$r" =~ ^(no|n)$ ]]; then
-                execute "${wt_cmd[@]}" "$tag"
-            else
                 execute "${wt_cmd[@]}" "origin/$branch"
+            else
+                execute "${wt_cmd[@]}" "$tag"
             fi
             ;;
         *)
@@ -673,6 +675,7 @@ fromSource() {
 # Generic helpers
 debug() { (( DEBUG )) && echo "Debug: $*"; }
 askOk() {
+    (( YES )) && return
     local r
     read -r -p "$* [y/N]: " r
     r=${r,,}

profiles

@@ -21,114 +21,11 @@ default_packages="\
 	collectd-mod-conntrack \
 	collectd-mod-cpu"
 
-# declare -Ag archer
+#################
-# archer['device']="tplink_archer-c7-v2"
+# Current devices
-# archer['target']="ath79/generic"
+#################
-# archer['filesystem']="squashfs"
-# archer['packages']="\
-# 	$default_packages \
-# 	-dnsmasq \
-# 	-odhcpd \
-# 	-iptables \
-# 	-ath10k-firmware-qca988x-ct \
-# 	ath10k-firmware-qca988x-ct-full-htt"
-
-# declare -Ag linksys
-# linksys['device']="linksys_ea8300"
-# linksys['target']="ipq40xx/generic"
-# linksys['filesystem']="squashfs"
-# linksys['packages']="\
-# 	$default_packages \
-# 	-dnsmasq \
-# 	-odhcpd \
-# 	-iptables"
-
-declare -Ag n5100
-n5100['device']="generic"
-n5100['target']="x86/64"
-n5100['filesystem']="ext4"
-n5100['packages']="\
-	$default_packages \
-	luci-app-wireguard \
-	luci-proto-wireguard \
-	luci-app-ddns \
-	irqbalance \
-	collectd-mod-df \
-	usbutils \
-	kmod-usb-storage \
-	kmod-usb-storage-uas \
-	kmod-fs-btrfs \
-	btrfs-progs \
-	block-mount \
-	smcroute \
-	avahi-daemon \
-	curl \
-	ethtool \
-	ca-bundle \
-	-libustream-wolfssl"
-# The following are source mode only
-n5100['kopts']="\
-	CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \
-	CONFIG_BTRFS_PROGS_ZSTD=y \
-	CONFIG_TARGET_ROOTFS_PARTSIZE=1024"
-n5100['files']="\
-	/mnt/backup"
-
-declare -Ag rpi4
-rpi4['device']="rpi-4"
-rpi4['target']="bcm27xx/bcm2711"
-rpi4['filesystem']="ext4"
-rpi4['packages']="\
-	$default_packages \
-	kmod-usb-net-asix-ax88179 \
-	kmod-usb-net-rtl8152 \
-	luci-app-upnp \
-	luci-app-wireguard \
-	luci-app-pbr \
-	-dnsmasq \
-	dnsmasq-full \
-	luci-app-ddns \
-	luci-app-sqm"
-
-# declare -Ag r2s
-# r2s['device']="friendlyarm_nanopi-r2s"
-# r2s['target']="rockchip/armv8"
-# r2s['filesystem']="ext4"
-# r2s['packages']="\
-# 	$default_packages \
-# 	luci-app-upnp \
-# 	luci-app-wireguard \
-# 	luci-app-pbr \
-# 	-dnsmasq \
-# 	dnsmasq-full \
-# 	luci-app-ddns \
-# 	luci-app-sqm \
-# 	luci-app-statistics \
-# 	collectd-mod-sensors \
-# 	collectd-mod-thermal \
-# 	collectd-mod-conntrack \
-# 	smcroute \
-# 	curl \
-# 	ethtool"
-
-# declare -Ag r2s_tr
-# r2s_tr['device']="friendlyarm_nanopi-r2s"
-# r2s_tr['target']="rockchip/armv8"
-# r2s_tr['filesystem']="ext4"
-# r2s_tr['packages']="\
-# 	$default_packages \
-# 	luci-app-upnp \
-# 	luci-app-wireguard \
-# 	luci-app-pbr \
-# 	luci-app-ddns \
-# 	luci-app-statistics \
-# 	collectd-mod-sensors \
-# 	collectd-mod-thermal \
-# 	collectd-mod-conntrack \
-# 	curl \
-# 	ethtool \
-# 	travelmate"
 
+# Main router
 declare -Ag r4s
 r4s['device']="friendlyarm_nanopi-r4s"
 r4s['target']="rockchip/armv8"
@@ -160,29 +57,7 @@ r4s['kopts']="\
 r4s['files']="\
 	/mnt/backup"
 
-# declare -Ag r4s_stock
+# WDS mesh nodes
-# r4s_stock['device']="friendlyarm_nanopi-r4s"
-# r4s_stock['target']="rockchip/armv8"
-# r4s_stock['filesystem']="ext4"
-# r4s_stock['release']="snapshot"
-
-# declare -Ag ax6000
-# ax6000['device']="xiaomi_redmi-router-ax6000-stock"
-# ax6000['target']="mediatek/filogic"
-# ax6000['release']="snapshot"
-# ax6000['filesystem']="squashfs"
-# ax6000['packages']="\
-# 	$default_packages \
-# 	-dnsmasq \
-# 	-odhcpd-ipv6only \
-# 	-nftables \
-# 	-firewall4 \
-# 	-kmod-nft-offload \
-# 	collectd-mod-iwinfo \
-# 	mesh11sd \
-# 	-wpad-basic-mbedtls \
-# 	wpad-mesh-mbedtls"
-
 declare -Ag ax6000
 ax6000['device']="xiaomi_redmi-router-ax6000-stock"
 ax6000['target']="mediatek/filogic"
@@ -199,6 +74,7 @@ ax6000['packages']="\
 	# -wpad-basic-mbedtls \
 	# wpad-mesh-mbedtls"
 
+# For converted uboots
 # declare -Ag ax6000_uboot
 # ax6000_uboot['device']="xiaomi_redmi-router-ax6000-ubootmod"
 # ax6000_uboot['target']="mediatek/filogic"
@@ -213,15 +89,142 @@ ax6000['packages']="\
 # 	-kmod-nft-offload \
 # 	collectd-mod-iwinfo"
 
-# declare -Ag totolink
+# Remote NAS
-# totolink['device']="totolink_x5000r"
+declare -Ag n5100
-# totolink['target']="ramips/mt7621"
+n5100['device']="generic"
-# totolink['filesystem']="squashfs"
+n5100['target']="x86/64"
-# totolink['packages']="\
+n5100['filesystem']="ext4"
-# 	$default_packages \
+n5100['packages']="\
-# 	-dnsmasq \
+	$default_packages \
-# 	-odhcpd-ipv6only \
+	luci-app-wireguard \
-# 	-nftables \
+	luci-proto-wireguard \
-# 	-firewall4 \
+	luci-app-ddns \
-# 	-kmod-nft-offload \
+	irqbalance \
-# 	collectd-mod-iwinfo"
+	collectd-mod-df \
+	usbutils \
+	kmod-usb-storage \
+	kmod-usb-storage-uas \
+	kmod-fs-btrfs \
+	btrfs-progs \
+	block-mount \
+	smcroute \
+	avahi-daemon \
+	curl \
+	ethtool \
+	ca-bundle \
+	smartmontools \
+	intel-microcode \
+	lm-sensors \
+	-libustream-wolfssl"
+# The following are source mode only
+n5100['kopts']="\
+	CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \
+	CONFIG_BTRFS_PROGS_ZSTD=y \
+	CONFIG_TARGET_ROOTFS_PARTSIZE=1024"
+n5100['files']="\
+	/mnt/backup"
+
+# Dusty drawer
+declare -Ag rpi4
+rpi4['device']="rpi-4"
+rpi4['target']="bcm27xx/bcm2711"
+rpi4['filesystem']="ext4"
+rpi4['packages']="\
+	$default_packages \
+	kmod-usb-net-asix-ax88179 \
+	kmod-usb-net-rtl8152 \
+	luci-app-upnp \
+	luci-app-wireguard \
+	luci-app-pbr \
+	-dnsmasq \
+	dnsmasq-full \
+	luci-app-ddns \
+	luci-app-sqm"
+
+
+#################
+# Stock builds
+#################
+declare -Ag r4s_stock
+r4s_stock['device']="friendlyarm_nanopi-r4s"
+r4s_stock['target']="rockchip/armv8"
+r4s_stock['filesystem']="ext4"
+r4s_stock['release']="snapshot"
+
+
+#################
+# Old devices
+#################
+declare -Ag totolink
+totolink['device']="totolink_x5000r"
+totolink['target']="ramips/mt7621"
+totolink['filesystem']="squashfs"
+totolink['packages']="\
+	$default_packages \
+	-dnsmasq \
+	-odhcpd-ipv6only \
+	-nftables \
+	-firewall4 \
+	-kmod-nft-offload \
+	collectd-mod-iwinfo"
+
+declare -Ag archer
+archer['device']="tplink_archer-c7-v2"
+archer['target']="ath79/generic"
+archer['filesystem']="squashfs"
+archer['packages']="\
+	$default_packages \
+	-dnsmasq \
+	-odhcpd \
+	-iptables \
+	-ath10k-firmware-qca988x-ct \
+	ath10k-firmware-qca988x-ct-full-htt"
+
+declare -Ag linksys
+linksys['device']="linksys_ea8300"
+linksys['target']="ipq40xx/generic"
+linksys['filesystem']="squashfs"
+linksys['packages']="\
+	$default_packages \
+	-dnsmasq \
+	-odhcpd \
+	-iptables"
+
+declare -Ag r2s
+r2s['device']="friendlyarm_nanopi-r2s"
+r2s['target']="rockchip/armv8"
+r2s['filesystem']="ext4"
+r2s['packages']="\
+	$default_packages \
+	luci-app-upnp \
+	luci-app-wireguard \
+	luci-app-pbr \
+	-dnsmasq \
+	dnsmasq-full \
+	luci-app-ddns \
+	luci-app-sqm \
+	luci-app-statistics \
+	collectd-mod-sensors \
+	collectd-mod-thermal \
+	collectd-mod-conntrack \
+	smcroute \
+	curl \
+	ethtool"
+
+declare -Ag r2s_tr
+r2s_tr['device']="friendlyarm_nanopi-r2s"
+r2s_tr['target']="rockchip/armv8"
+r2s_tr['filesystem']="ext4"
+r2s_tr['packages']="\
+	$default_packages \
+	luci-app-upnp \
+	luci-app-wireguard \
+	luci-app-pbr \
+	luci-app-ddns \
+	luci-app-statistics \
+	collectd-mod-sensors \
+	collectd-mod-thermal \
+	collectd-mod-conntrack \
+	curl \
+	ethtool \
+	travelmate"