From 42ff09a6d4af873a9c94eb19fff383395d8f96a4 Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Mon, 8 Dec 2025 07:13:23 -0500
Subject: [PATCH 1/3] Handle arm architecture for  libncurses.so

---
 passmark/passmark_run | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/passmark/passmark_run b/passmark/passmark_run
index 2de608c..fe420e6 100755
--- a/passmark/passmark_run
+++ b/passmark/passmark_run
@@ -230,10 +230,8 @@ run_passmark()
 			#
 			uname -a | grep  -q Ubuntu
 			if [ $? -eq 0 ]; then
-				echo ubuntu >> /tmp/dave
 				if [[ ! -f /usr/lib64 ]]; then
 					ln -s /usr/lib /usr/lib64
-					echo ln -s /usr/lib /usr/lib64 >> /tmp/dave
 				fi
 			fi
 		else
@@ -246,7 +244,14 @@ run_passmark()
 
 	if [ ! -f "/usr/lib64/libncurses.so.5" ]; then
 		pushd /usr/lib64 > /dev/null
-		ln -s libncurses.so.6 libncurses.so.5
+		if [[ -f "libncurses.so.6" ]]; then
+			ln -s libncurses.so.6 libncurses.so.5
+		elif [[ -d "aarch64-linux-gnu" ]]; then
+			cd aarch64-linux-gnu
+			ln -s libncurses.so.6 libncurses.so.5
+		else
+			exit_out "/usr/lib64/libncurses.so.5 not present" 1
+		fi
 		popd > /dev/null
 	fi
 

From c9fbc55b4205d2a87686937febd5d646750cf134 Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Mon, 8 Dec 2025 07:15:37 -0500
Subject: [PATCH 2/3] Delete extra uname -m

---
 passmark/passmark_run | 1 -
 1 file changed, 1 deletion(-)

diff --git a/passmark/passmark_run b/passmark/passmark_run
index fe420e6..bb1565c 100755
--- a/passmark/passmark_run
+++ b/passmark/passmark_run
@@ -146,7 +146,6 @@ produce_report()
 		$TOOLS_BIN/test_header_info --front_matter --results_file results.csv --host $to_configuration --sys_type $to_sys_type --tuned $to_tuned_setting --results_version $passmark_version --test_name $test_name
 
 		while IFS= read -r line
-		arch=`uname -m`
 		do
 			if [[ $line == *"Results Complete:"* ]]; then
 				located=1

From ec8e405ef31d878148aeae1a48de668b33ccace2 Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Mon, 8 Dec 2025 11:39:05 -0500
Subject: [PATCH 3/3] Update to include x86 for ubuntu also.

---
 passmark/passmark_run | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/passmark/passmark_run b/passmark/passmark_run
index bb1565c..055ea7c 100755
--- a/passmark/passmark_run
+++ b/passmark/passmark_run
@@ -243,13 +243,31 @@ run_passmark()
 
 	if [ ! -f "/usr/lib64/libncurses.so.5" ]; then
 		pushd /usr/lib64 > /dev/null
-		if [[ -f "libncurses.so.6" ]]; then
-			ln -s libncurses.so.6 libncurses.so.5
-		elif [[ -d "aarch64-linux-gnu" ]]; then
-			cd aarch64-linux-gnu
+		lib=`find . -print | grep libncurses.so.6`
+		if [[ $? -ne 0 ]]; then
+			popd > /dev/null
+			#
+			# Now try /usr/lib
+			#
+			pushd /usr/lib > /dev/null
+			lib=`find . -print | grep  'libncurses.so.6$'`
+			if [[ $? -ne 0 ]]; then
+				#
+				# Give up.
+				#
+				exit_out "/usr/lib64/libncurses.so.6 not present" 1
+			fi
+			if [[ -f "libncurses.so.6" ]]; then
+				ln -s libncurses.so.6 libncurses.so.5
+			else
+				lib=`find . -print | grep  'libncurses.so.6$'`
+				if [[ $? -ne 0 ]]; then
+					exit_out "libncurses.so.6 not present" 1
+				fi
+			fi
+			dir=`echo $lib | rev | cut -d'/' -f2- | rev`
+			cd $dir
 			ln -s libncurses.so.6 libncurses.so.5
-		else
-			exit_out "/usr/lib64/libncurses.so.5 not present" 1
 		fi
 		popd > /dev/null
 	fi