From 098bb5c1f41e9cf442c0c5b05d981a2c81199655 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Thu, 2 Jul 2026 12:35:06 +0530
Subject: [PATCH 01/34] Add release tag as version for llama.cpp build

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 709b21cdba..a8723a3382 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------------------
 #
 # Package         : llama.cpp
-# Version         : latest ( HEAD from master branch)
+# Version         : latest release TAG from master branch)
 # Source repo     : https://github.com/ggml-org/llama.cpp
 # Tested on       : UBI:9.6
 # Language        : C, C++
@@ -23,7 +23,6 @@ set -e
 # Variables
 PACKAGE_NAME=llama.cpp
 PACKAGE_URL=https://github.com/ggml-org/llama.cpp
-PACKAGE_VERSION=master
 CURRENT_DIR=$(pwd)
 PACKAGE_DIR=llama.cpp
 SCRIPT_PATH=$(dirname $(realpath $0))
@@ -46,15 +45,18 @@ gcc -v || true
 # Clone latest llama.cpp 
 # -----------------------------------------------------------------------------
 
-echo "**** Cloning Ollama repository..."
+echo "**** Cloning llama.cpp repository..."
 git clone $PACKAGE_URL
 cd $PACKAGE_NAME
-git checkout $PACKAGE_VERSION
+git fetch --tags
+
+PACKAGE_VERSION=$(git describe --tags --abbrev=0)
+
+echo "Building llama.cpp version: ${PACKAGE_VERSION}"
 
 # -----------------------------------------------------------------------------
 # Build llama.cpp
 # -----------------------------------------------------------------------------
-echo "**** Building Ollama with CMake..."
 cmake -B build_llama
 if ! cmake --build build_llama -j$(nproc); then
     echo "------------------$PACKAGE_NAME:Build_fails-------------------------------------"
@@ -74,8 +76,8 @@ from setuptools.command.build_py import build_py
 import os, shutil, stat
 
 PYTHON_PACKAGE_NAME = "llama_cpp_python_package"
-VERSION = "master"
-PKG_NAME="llama_cpp_python_package"
+VERSION = "${PACKAGE_VERSION}"
+PKG_NAME = "llama_cpp_python_package"
 mkdir -p ${PKG_NAME} ${PKG_NAME}/bin ${PKG_NAME}/lib
 
 BUILD_DIR = os.path.join(os.getcwd(), "build_llama", "bin")
