From 402a9f0d259b14681dbf219d9b1268f2c936d2a9 Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Fri, 18 Oct 2019 02:29:34 -0700 Subject: [PATCH] support powerpc64 properly, always fetch xxx dates (RC/BETA), properly include vm type for RC/BETA --- addinfo.sh | 2 +- mksnapidx.awk | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addinfo.sh b/addinfo.sh index 4c4b0bc..b7260bd 100644 --- a/addinfo.sh +++ b/addinfo.sh @@ -83,7 +83,7 @@ done if [ x"$complete" = x"1" ]; then sort -u snapshot.complete.idx | xz > snapshot.complete.idx.xz - awk '$5 >= "'"$1"'" { + awk '$5 == "xxx" || $5 >= "'"$1"'" { if (!system("wget --method=HEAD " $9)) print } diff --git a/mksnapidx.awk b/mksnapidx.awk index 3889574..fb6683a 100644 --- a/mksnapidx.awk +++ b/mksnapidx.awk @@ -77,7 +77,10 @@ $1 == "SHA512" { # make arch part, may include additional part arch = parts[4] basearch = arch - if (parts[4] == "arm" || (parts[4] == "powerpc" && parts[5] == "powerpcspe") || parts[4] == "arm64") { + if (parts[4] == "arm" || + (parts[4] == "powerpc" && parts[5] == "powerpcspe") || + (parts[4] == "powerpc" && parts[5] == "powerpc64") || + parts[4] == "arm64") { # FreeBSD-11.3-STABLE-arm64-aarch64-20191011-r353406-memstick.img basearch = parts[5] arch = parts[4] "-" parts[5] @@ -133,9 +136,10 @@ $1 == "SHA512" { } } if (index(parts[3], "BETA") == 1 || index(parts[3], "RC") == 1) { - if (type == "vm") + if (type == "vm") { + vers = dotparts[3] url = relvmroot parts[2] "-" parts[3] "/" basearch "/Latest/" fname - else + } else url = relisoroot parts[2] "/" fname } else { if (type == "vm") {