From 6ecc9ea8df25cd0c973605c2c8671fce609818ad Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Thu, 12 Sep 2024 09:18:19 -0400
Subject: [PATCH 1/3] For ubuntu pass the packages directly by name.  Ubuntu
 does not know about dnf, and there are multiple php matches.

---
 phoronix/run_phoronix.sh | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/phoronix/run_phoronix.sh b/phoronix/run_phoronix.sh
index f39a7a4..fe721c9 100755
--- a/phoronix/run_phoronix.sh
+++ b/phoronix/run_phoronix.sh
@@ -119,16 +119,26 @@ if [ $show_usage -eq 1 ]; then
 fi
 
 test_tools/package_tool --update
-for pkg in cli common php; do
-	package=`dnf list | grep  php  | grep $pkg | awk '{print $1}'`
-	if [[ $package == "" ]]; then
-		error_out "Did not find a php $pkg package" 1
-	fi
-	test_tools/package_tool --packages $package
-	if [[ $? != "0" ]]; then
-		error_out "Failed to install one or more $php_cli,$php_common,$php_xml" 1
-	fi
-done
+case "`test_tools/detect_os`" in
+	"ubuntu")
+		test_tools/package_tool --packages "php-cli,php,php-common"
+		if [[ $? != "0" ]]; then
+			error_out "Failed to install one or more php_cli,php_common,php_xml" 1
+		fi
+	;;
+       	*)
+		for pkg in cli common php; do
+			package=`dnf list | grep  php  | grep $pkg | awk '{print $1}'`
+			if [[ $package == "" ]]; then
+				error_out "Did not find a php $pkg package" 1
+			fi
+			test_tools/package_tool --packages $package
+			if [[ $? != "0" ]]; then
+				error_out "Failed to install one or more $php_cli,$php_common,$php_xml" 1
+			fi
+		done
+	;;
+esac
 
 # Variables set by general setup.
 #

From bad21dc58ad01ac7682f1aa5bb99371ec27f4d29 Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Thu, 12 Sep 2024 12:43:16 -0400
Subject: [PATCH 2/3] Rewview updates.

---
 phoronix/run_phoronix.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/phoronix/run_phoronix.sh b/phoronix/run_phoronix.sh
index fe721c9..0ffba31 100755
--- a/phoronix/run_phoronix.sh
+++ b/phoronix/run_phoronix.sh
@@ -121,24 +121,21 @@ fi
 test_tools/package_tool --update
 case "`test_tools/detect_os`" in
 	"ubuntu")
-		test_tools/package_tool --packages "php-cli,php,php-common"
-		if [[ $? != "0" ]]; then
-			error_out "Failed to install one or more php_cli,php_common,php_xml" 1
-		fi
+		packages="php-cli,php,php-common"
 	;;
        	*)
 		for pkg in cli common php; do
-			package=`dnf list | grep  php  | grep $pkg | awk '{print $1}'`
-			if [[ $package == "" ]]; then
+			packages=`dnf list | grep  php  | grep $pkg | awk '{print $1}'`
+			if [[ $packages == "" ]]; then
 				error_out "Did not find a php $pkg package" 1
 			fi
-			test_tools/package_tool --packages $package
-			if [[ $? != "0" ]]; then
-				error_out "Failed to install one or more $php_cli,$php_common,$php_xml" 1
-			fi
 		done
 	;;
 esac
+test_tools/package_tool --packages "php-cli,php,php-common"
+if [[ $? != "0" ]]; then
+	error_out "Failed to install one or more php_cli,php_common,php_xml" 1
+fi
 
 # Variables set by general setup.
 #

From df2d4ca0b373d30c112829445a99edf6d7355d26 Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Mon, 16 Sep 2024 10:48:06 -0400
Subject: [PATCH 3/3] Remove php package installations.  Move it into the
 zathras config files

---
 phoronix/run_phoronix.sh | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/phoronix/run_phoronix.sh b/phoronix/run_phoronix.sh
index 0ffba31..ae4ff98 100755
--- a/phoronix/run_phoronix.sh
+++ b/phoronix/run_phoronix.sh
@@ -118,25 +118,6 @@ if [ $show_usage -eq 1 ]; then
 	usage $0
 fi
 
-test_tools/package_tool --update
-case "`test_tools/detect_os`" in
-	"ubuntu")
-		packages="php-cli,php,php-common"
-	;;
-       	*)
-		for pkg in cli common php; do
-			packages=`dnf list | grep  php  | grep $pkg | awk '{print $1}'`
-			if [[ $packages == "" ]]; then
-				error_out "Did not find a php $pkg package" 1
-			fi
-		done
-	;;
-esac
-test_tools/package_tool --packages "php-cli,php,php-common"
-if [[ $? != "0" ]]; then
-	error_out "Failed to install one or more php_cli,php_common,php_xml" 1
-fi
-
 # Variables set by general setup.
 #
 # TOOLS_BIN: points to the tool directory