@@ -138,7 +140,7 @@ class CustomBuild(build_py):
 
 setup(
     name=PYTHON_PACKAGE_NAME,
-    version="master",
+    version=VERSION,
     author="Shalini Salomi Bodapati",
     author_email="Shalini.Salomi.Bodapati@ibm.com",
     description="llama.cpp binaries + shared libs as Python package",

From bf211f2bacb23bce9f7f02716614090ef2472eb9 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Thu, 2 Jul 2026 12:36:48 +0530
Subject: [PATCH 02/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index a8723a3382..609de0a053 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -23,6 +23,7 @@ set -e
 # Variables
 PACKAGE_NAME=llama.cpp
 PACKAGE_URL=https://github.com/ggml-org/llama.cpp
+BRANCH=master
 CURRENT_DIR=$(pwd)
 PACKAGE_DIR=llama.cpp
 SCRIPT_PATH=$(dirname $(realpath $0))
@@ -48,6 +49,7 @@ gcc -v || true
 echo "**** Cloning llama.cpp repository..."
 git clone $PACKAGE_URL
 cd $PACKAGE_NAME
+git checkout $BRANCH
 git fetch --tags
 
 PACKAGE_VERSION=$(git describe --tags --abbrev=0)

From f5abdb56165c2af667cf4e80c2218845348f7160 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Thu, 2 Jul 2026 15:17:42 +0530
Subject: [PATCH 03/34] Add release tag as version in llama.cpp Dockerfile

---
 .../Dockerfiles/master_ubi_9/Dockerfile       | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile b/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
index 46310033dd..a05fbe46fe 100644
--- a/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
+++ b/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
@@ -1,10 +1,10 @@
 ###############################################################################
-# Stage 1: Build Ollama (Power10 optimized)
+# Stage 1: Build llama.cpp
 ###############################################################################
 FROM registry.access.redhat.com/ubi9/ubi:9.7 AS build
 
 ARG PACKAGE_NAME=llama.cpp
-ARG PACKAGE_VERSION=master
+ARG BRANCH=master
 ARG PACKAGE_URL=https://github.com/ggml-org/llama.cpp
 ENV CMAKE_VERSION=3.31.5
 
@@ -30,10 +30,13 @@ RUN yum install -y cmake
 # Clone and Build llama.cpp
 ###############################################################################
 WORKDIR /src
-    
+
 RUN git clone ${PACKAGE_URL} && \
     cd ${PACKAGE_NAME} && \
-    git checkout ${PACKAGE_VERSION} 
+    git checkout ${BRANCH} && \
+    git fetch --tags && \
+    PACKAGE_VERSION=$(git describe --tags --abbrev=0) && \
+    echo "Building release ${PACKAGE_VERSION}"
 
 WORKDIR /src/${PACKAGE_NAME}
 
@@ -44,7 +47,7 @@ RUN cmake -B build -DCMAKE_BUILD_TYPE=Release && \
     cmake --build build -j$(nproc)
 
 ###############################################################################
-# Stage 2: Small runtime image (Power10 optimized)
+# Stage 2: Small runtime image
 ###############################################################################
 FROM registry.access.redhat.com/ubi9/ubi:9.7
 
@@ -53,9 +56,9 @@ RUN yum update -y && \
     yum clean all
 
 COPY --from=build /src/llama.cpp/build/bin/llama-cli /usr/bin/llama-cli
-COPY --from=build /src/llama.cpp/build/bin/llama-cli /usr/bin/llama-server
-COPY --from=build /src/llama.cpp/build/bin/llama-cli /usr/bin/llama-bench
-COPY --from=build /src/llama.cpp/build/bin/llama-cli /usr/bin/llama-batched-bench
+COPY --from=build /src/llama.cpp/build/bin/llama-server /usr/bin/llama-server
+COPY --from=build /src/llama.cpp/build/bin/llama-bench /usr/bin/llama-bench
+COPY --from=build /src/llama.cpp/build/bin/llama-batched-bench /usr/bin/llama-batched-bench
 
 COPY --from=build /src/llama.cpp/build/bin/libllama-bench-impl.so /usr/lib/llama
 COPY --from=build /src/llama.cpp/build/bin/libllama-common.so.0 /usr/lib/llama
@@ -68,6 +71,6 @@ COPY --from=build /src/llama.cpp/build/bin/libggml-cpu.so.0 /usr/lib/llama
 ENV LD_LIBRARY_PATH=/usr/lib/llama:$LD_LIBRARY_PATH
 ENV PATH="/usr/bin:${PATH}"
 
-EXPOSE 11434
+EXPOSE 8080
 ENTRYPOINT ["/usr/bin/llama-server"]
 CMD ["--help"]

From 72f52231377e492defe6675b49e6882d0529b15b Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 13:55:00 +0530
Subject: [PATCH 04/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 609de0a053..889b2217e2 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -80,7 +80,6 @@ import os, shutil, stat
 PYTHON_PACKAGE_NAME = "llama_cpp_python_package"
 VERSION = "${PACKAGE_VERSION}"
 PKG_NAME = "llama_cpp_python_package"
-mkdir -p ${PKG_NAME} ${PKG_NAME}/bin ${PKG_NAME}/lib
 
 BUILD_DIR = os.path.join(os.getcwd(), "build_llama", "bin")
 

From b4b02fbc780d1a880049c847afa20620a707e0e8 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 14:44:26 +0530
Subject: [PATCH 05/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 889b2217e2..89f19c511f 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -52,7 +52,8 @@ cd $PACKAGE_NAME
 git checkout $BRANCH
 git fetch --tags
 
-PACKAGE_VERSION=$(git describe --tags --abbrev=0)
+PACKAGE_TAG=$(git describe --tags --abbrev=0)
+PACKAGE_VERSION=${PACKAGE_TAG#b}
 
 echo "Building llama.cpp version: ${PACKAGE_VERSION}"
 

From f7055e99c83666af895674b1e794e2868232134d Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 15:02:03 +0530
Subject: [PATCH 06/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index 4273f56df7..b99bbf3116 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -2,7 +2,7 @@
   "maintainer": "shalinib-ibm",
   "package_name": "llama.cpp",
   "github_url": "https://github.com/ggml-org/llama.cpp",
-  "version": "master",
+  "version": "b9882",
   "wheel_build": true,
   "docker_build": true,
   "build_script": "llama_cpp_ubi_9.6.sh",
@@ -12,7 +12,7 @@
   "docker_cmd": "docker build -t ${package_name}-ppc64le:$PACKAGE_VERSION ${dir}",
   "use_non_root_user": false,
 
-  "master": {
+  "b9882": {
     "dir": "master_ubi_9",
     "build_script": "llama_cpp_ubi_9.6.sh",
     "base_docker_image": "registry.access.redhat.com/ubi9/ubi:9.6",

From 2e9681034fe062f1fe190bee166bd55cd93b950a Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 15:06:40 +0530
Subject: [PATCH 07/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 89f19c511f..1681f09cf3 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------------------
 #
 # Package         : llama.cpp
-# Version         : latest release TAG from master branch)
+# Version         : Release TAG from build_info.json.
 # Source repo     : https://github.com/ggml-org/llama.cpp
 # Tested on       : UBI:9.6
 # Language        : C, C++
@@ -22,8 +22,8 @@ set -e
 
 # Variables
 PACKAGE_NAME=llama.cpp
+PACKAGE_VERSION=${1:-master}
 PACKAGE_URL=https://github.com/ggml-org/llama.cpp
-BRANCH=master
 CURRENT_DIR=$(pwd)
 PACKAGE_DIR=llama.cpp
 SCRIPT_PATH=$(dirname $(realpath $0))
@@ -52,8 +52,7 @@ cd $PACKAGE_NAME
 git checkout $BRANCH
 git fetch --tags
 
-PACKAGE_TAG=$(git describe --tags --abbrev=0)
-PACKAGE_VERSION=${PACKAGE_TAG#b}
+WHEEL_VERSION=${PACKAGE_VERSION#b}
 
 echo "Building llama.cpp version: ${PACKAGE_VERSION}"
 
@@ -79,7 +78,7 @@ from setuptools.command.build_py import build_py
 import os, shutil, stat
 
 PYTHON_PACKAGE_NAME = "llama_cpp_python_package"
-VERSION = "${PACKAGE_VERSION}"
+VERSION = "${WHEEL_VERSION}"
 PKG_NAME = "llama_cpp_python_package"
 
 BUILD_DIR = os.path.join(os.getcwd(), "build_llama", "bin")

From 6ab242b15f20f8c7419953a742a9718073b3d0ba Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 15:07:29 +0530
Subject: [PATCH 08/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index b99bbf3116..06ad44d119 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -13,7 +13,7 @@
   "use_non_root_user": false,
 
   "b9882": {
-    "dir": "master_ubi_9",
+    "dir": "b9882_ubi_9",
     "build_script": "llama_cpp_ubi_9.6.sh",
     "base_docker_image": "registry.access.redhat.com/ubi9/ubi:9.6",
     "base_docker_variant": "redhat"

From 0ab28058be279ad0371c65b1ad5ffec70cccce81 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 15:08:27 +0530
Subject: [PATCH 09/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 1681f09cf3..e5d7ff51e9 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -49,8 +49,8 @@ gcc -v || true
 echo "**** Cloning llama.cpp repository..."
 git clone $PACKAGE_URL
 cd $PACKAGE_NAME
-git checkout $BRANCH
 git fetch --tags
+git checkout $PACKAGE_VERSION
 
 WHEEL_VERSION=${PACKAGE_VERSION#b}
 

From 84b258dbe7692aaf59192d2eca2f8af9f45a3473 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 15:12:41 +0530
Subject: [PATCH 10/34] Update Dockerfile

---
 l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile b/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
index a05fbe46fe..62d76d3b27 100644
--- a/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
+++ b/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
@@ -33,9 +33,8 @@ WORKDIR /src
 
 RUN git clone ${PACKAGE_URL} && \
     cd ${PACKAGE_NAME} && \
-    git checkout ${BRANCH} && \
     git fetch --tags && \
-    PACKAGE_VERSION=$(git describe --tags --abbrev=0) && \
+    git checkout ${PACKAGE_VERSION} && \
     echo "Building release ${PACKAGE_VERSION}"
 
 WORKDIR /src/${PACKAGE_NAME}

From 014addce0abebf5525561c76277d5c966a7cc011 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 15:14:31 +0530
Subject: [PATCH 11/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index 06ad44d119..b8c1e0e6ea 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -9,7 +9,7 @@
   "validate_build_script": true,
   "package_dir": "l/llama.cpp",
   "default_branch": "master",
-  "docker_cmd": "docker build -t ${package_name}-ppc64le:$PACKAGE_VERSION ${dir}",
+  "docker_cmd": "docker build --build-arg PACKAGE_VERSION=$PACKAGE_VERSION -t ${package_name}-ppc64le:$PACKAGE_VERSION ${dir}",
   "use_non_root_user": false,
 
   "b9882": {

From e3261b6b2a1404df2039707d0fc6205dda34fd92 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 15:16:54 +0530
Subject: [PATCH 12/34] Update Dockerfile

---
 l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile b/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
index 62d76d3b27..359c256158 100644
--- a/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
+++ b/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
@@ -5,6 +5,7 @@ FROM registry.access.redhat.com/ubi9/ubi:9.7 AS build
 
 ARG PACKAGE_NAME=llama.cpp
 ARG BRANCH=master
+ARG PACKAGE_VERSION
 ARG PACKAGE_URL=https://github.com/ggml-org/llama.cpp
 ENV CMAKE_VERSION=3.31.5
 

From 2386fe9fb18a092f1795fc33b773fde0549af586 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 6 Jul 2026 15:31:58 +0530
Subject: [PATCH 13/34] Rename Dockerfile to Dockerfile

---
 l/llama.cpp/Dockerfiles/{master_ubi_9 => b9882_ubi_9}/Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename l/llama.cpp/Dockerfiles/{master_ubi_9 => b9882_ubi_9}/Dockerfile (100%)

diff --git a/l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile b/l/llama.cpp/Dockerfiles/b9882_ubi_9/Dockerfile
similarity index 100%
rename from l/llama.cpp/Dockerfiles/master_ubi_9/Dockerfile
rename to l/llama.cpp/Dockerfiles/b9882_ubi_9/Dockerfile

From 9a174e5f4f3e061c2454a6186da40e30eea176d1 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 7 Jul 2026 14:26:45 +0530
Subject: [PATCH 14/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index b8c1e0e6ea..a73cff7530 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -3,7 +3,7 @@
   "package_name": "llama.cpp",
   "github_url": "https://github.com/ggml-org/llama.cpp",
   "version": "b9882",
-  "wheel_build": true,
+  "wheel_build": false,
   "docker_build": true,
   "build_script": "llama_cpp_ubi_9.6.sh",
   "validate_build_script": true,

From fc46e1c2c2fa9e900289e66c39e9f3b9a5184ed0 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 27 Jul 2026 15:37:32 +0530
Subject: [PATCH 15/34] Update llama_cpp_ubi_9.6.sh

Make required changes so that wheel is bult properly with version number and can be installed.
---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 306 ++++++++++++++++++++-----------
 1 file changed, 203 insertions(+), 103 deletions(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index e5d7ff51e9..08330d8b78 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -1,3 +1,4 @@
+
 #!/bin/bash
 # -----------------------------------------------------------------------------
 #
@@ -42,132 +43,228 @@ gcc --version
 echo "**** Checking GCC version..."
 gcc -v || true
 
-# -----------------------------------------------------------------------------
-# Clone latest llama.cpp 
-# -----------------------------------------------------------------------------
+# Accept tag (e.g. b5046) or branch (master)
+PACKAGE_VERSION="${PACKAGE_VERSION:-master}"
+
+CURRENT_DIR=$(pwd)
+SCRIPT_PATH=$(dirname "$(realpath "$0")")
+
+###############################################################################
+# Clone repository
+###############################################################################
+
+cd "$CURRENT_DIR"
+
+rm -rf "$PACKAGE_NAME"
+
+echo "Cloning llama.cpp..."
+
+git clone "$PACKAGE_URL"
+
+cd "$PACKAGE_NAME"
 
-echo "**** Cloning llama.cpp repository..."
-git clone $PACKAGE_URL
-cd $PACKAGE_NAME
 git fetch --tags
-git checkout $PACKAGE_VERSION
 
-WHEEL_VERSION=${PACKAGE_VERSION#b}
+git checkout "$PACKAGE_VERSION"
 
-echo "Building llama.cpp version: ${PACKAGE_VERSION}"
+###############################################################################
+# Determine build number for wheel version
+###############################################################################
 
-# -----------------------------------------------------------------------------
+if [[ "$PACKAGE_VERSION" =~ ^b[0-9]+$ ]]; then
+    BUILD_TAG="$PACKAGE_VERSION"
+else
+    BUILD_TAG=$(git describe --tags --match "b*" --abbrev=0)
+fi
+
+WHEEL_VERSION="${BUILD_TAG#b}"
+
+echo
+echo "Repository Version : $PACKAGE_VERSION"
+echo "Build Tag          : $BUILD_TAG"
+echo "Wheel Version      : 1.0+ppc64le${WHEEL_VERSION}"
+echo
+
+###############################################################################
 # Build llama.cpp
-# -----------------------------------------------------------------------------
+###############################################################################
+
+echo "Configuring CMake..."
 cmake -B build_llama
-if ! cmake --build build_llama -j$(nproc); then
-    echo "------------------$PACKAGE_NAME:Build_fails-------------------------------------"
-    exit 1
-fi
+echo "Building..."
+cmake --build build_llama -j"$(nproc)"
+
+echo
+echo "Build completed successfully."
+echo
+
+###############################################################################
+# Verify required binaries
+###############################################################################
+
+BUILD_DIR="$CURRENT_DIR/$PACKAGE_NAME/build_llama/bin"
+REQUIRED_BINS=(
+    llama-cli
+    llama-server
+    llama-bench
+    llama-batched-bench
+)
+echo "Verifying generated binaries..."
 
+for bin in "${REQUIRED_BINS[@]}"; do
+    if [[ ! -f "$BUILD_DIR/$bin" ]]; then
+        echo "ERROR: Missing binary $bin"
+        exit 1
+    fi
+done
 
-# -----------------------------------------------------------------------------
-# Auto-generate setup.py and minimal package structure for wheel build
-# -----------------------------------------------------------------------------
-echo "**** Creating setup.py and package files ****"
+echo
+echo "All required binaries generated successfully."
+
+###############################################################################
+# Create standalone packaging directory
+###############################################################################
+
+echo "========================================================="
+echo "Creating standalone wheel package"
+echo "========================================================="
+
+cd "$CURRENT_DIR"
+
+PKG_ROOT="$CURRENT_DIR/llama_cpp_pkg"
+PKG_NAME="llama_cpp_python_package"
+
+rm -rf "$PKG_ROOT"
+
+mkdir -p "$PKG_ROOT/$PKG_NAME/bin"
+mkdir -p "$PKG_ROOT/$PKG_NAME/lib"
+
+###############################################################################
+# Copy executables
+###############################################################################
+
+echo "Copying executables..."
 
-# Generate setup.py
-cat <<EOF > setup.py
+BINARIES=(
+    llama-cli
+    llama-server
+    llama-bench
+    llama-batched-bench
+)
+
+for bin in "${BINARIES[@]}"; do
+    cp "$BUILD_DIR/$bin" "$PKG_ROOT/$PKG_NAME/bin/"
+    chmod +x "$PKG_ROOT/$PKG_NAME/bin/$bin"
+done
+
+###############################################################################
+# Copy all shared libraries
+###############################################################################
+
+echo "Copying shared libraries..."
+
+find "$BUILD_DIR" -maxdepth 1 \( -name "*.so" -o -name "*.so.*" \) \
+    -exec cp -a {} "$PKG_ROOT/$PKG_NAME/lib/" \;
+
+###############################################################################
+# Package __init__.py
+###############################################################################
+
+cat > "$PKG_ROOT/$PKG_NAME/__init__.py" <<'EOF'
+"""
+Standalone llama.cpp binaries packaged as a Python wheel.
+"""
+EOF
+
+###############################################################################
+# Launcher module
+###############################################################################
+
+cat > "$PKG_ROOT/$PKG_NAME/launcher.py" <<'EOF'
+import subprocess
+from pathlib import Path
+import sys
+
+BIN_DIR = Path(__file__).parent / "bin"
+
+def run(binary):
+    exe = BIN_DIR / binary
+    raise SystemExit(
+        subprocess.call([str(exe)] + sys.argv[1:])
+    )
+
+def llama_cli():
+    run("llama-cli")
+
+def llama_server():
+    run("llama-server")
+
+def llama_bench():
+    run("llama-bench")
+
+def llama_batched_bench():
+    run("llama-batched-bench")
+EOF
+
+###############################################################################
+# setup.py
+###############################################################################
+
+cat > "$PKG_ROOT/setup.py" <<EOF
 from setuptools import setup, find_packages
-from setuptools.command.build_py import build_py
-import os, shutil, stat
-
-PYTHON_PACKAGE_NAME = "llama_cpp_python_package"
-VERSION = "${WHEEL_VERSION}"
-PKG_NAME = "llama_cpp_python_package"
-
-BUILD_DIR = os.path.join(os.getcwd(), "build_llama", "bin")
-
-BINARIES = [
-    "llama-cli",
-    "llama-server",
-    "llama-bench",
-    "llama-batched-bench",
-]
-
-LIBRARIES = [
-    "libllama-bench-impl.so",
-    "libllama-common.so.0",
-    "libllama.so.0",
-    "libggml.so.0",
-    "libggml-cpu.so.0",
-    "libggml-base.so.0",
-]
-
-PKG_BIN_DIR = os.path.join(PYTHON_PACKAGE_NAME, "bin")
-PKG_LIB_DIR = os.path.join(PYTHON_PACKAGE_NAME, "lib")
-
-def make_executable(path):
-    st = os.stat(path)
-    os.chmod(path, st.st_mode | stat.S_IEXEC)
-
-class CustomBuild(build_py):
-    def run(self):
-        os.makedirs(PKG_BIN_DIR, exist_ok=True)
-        os.makedirs(PKG_LIB_DIR, exist_ok=True)
-
-        # Copy ollama binary
-        if os.path.exists(BUILD_DIR):
-            print(f"Copying binaries to {PKG_BIN_DIR}")
-            for binary in BINARIES:
-                src = os.path.join(BUILD_DIR, binary)
-
-                if not os.path.exists(src):
-                    print(f"Warning: {src} not found")
-                    continue
-
-                dst = os.path.join(PKG_BIN_DIR, binary)
-                shutil.copy2(src, dst)
-                make_executable(dst)
-        else:
-            print("Warning: llama.cpp binaries not found")
-
-        # Copy .so libraries
-        if os.path.exists(BUILD_DIR):
-            for lib in LIBRARIES:
-                src = os.path.join(BUILD_DIR, lib)
-
-                if os.path.exists(src):
-                   shutil.copy2(src, os.path.join(PKG_LIB_DIR, lib))
-        else:
-            print(f"Warning: {lib} not found")
-            
-        super().run()
 
 setup(
-    name=PYTHON_PACKAGE_NAME,
-    version=VERSION,
+    name="llama_cpp_python_package",
+    version="1.0+ppc64le${WHEEL_VERSION}",
+    description="Standalone llama.cpp binaries",
     author="Shalini Salomi Bodapati",
     author_email="Shalini.Salomi.Bodapati@ibm.com",
-    description="llama.cpp binaries + shared libs as Python package",
-    license="MIT",
-    packages=find_packages(include=["llama_cpp_python_package"]),
-    include_package_data=False,
-    cmdclass={'build_py': CustomBuild},
-    package_data={PYTHON_PACKAGE_NAME: ["bin/*", "lib/*.so"]},
+
+    packages=find_packages(),
+
+    include_package_data=True,
+
+    package_data={
+        "llama_cpp_python_package": [
+            "bin/*",
+            "lib/*",
+        ],
+    },
+
     python_requires=">=3.8",
+
+    zip_safe=False,
+
+    entry_points={
+        "console_scripts": [
+            "llama-cli=llama_cpp_python_package.launcher:llama_cli",
+            "llama-server=llama_cpp_python_package.launcher:llama_server",
+            "llama-bench=llama_cpp_python_package.launcher:llama_bench",
+            "llama-batched-bench=llama_cpp_python_package.launcher:llama_batched_bench",
+        ],
+    },
 )
 EOF
 
-# Create __init__.py (wrapper)
-cat <<'EOF' > ${PKG_NAME}/__init__.py
-import subprocess
-from pathlib import Path
+###############################################################################
+# MANIFEST.in
+###############################################################################
 
-def run(args=None):
-    """Run llama-cli packaged with this wheel."""
-    bin_path = Path(__file__).parent / "bin" / "llama-cli"
-    if not bin_path.exists():
-        raise FileNotFoundError("llama-cli binary not found.")
-    subprocess.run([str(bin_path)] + (args or []))
+cat > "$PKG_ROOT/MANIFEST.in" <<EOF
+recursive-include ${PKG_NAME}/bin *
+recursive-include ${PKG_NAME}/lib *
 EOF
 
+###############################################################################
+# Build wheel
+###############################################################################
+
+echo
+echo "Building wheel..."
+echo
+
 echo "=============== Building wheel =================="
+cd "$PKG_ROOT"
 python -m pip install --upgrade pip setuptools wheel build
 
 if ! python setup.py bdist_wheel --plat-name linux_ppc64le --dist-dir "$CURRENT_DIR/"; then
@@ -175,4 +272,7 @@ if ! python setup.py bdist_wheel --plat-name linux_ppc64le --dist-dir "$CURRENT_
     EXIT_CODE=1
 else
     echo "============ Wheel successfully built ================="
+    ls -lh "$CURRENT_DIR"/*.whl
+    echo "Wheel version:"
+    echo "1.0+ppc64le${WHEEL_VERSION}"
 fi

From 44118dc6d5c4b9969b0b51998281280ca1bd95c7 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 27 Jul 2026 15:42:42 +0530
Subject: [PATCH 16/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 08330d8b78..d0da5a74ac 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -1,4 +1,3 @@
-
 #!/bin/bash
 # -----------------------------------------------------------------------------
 #
@@ -18,7 +17,6 @@
 #             contact "Maintainer" of this script.
 #
 # -----------------------------------------------------------------------------
-
 set -e
 
 # Variables
@@ -54,17 +52,11 @@ SCRIPT_PATH=$(dirname "$(realpath "$0")")
 ###############################################################################
 
 cd "$CURRENT_DIR"
-
 rm -rf "$PACKAGE_NAME"
-
 echo "Cloning llama.cpp..."
-
 git clone "$PACKAGE_URL"
-
 cd "$PACKAGE_NAME"
-
 git fetch --tags
-
 git checkout "$PACKAGE_VERSION"
 
 ###############################################################################
@@ -76,14 +68,11 @@ if [[ "$PACKAGE_VERSION" =~ ^b[0-9]+$ ]]; then
 else
     BUILD_TAG=$(git describe --tags --match "b*" --abbrev=0)
 fi
-
 WHEEL_VERSION="${BUILD_TAG#b}"
 
-echo
 echo "Repository Version : $PACKAGE_VERSION"
 echo "Build Tag          : $BUILD_TAG"
 echo "Wheel Version      : 1.0+ppc64le${WHEEL_VERSION}"
-echo
 
 ###############################################################################
 # Build llama.cpp

From c8215010e72cdc2bc8b67d45519db5609d0da0fa Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 27 Jul 2026 16:13:44 +0530
Subject: [PATCH 17/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index a73cff7530..b8dfa57b0c 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -2,8 +2,8 @@
   "maintainer": "shalinib-ibm",
   "package_name": "llama.cpp",
   "github_url": "https://github.com/ggml-org/llama.cpp",
-  "version": "b9882",
-  "wheel_build": false,
+  "version": "b10145",
+  "wheel_build": true,
   "docker_build": true,
   "build_script": "llama_cpp_ubi_9.6.sh",
   "validate_build_script": true,

From bf05bde175bfe23483c7bef1cfe0751bf1be13fc Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 27 Jul 2026 16:45:31 +0530
Subject: [PATCH 18/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index b8dfa57b0c..2185c04f9f 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -12,8 +12,8 @@
   "docker_cmd": "docker build --build-arg PACKAGE_VERSION=$PACKAGE_VERSION -t ${package_name}-ppc64le:$PACKAGE_VERSION ${dir}",
   "use_non_root_user": false,
 
-  "b9882": {
-    "dir": "b9882_ubi_9",
+  "b10145": {
+    "dir": "b10145_ubi_9",
     "build_script": "llama_cpp_ubi_9.6.sh",
     "base_docker_image": "registry.access.redhat.com/ubi9/ubi:9.6",
     "base_docker_variant": "redhat"

From fb290f41292d9f63b1d8eb7dae1a2957ae973f55 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 27 Jul 2026 16:47:23 +0530
Subject: [PATCH 19/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index d0da5a74ac..ff939e7129 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -57,6 +57,7 @@ echo "Cloning llama.cpp..."
 git clone "$PACKAGE_URL"
 cd "$PACKAGE_NAME"
 git fetch --tags
+echo "$PACKAGE_VERSION"
 git checkout "$PACKAGE_VERSION"
 
 ###############################################################################

From c60ef2718dbb35370c0060f4e6237acfc9e21641 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 27 Jul 2026 16:57:36 +0530
Subject: [PATCH 20/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index ff939e7129..abd23b63e6 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -21,7 +21,6 @@ set -e
 
 # Variables
 PACKAGE_NAME=llama.cpp
-PACKAGE_VERSION=${1:-master}
 PACKAGE_URL=https://github.com/ggml-org/llama.cpp
 CURRENT_DIR=$(pwd)
 PACKAGE_DIR=llama.cpp
@@ -58,20 +57,20 @@ git clone "$PACKAGE_URL"
 cd "$PACKAGE_NAME"
 git fetch --tags
 echo "$PACKAGE_VERSION"
-git checkout "$PACKAGE_VERSION"
+git checkout "$VERSION"
 
 ###############################################################################
 # Determine build number for wheel version
 ###############################################################################
 
-if [[ "$PACKAGE_VERSION" =~ ^b[0-9]+$ ]]; then
+if [[ "$VERSION" =~ ^b[0-9]+$ ]]; then
     BUILD_TAG="$PACKAGE_VERSION"
 else
     BUILD_TAG=$(git describe --tags --match "b*" --abbrev=0)
 fi
 WHEEL_VERSION="${BUILD_TAG#b}"
 
-echo "Repository Version : $PACKAGE_VERSION"
+echo "Repository Version : $VERSION"
 echo "Build Tag          : $BUILD_TAG"
 echo "Wheel Version      : 1.0+ppc64le${WHEEL_VERSION}"
 

From b3383c729ccb9414d3ed440e58d9b16a45d7fe89 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 27 Jul 2026 17:02:48 +0530
Subject: [PATCH 21/34] Rename Dockerfile to Dockerfile

---
 l/llama.cpp/Dockerfiles/{b9882_ubi_9 => b10145_ubi_9}/Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename l/llama.cpp/Dockerfiles/{b9882_ubi_9 => b10145_ubi_9}/Dockerfile (100%)

diff --git a/l/llama.cpp/Dockerfiles/b9882_ubi_9/Dockerfile b/l/llama.cpp/Dockerfiles/b10145_ubi_9/Dockerfile
similarity index 100%
rename from l/llama.cpp/Dockerfiles/b9882_ubi_9/Dockerfile
rename to l/llama.cpp/Dockerfiles/b10145_ubi_9/Dockerfile

From 1f6db848680d3e4a654d984ba3e643ee38d5b8b6 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 27 Jul 2026 17:03:35 +0530
Subject: [PATCH 22/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index abd23b63e6..d17f67392a 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -57,7 +57,7 @@ git clone "$PACKAGE_URL"
 cd "$PACKAGE_NAME"
 git fetch --tags
 echo "$PACKAGE_VERSION"
-git checkout "$VERSION"
+git checkout "$PACKAGE_VERSION"
 
 ###############################################################################
 # Determine build number for wheel version

From 90bc9d26ce2a6347d199e8c357a85101e7471a61 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 12:29:33 +0530
Subject: [PATCH 23/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index d17f67392a..3b98a2dbc1 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -22,6 +22,7 @@ set -e
 # Variables
 PACKAGE_NAME=llama.cpp
 PACKAGE_URL=https://github.com/ggml-org/llama.cpp
+PACKAGE_VERSION=${1:-master}
 CURRENT_DIR=$(pwd)
 PACKAGE_DIR=llama.cpp
 SCRIPT_PATH=$(dirname $(realpath $0))
@@ -40,8 +41,6 @@ gcc --version
 echo "**** Checking GCC version..."
 gcc -v || true
 
-# Accept tag (e.g. b5046) or branch (master)
-PACKAGE_VERSION="${PACKAGE_VERSION:-master}"
 
 CURRENT_DIR=$(pwd)
 SCRIPT_PATH=$(dirname "$(realpath "$0")")
@@ -63,7 +62,7 @@ git checkout "$PACKAGE_VERSION"
 # Determine build number for wheel version
 ###############################################################################
 
-if [[ "$VERSION" =~ ^b[0-9]+$ ]]; then
+if [[ "$PACKAGE_VERSION" =~ ^b[0-9]+$ ]]; then
     BUILD_TAG="$PACKAGE_VERSION"
 else
     BUILD_TAG=$(git describe --tags --match "b*" --abbrev=0)

From c54ca8193f0696f3b8f763978610eef78e84c945 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 12:36:19 +0530
Subject: [PATCH 24/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index 2185c04f9f..45c11f3dbb 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -11,10 +11,9 @@
   "default_branch": "master",
   "docker_cmd": "docker build --build-arg PACKAGE_VERSION=$PACKAGE_VERSION -t ${package_name}-ppc64le:$PACKAGE_VERSION ${dir}",
   "use_non_root_user": false,
-
-  "b10145": {
-    "dir": "b10145_ubi_9",
-    "build_script": "llama_cpp_ubi_9.6.sh",
+  "*": {
+    "dir": "llama_cpp_latest",
+    "build_script": "llama_cpp_ubi_9.6.sh"
     "base_docker_image": "registry.access.redhat.com/ubi9/ubi:9.6",
     "base_docker_variant": "redhat"
   }

From d30d5152e9177add4cf863aff6d144a4faae25e3 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 12:37:01 +0530
Subject: [PATCH 25/34] Rename Dockerfile to Dockerfile

---
 .../Dockerfiles/{b10145_ubi_9 => llama_cpp_latest}/Dockerfile     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename l/llama.cpp/Dockerfiles/{b10145_ubi_9 => llama_cpp_latest}/Dockerfile (100%)

diff --git a/l/llama.cpp/Dockerfiles/b10145_ubi_9/Dockerfile b/l/llama.cpp/Dockerfiles/llama_cpp_latest/Dockerfile
similarity index 100%
rename from l/llama.cpp/Dockerfiles/b10145_ubi_9/Dockerfile
rename to l/llama.cpp/Dockerfiles/llama_cpp_latest/Dockerfile

From 49fbfeb04a59bff9811bca3c6d296b1cc2c66df1 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 12:46:17 +0530
Subject: [PATCH 26/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index 45c11f3dbb..c43ace7e5d 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -13,7 +13,7 @@
   "use_non_root_user": false,
   "*": {
     "dir": "llama_cpp_latest",
-    "build_script": "llama_cpp_ubi_9.6.sh"
+    "build_script": "llama_cpp_ubi_9.6.sh",
     "base_docker_image": "registry.access.redhat.com/ubi9/ubi:9.6",
     "base_docker_variant": "redhat"
   }

From cf41f1e2fb6c759adbbf6648346f91bda095f4c4 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 14:05:59 +0530
Subject: [PATCH 27/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 3b98a2dbc1..b252f57ce7 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------------------
 #
 # Package         : llama.cpp
-# Version         : Release TAG from build_info.json.
+# Version         : b10145
 # Source repo     : https://github.com/ggml-org/llama.cpp
 # Tested on       : UBI:9.6
 # Language        : C, C++

From 6063beb7ec1a0c1b5feef4f316fd8078b0da5c8b Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 14:24:24 +0530
Subject: [PATCH 28/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index b252f57ce7..99fc4fd097 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------------------
 #
 # Package         : llama.cpp
-# Version         : b10145
+# Version         : Release
 # Source repo     : https://github.com/ggml-org/llama.cpp
 # Tested on       : UBI:9.6
 # Language        : C, C++
@@ -44,7 +44,6 @@ gcc -v || true
 
 CURRENT_DIR=$(pwd)
 SCRIPT_PATH=$(dirname "$(realpath "$0")")
-
 ###############################################################################
 # Clone repository
 ###############################################################################
@@ -55,21 +54,30 @@ echo "Cloning llama.cpp..."
 git clone "$PACKAGE_URL"
 cd "$PACKAGE_NAME"
 git fetch --tags
-echo "$PACKAGE_VERSION"
-git checkout "$PACKAGE_VERSION"
+
+if [[ "$PACKAGE_VERSION" == "Release" ]]; then
+    LLAMA_CPP_VERSION=$(git describe --tags --match "b*" --abbrev=0)
+    echo "PACKAGE_VERSION is Release. Using latest build tag: $LLAMA_CPP_VERSION"
+else
+    LLAMA_CPP_VERSION="$PACKAGE_VERSION"
+fi
+
+echo "Checking out $LLAMA_CPP_VERSION"
+git checkout "$LLAMA_CPP_VERSION"
 
 ###############################################################################
 # Determine build number for wheel version
 ###############################################################################
 
-if [[ "$PACKAGE_VERSION" =~ ^b[0-9]+$ ]]; then
-    BUILD_TAG="$PACKAGE_VERSION"
+if [[ "$LLAMA_CPP_VERSION" =~ ^b[0-9]+$ ]]; then
+    BUILD_TAG="$LLAMA_CPP_VERSION"
 else
     BUILD_TAG=$(git describe --tags --match "b*" --abbrev=0)
 fi
+
 WHEEL_VERSION="${BUILD_TAG#b}"
 
-echo "Repository Version : $VERSION"
+echo "Repository Version : $PACKAGE_VERSION"
 echo "Build Tag          : $BUILD_TAG"
 echo "Wheel Version      : 1.0+ppc64le${WHEEL_VERSION}"
 

From 650651f84fb2463d879e462958a9142d19be59d7 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 14:25:35 +0530
Subject: [PATCH 29/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index c43ace7e5d..84e0649e59 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -2,19 +2,15 @@
   "maintainer": "shalinib-ibm",
   "package_name": "llama.cpp",
   "github_url": "https://github.com/ggml-org/llama.cpp",
-  "version": "b10145",
+  "version": "Release",
   "wheel_build": true,
-  "docker_build": true,
+  "docker_build": false,
   "build_script": "llama_cpp_ubi_9.6.sh",
   "validate_build_script": true,
   "package_dir": "l/llama.cpp",
   "default_branch": "master",
-  "docker_cmd": "docker build --build-arg PACKAGE_VERSION=$PACKAGE_VERSION -t ${package_name}-ppc64le:$PACKAGE_VERSION ${dir}",
   "use_non_root_user": false,
   "*": {
-    "dir": "llama_cpp_latest",
     "build_script": "llama_cpp_ubi_9.6.sh",
-    "base_docker_image": "registry.access.redhat.com/ubi9/ubi:9.6",
-    "base_docker_variant": "redhat"
   }
 }

From 5bc8edaf30098baaebecdabbe371d5b761a7497d Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 14:26:26 +0530
Subject: [PATCH 30/34] Delete l/llama.cpp/Dockerfiles directory

---
 .../Dockerfiles/llama_cpp_latest/Dockerfile   | 76 -------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 l/llama.cpp/Dockerfiles/llama_cpp_latest/Dockerfile

diff --git a/l/llama.cpp/Dockerfiles/llama_cpp_latest/Dockerfile b/l/llama.cpp/Dockerfiles/llama_cpp_latest/Dockerfile
deleted file mode 100644
index 359c256158..0000000000
--- a/l/llama.cpp/Dockerfiles/llama_cpp_latest/Dockerfile
+++ /dev/null
@@ -1,76 +0,0 @@
-###############################################################################
-# Stage 1: Build llama.cpp
-###############################################################################
-FROM registry.access.redhat.com/ubi9/ubi:9.7 AS build
-
-ARG PACKAGE_NAME=llama.cpp
-ARG BRANCH=master
-ARG PACKAGE_VERSION
-ARG PACKAGE_URL=https://github.com/ggml-org/llama.cpp
-ENV CMAKE_VERSION=3.31.5
-
-# Install dependencies
-RUN yum update -y && \
-    yum install -y \
-    python3.12 python3.12-devel \
-    gcc-toolset-15 gcc-toolset-15-binutils gcc-toolset-15-gcc-c++ \
-    git make cmake binutils wget patch tar gzip openssl-devel \
-    && yum clean all
-
-# Enable GCC toolset 15
-ENV PATH="/opt/rh/gcc-toolset-15/root/usr/bin:${PATH}"
-ENV LD_LIBRARY_PATH="/opt/rh/gcc-toolset-15/root/usr/lib64:${LD_LIBRARY_PATH}"
-ENV CC=/opt/rh/gcc-toolset-15/root/usr/bin/gcc
-ENV CXX=/opt/rh/gcc-toolset-15/root/usr/bin/g++
-
-# Install CMake (system)
-RUN yum install -y cmake
-
-
-###############################################################################
-# Clone and Build llama.cpp
-###############################################################################
-WORKDIR /src
-
-RUN git clone ${PACKAGE_URL} && \
-    cd ${PACKAGE_NAME} && \
-    git fetch --tags && \
-    git checkout ${PACKAGE_VERSION} && \
-    echo "Building release ${PACKAGE_VERSION}"
-
-WORKDIR /src/${PACKAGE_NAME}
-
-###############################################################################
-# Build llama.cpp (CMake)
-###############################################################################
-RUN cmake -B build -DCMAKE_BUILD_TYPE=Release && \
-    cmake --build build -j$(nproc)
-
-###############################################################################
-# Stage 2: Small runtime image
-###############################################################################
-FROM registry.access.redhat.com/ubi9/ubi:9.7
-
-RUN yum update -y && \
-    yum install -y libatomic openblas openblas-threads && \
-    yum clean all
-
-COPY --from=build /src/llama.cpp/build/bin/llama-cli /usr/bin/llama-cli
-COPY --from=build /src/llama.cpp/build/bin/llama-server /usr/bin/llama-server
-COPY --from=build /src/llama.cpp/build/bin/llama-bench /usr/bin/llama-bench
-COPY --from=build /src/llama.cpp/build/bin/llama-batched-bench /usr/bin/llama-batched-bench
-
-COPY --from=build /src/llama.cpp/build/bin/libllama-bench-impl.so /usr/lib/llama
-COPY --from=build /src/llama.cpp/build/bin/libllama-common.so.0 /usr/lib/llama
-COPY --from=build /src/llama.cpp/build/bin/libllama.so.0 /usr/lib/llama
-COPY --from=build /src/llama.cpp/build/bin/libggml.so.0 /usr/lib/llama
-COPY --from=build /src/llama.cpp/build/bin/libggml-base.so.0 /usr/lib/llama
-COPY --from=build /src/llama.cpp/build/bin/libggml-cpu.so.0 /usr/lib/llama
-
-
-ENV LD_LIBRARY_PATH=/usr/lib/llama:$LD_LIBRARY_PATH
-ENV PATH="/usr/bin:${PATH}"
-
-EXPOSE 8080
-ENTRYPOINT ["/usr/bin/llama-server"]
-CMD ["--help"]

From 3fc0b28dbaca3f4dec932fc2d4353dc605b134d1 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 14:32:49 +0530
Subject: [PATCH 31/34] Update build_info.json

---
 l/llama.cpp/build_info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/build_info.json b/l/llama.cpp/build_info.json
index 84e0649e59..bfb8fcf349 100644
--- a/l/llama.cpp/build_info.json
+++ b/l/llama.cpp/build_info.json
@@ -11,6 +11,6 @@
   "default_branch": "master",
   "use_non_root_user": false,
   "*": {
-    "build_script": "llama_cpp_ubi_9.6.sh",
+    "build_script": "llama_cpp_ubi_9.6.sh"
   }
 }

From 7810f13b963f8f4927a17bf46195ef20fa549165 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Tue, 28 Jul 2026 15:43:05 +0530
Subject: [PATCH 32/34] Update llama_cpp_ubi_9.6.sh

---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 99fc4fd097..90a401a302 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -211,7 +211,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="llama_cpp_python_package",
-    version="1.0+ppc64le${WHEEL_VERSION}",
+    version="1.0+${WHEEL_VERSION}",
     description="Standalone llama.cpp binaries",
     author="Shalini Salomi Bodapati",
     author_email="Shalini.Salomi.Bodapati@ibm.com",

From 339d7298ea88af86e802483cf078d83952cbd4c6 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Thu, 30 Jul 2026 11:37:51 +0530
Subject: [PATCH 33/34] Apply suggestion from @cdeepali

Co-authored-by: Deepali <70963368+cdeepali@users.noreply.github.com>
---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index 90a401a302..f42d216207 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -270,5 +270,5 @@ else
     echo "============ Wheel successfully built ================="
     ls -lh "$CURRENT_DIR"/*.whl
     echo "Wheel version:"
-    echo "1.0+ppc64le${WHEEL_VERSION}"
+    echo "1.0+${WHEEL_VERSION}"
 fi

From e54750c622781f92c57097b3c23ac7ab28f6aac7 Mon Sep 17 00:00:00 2001
From: shalinib-ibm <Shalini.Salomi.Bodapati@ibm.com>
Date: Thu, 30 Jul 2026 11:38:21 +0530
Subject: [PATCH 34/34] Apply suggestion from @cdeepali

Co-authored-by: Deepali <70963368+cdeepali@users.noreply.github.com>
---
 l/llama.cpp/llama_cpp_ubi_9.6.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l/llama.cpp/llama_cpp_ubi_9.6.sh b/l/llama.cpp/llama_cpp_ubi_9.6.sh
index f42d216207..2e515d3315 100644
--- a/l/llama.cpp/llama_cpp_ubi_9.6.sh
+++ b/l/llama.cpp/llama_cpp_ubi_9.6.sh
@@ -79,7 +79,7 @@ WHEEL_VERSION="${BUILD_TAG#b}"
 
 echo "Repository Version : $PACKAGE_VERSION"
 echo "Build Tag          : $BUILD_TAG"
-echo "Wheel Version      : 1.0+ppc64le${WHEEL_VERSION}"
+echo "Wheel Version      : 1.0+${WHEEL_VERSION}"
 
 ###############################################################################
 # Build llama.cpp