Debug curl checksum issues

This commit is contained in:
2024-10-24 13:19:00 -04:00
parent 78820d1058
commit 0de4af9bdb
2 changed files with 13 additions and 39 deletions

View File

@@ -10,7 +10,7 @@
# #
# Set default release # Set default release
: "${RELEASE:="23.05.3"}" : "${RELEASE:="23.05.5"}"
printHelp() { printHelp() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
@@ -371,7 +371,7 @@ installDependencies() {
getImageBuilder() { getImageBuilder() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
declare url="$1" local url="$1"
if [[ -f "$IB_ARCHIVE" ]]; then if [[ -f "$IB_ARCHIVE" ]]; then
if askOk "$IB_ARCHIVE exists. Re-download?"; then if askOk "$IB_ARCHIVE exists. Re-download?"; then
@@ -397,6 +397,7 @@ getImageBuilderChecksum() {
fi fi
fi fi
echo "Downloading Image Builder checksum using $DL_TOOL"
execute "$DL_TOOL -o $IB_SHA256_FILE $IB_SHA256_URL" execute "$DL_TOOL -o $IB_SHA256_FILE $IB_SHA256_URL"
} }

View File

@@ -7,23 +7,23 @@
default_packages="\ default_packages="\
luci \ luci \
luci-ssl \ luci-ssl \
luci-proto-wireguard \
luci-app-statistics \
collectd-mod-sensors \
collectd-mod-thermal \
collectd-mod-conntrack \
collectd-mod-cpu \
nano \ nano \
htop \ htop \
diffutils \ diffutils \
tar \ tar \
iperf3 \ iperf3 \
bash \ zsh \
rsync \ rsync \
luci-app-statistics \ openssh-sftp-server \
collectd-mod-sensors \ "
collectd-mod-thermal \
collectd-mod-conntrack \
collectd-mod-cpu"
#################
# Current devices # Current devices
#################
# Main router # Main router
declare -Ag r4s declare -Ag r4s
r4s['device']="friendlyarm_nanopi-r4s" r4s['device']="friendlyarm_nanopi-r4s"
@@ -31,7 +31,6 @@ r4s['target']="rockchip/armv8"
r4s['filesystem']="ext4" r4s['filesystem']="ext4"
r4s['packages']="\ r4s['packages']="\
$default_packages \ $default_packages \
luci-proto-wireguard \
luci-app-ddns \ luci-app-ddns \
luci-app-sqm \ luci-app-sqm \
irqbalance \ irqbalance \
@@ -56,7 +55,7 @@ r4s['config']="\
r4s['files']="\ r4s['files']="\
/mnt/backup" /mnt/backup"
# WDS mesh nodes # Access point
declare -Ag ax6000 declare -Ag ax6000
ax6000['device']="xiaomi_redmi-router-ax6000-stock" ax6000['device']="xiaomi_redmi-router-ax6000-stock"
ax6000['target']="mediatek/filogic" ax6000['target']="mediatek/filogic"
@@ -68,22 +67,6 @@ ax6000['packages']="\
-odhcpd-ipv6only \ -odhcpd-ipv6only \
-nftables \ -nftables \
-firewall4" -firewall4"
# for 802.11s
# mesh11sd \
# -wpad-basic-mbedtls \
# wpad-mesh-mbedtls"
# WDS mesh nodes
declare -Ag ax6000_ap
ax6000_ap['device']="xiaomi_redmi-router-ax6000-stock"
ax6000_ap['target']="mediatek/filogic"
ax6000_ap['release']="snapshot"
ax6000_ap['filesystem']="squashfs"
ax6000_ap['packages']="\
$default_packages \
avahi-daemon \
smcroute \
ca-bundle"
# For converted uboots # For converted uboots
# declare -Ag ax6000_uboot # declare -Ag ax6000_uboot
@@ -107,7 +90,6 @@ n5100['target']="x86/64"
n5100['filesystem']="squashfs" n5100['filesystem']="squashfs"
n5100['packages']="\ n5100['packages']="\
$default_packages \ $default_packages \
luci-proto-wireguard \
luci-app-ddns \ luci-app-ddns \
irqbalance \ irqbalance \
collectd-mod-df \ collectd-mod-df \
@@ -150,27 +132,20 @@ rpi4['packages']="\
kmod-usb-net-asix-ax88179 \ kmod-usb-net-asix-ax88179 \
kmod-usb-net-rtl8152 \ kmod-usb-net-rtl8152 \
luci-app-upnp \ luci-app-upnp \
luci-proto-wireguard \
luci-app-pbr \ luci-app-pbr \
-dnsmasq \ -dnsmasq \
dnsmasq-full \ dnsmasq-full \
luci-app-ddns \ luci-app-ddns \
luci-app-sqm" luci-app-sqm"
#################
# Stock builds # Stock builds
#################
declare -Ag r4s_stock declare -Ag r4s_stock
r4s_stock['device']="friendlyarm_nanopi-r4s" r4s_stock['device']="friendlyarm_nanopi-r4s"
r4s_stock['target']="rockchip/armv8" r4s_stock['target']="rockchip/armv8"
r4s_stock['filesystem']="ext4" r4s_stock['filesystem']="ext4"
r4s_stock['release']="snapshot" r4s_stock['release']="snapshot"
#################
# Old devices # Old devices
#################
declare -Ag totolink declare -Ag totolink
totolink['device']="totolink_x5000r" totolink['device']="totolink_x5000r"
totolink['target']="ramips/mt7621" totolink['target']="ramips/mt7621"
@@ -213,7 +188,6 @@ r2s['filesystem']="ext4"
r2s['packages']="\ r2s['packages']="\
$default_packages \ $default_packages \
luci-app-upnp \ luci-app-upnp \
luci-proto-wireguard \
luci-app-pbr \ luci-app-pbr \
-dnsmasq \ -dnsmasq \
dnsmasq-full \ dnsmasq-full \
@@ -234,7 +208,6 @@ r2s_tr['filesystem']="ext4"
r2s_tr['packages']="\ r2s_tr['packages']="\
$default_packages \ $default_packages \
luci-app-upnp \ luci-app-upnp \
luci-proto-wireguard \
luci-app-pbr \ luci-app-pbr \
luci-app-ddns \ luci-app-ddns \
luci-app-statistics \ luci-app-statistics \