From 10db10f867dab3c3e34a3674c3301cb6afd29884 Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Tue, 28 Oct 2025 04:57:06 -0400
Subject: [PATCH 1/4] Add support for packaging tool.

---
 numa_streams/numa_streams.json                | 55 +++++++++++++++++++
 .../numa_streams_extra/run_numa_stream        |  1 -
 numa_streams/numa_streams_run                 |  6 ++
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 numa_streams/numa_streams.json

diff --git a/numa_streams/numa_streams.json b/numa_streams/numa_streams.json
new file mode 100644
index 0000000..522a627
--- /dev/null
+++ b/numa_streams/numa_streams.json
@@ -0,0 +1,55 @@
+{
+    "dependencies": {
+        "amzn": [
+            "gcc",
+            "bc",
+            "zip",
+            "unzip",
+            "numactl",
+            "wget",
+            "gcc-c++",
+            "autoconf",
+            "hwloc",
+            "hwloc-gui",
+            "libomp"
+        ],
+        "rhel": [
+            "gcc",
+            "bc",
+            "perf",
+            "zip",
+            "unzip",
+            "numactl",
+            "wget",
+            "gcc-c++",
+            "autoconf",
+            "hwloc",
+            "hwloc-gui",
+            "libomp"
+        ],
+        "sles": [
+            "gcc",
+            "make",
+            "bc",
+            "perf",
+            "git",
+            "unzip",
+            "zip",
+            "libnuma1",
+            "numactl"
+        ],
+        "ubuntu": [
+            "bc",
+            "zip",
+            "unzip",
+            "numactl",
+	    "libnuma-dev",
+            "g++",
+            "autoconf",
+            "hwloc",
+            "libomp5-20"
+        ],
+        "pip": [
+        ]
+    }
+}
diff --git a/numa_streams/numa_streams_extra/run_numa_stream b/numa_streams/numa_streams_extra/run_numa_stream
index 69c8c44..caac03c 100755
--- a/numa_streams/numa_streams_extra/run_numa_stream
+++ b/numa_streams/numa_streams_extra/run_numa_stream
@@ -206,7 +206,6 @@ setup_sizing()
 
 install_numa_streams()
 {
-	dnf install wget gcc gcc-c++ autoconf hwloc hwloc-gui libomp  -y
 	git clone https://github.com/jemalloc/jemalloc.git
 	pushd jemalloc > /dev/null
 	./autogen.sh
diff --git a/numa_streams/numa_streams_run b/numa_streams/numa_streams_run
index 9abf323..e3078a1 100755
--- a/numa_streams/numa_streams_run
+++ b/numa_streams/numa_streams_run
@@ -367,6 +367,12 @@ if [ ! -f "/tmp/${test_name}.out" ]; then
 	exit $?
 fi
 
+${TOOLS_BIN}/package_tool --wrapper_config ${run_dir}/numa_streams.json --no_packages $to_no_pkg_install
+if [[ $? -ne 0 ]]; then
+	echo Packaging installed failed.
+	exit 1
+fi
+
 #
 # Define user options
 #

From d79bbd0a1f64118cc4e759275c8a82c939e309f1 Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Tue, 4 Nov 2025 04:58:14 -0500
Subject: [PATCH 2/4] Add git to all repos and fix indentation.

---
 numa_streams/numa_streams.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/numa_streams/numa_streams.json b/numa_streams/numa_streams.json
index 522a627..2b4d6e7 100644
--- a/numa_streams/numa_streams.json
+++ b/numa_streams/numa_streams.json
@@ -1,6 +1,7 @@
 {
     "dependencies": {
         "amzn": [
+            "git",
             "gcc",
             "bc",
             "zip",
@@ -14,6 +15,7 @@
             "libomp"
         ],
         "rhel": [
+            "git",
             "gcc",
             "bc",
             "perf",
@@ -28,6 +30,7 @@
             "libomp"
         ],
         "sles": [
+            "git",
             "gcc",
             "make",
             "bc",
@@ -39,11 +42,12 @@
             "numactl"
         ],
         "ubuntu": [
+            "git",
             "bc",
             "zip",
             "unzip",
             "numactl",
-	    "libnuma-dev",
+            "libnuma-dev",
             "g++",
             "autoconf",
             "hwloc",

From d01052c893693a8f2a6ad1f4c05f1131b248beae Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Wed, 5 Nov 2025 05:48:41 -0500
Subject: [PATCH 3/4] Rephrase the error out message when package_tool fails.

---
 numa_streams/numa_streams_run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/numa_streams/numa_streams_run b/numa_streams/numa_streams_run
index e3078a1..f02d6b8 100755
--- a/numa_streams/numa_streams_run
+++ b/numa_streams/numa_streams_run
@@ -369,7 +369,7 @@ fi
 
 ${TOOLS_BIN}/package_tool --wrapper_config ${run_dir}/numa_streams.json --no_packages $to_no_pkg_install
 if [[ $? -ne 0 ]]; then
-	echo Packaging installed failed.
+	echo Error: Package installation using ${TOOLS_BIN}/package_tool was unsuccessful.
 	exit 1
 fi
 

From 4ecd461567e2cfb62b8c9629847bfd02ae25fde3 Mon Sep 17 00:00:00 2001
From: David Valin <dvalin@redhat.com>
Date: Wed, 5 Nov 2025 05:51:40 -0500
Subject: [PATCH 4/4] Remove duplicate package.

---
 numa_streams/numa_streams.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/numa_streams/numa_streams.json b/numa_streams/numa_streams.json
index 2b4d6e7..b02c629 100644
--- a/numa_streams/numa_streams.json
+++ b/numa_streams/numa_streams.json
@@ -35,7 +35,6 @@
             "make",
             "bc",
             "perf",
-            "git",
             "unzip",
             "zip",
             "libnuma1",