From 4dec06b501444fa0df7e45026f6bcf1cefcf9717 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 8 Mar 2021 14:02:11 +0100
Subject: [SSUS] Adapt to new dnbd3 source tarball format

---
 satellit_upgrader/updater.template.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'satellit_upgrader/updater.template.sh')

diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 15c63d3..f42b5d8 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -694,12 +694,13 @@ rm -f -- "$PATH_DNBD3/is-enabled"
 if [ -n "$TGZ_DNBD3" ]; then
 	tmpdir="$TMPDIR/dnbd3.tmp"
 	mkdir -p "$tmpdir"
-	tar -x -C "$tmpdir" -f "$TMPDIR/$TGZ_DNBD3" || perror "Could not extract $TGZ_DNBD3 to $tmpdir"
-	cver=$( "$PATH_DNBD3/dnbd3-server" --version 2> /dev/null | awk -F': ' '{print $2}' )
-	nver=$( cat "$tmpdir/version.txt" )
+	tar --transform='s,^[./]*dnbd3[^/]*/,,' -x -C "$tmpdir" -f "$TMPDIR/$TGZ_DNBD3" || perror "Could not extract $TGZ_DNBD3 to $tmpdir"
+	cver=$( "$PATH_DNBD3/dnbd3-server" --version 2> /dev/null | grep -Po '(?<=^Version: ).*(?=, branch)' )
+	nver=$( < "$tmpdir/inc/dnbd3/version.h"  grep -Po '(?<=^#define DNBD3_VERSION ").*(?=")' )
+	[ -z "$cver" ] && pwarning "BUG BUG! Cannot query dnbd3 version information from currently installed binary!"
 	[ -z "$nver" ] && pwarning "BUG BUG! Updater package contains no dnbd3 version information!"
 	mkdir -p "$PATH_DNBD3"
-	if [ "$cver" != "$nver" ]; then
+	if [ "${cver#v}" != "${nver#v}" ]; then
 		aptinst libjansson-dev
 		aptinst libfuse-dev
 		aptinst cmake
@@ -707,7 +708,8 @@ if [ -n "$TGZ_DNBD3" ]; then
 		cd "$tmpdir"
 		mkdir build
 		cd build
-		if ! failprint cmake -DBUILD_FUSE_CLIENT=OFF -DBUILD_KERNEL_MODULE=OFF -DBUILD_STRESSTEST=OFF -DBUILD_SERVER=ON -DCMAKE_BUILD_TYPE=Release ..; then
+		if ! failprint cmake -DDNBD3_CLIENT_FUSE=OFF -DDNBD3_KERNEL_MODULE=OFF \
+				-DDNBD3_SERVER=ON -DDNBD3_SERVER_FUSE=OFF -DCMAKE_BUILD_TYPE=Release ..; then
 			pwarning "Could not cmake new version $nver of dnbd3-server"
 		elif ! failprint make -j2 dnbd3-server; then
 			pwarning "Could not compile new version $nver of dnbd3-server"
-- 
cgit v1.2.3-55-g7522