From bf0d0839756cdc19e15e9125e8cf840e07a46e2c Mon Sep 17 00:00:00 2001
From: Donato Capitella <donato.capitella@reversec.com>
Date: Sun, 16 Nov 2025 08:25:25 +0000
Subject: [PATCH] Dropping PR 15405 (llama.cpp RPC experimental improvement)
 due to compile issue

---
 toolboxes/Dockerfile.rocm-6.4.2                   | 5 -----
 toolboxes/Dockerfile.rocm-6.4.2-rocwmma           | 5 -----
 toolboxes/Dockerfile.rocm-6.4.3                   | 5 -----
 toolboxes/Dockerfile.rocm-6.4.3-rocwmma           | 5 -----
 toolboxes/Dockerfile.rocm-6.4.4                   | 5 -----
 toolboxes/Dockerfile.rocm-6.4.4-rocwmma           | 5 -----
 toolboxes/Dockerfile.rocm-7.1                     | 5 -----
 toolboxes/Dockerfile.rocm-7.1-rocwmma             | 5 -----
 toolboxes/Dockerfile.rocm-7alpha                  | 4 ----
 toolboxes/Dockerfile.rocm-7alpha-rocwmma          | 4 ----
 toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved | 4 ----
 toolboxes/Dockerfile.rocm-7beta                   | 5 -----
 toolboxes/Dockerfile.rocm-7rc                     | 4 ----
 toolboxes/Dockerfile.rocm-7rc-rocwmma             | 4 ----
 toolboxes/Dockerfile.vulkan-amdvlk                | 5 -----
 toolboxes/Dockerfile.vulkan-radv                  | 5 -----
 16 files changed, 75 deletions(-)

diff --git a/toolboxes/Dockerfile.rocm-6.4.2 b/toolboxes/Dockerfile.rocm-6.4.2
index 4e7cee2..d88b6d3 100644
--- a/toolboxes/Dockerfile.rocm-6.4.2
+++ b/toolboxes/Dockerfile.rocm-6.4.2
@@ -14,11 +14,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build + install
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
     cmake -S . -B build \
diff --git a/toolboxes/Dockerfile.rocm-6.4.2-rocwmma b/toolboxes/Dockerfile.rocm-6.4.2-rocwmma
index 78b478c..73c0c38 100644
--- a/toolboxes/Dockerfile.rocm-6.4.2-rocwmma
+++ b/toolboxes/Dockerfile.rocm-6.4.2-rocwmma
@@ -20,11 +20,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build + install
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
     cmake -S . -B build \
diff --git a/toolboxes/Dockerfile.rocm-6.4.3 b/toolboxes/Dockerfile.rocm-6.4.3
index c2ea70f..7fd1ad4 100644
--- a/toolboxes/Dockerfile.rocm-6.4.3
+++ b/toolboxes/Dockerfile.rocm-6.4.3
@@ -38,11 +38,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && cmake -S . -B build \
       -DGGML_HIP=ON \
diff --git a/toolboxes/Dockerfile.rocm-6.4.3-rocwmma b/toolboxes/Dockerfile.rocm-6.4.3-rocwmma
index 6afd2b5..e7c2151 100644
--- a/toolboxes/Dockerfile.rocm-6.4.3-rocwmma
+++ b/toolboxes/Dockerfile.rocm-6.4.3-rocwmma
@@ -44,11 +44,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && cmake -S . -B build \
       -DGGML_HIP=ON \
diff --git a/toolboxes/Dockerfile.rocm-6.4.4 b/toolboxes/Dockerfile.rocm-6.4.4
index fc5e037..14ff087 100644
--- a/toolboxes/Dockerfile.rocm-6.4.4
+++ b/toolboxes/Dockerfile.rocm-6.4.4
@@ -38,11 +38,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && cmake -S . -B build \
       -DGGML_HIP=ON \
diff --git a/toolboxes/Dockerfile.rocm-6.4.4-rocwmma b/toolboxes/Dockerfile.rocm-6.4.4-rocwmma
index 5a11424..f89e5cc 100644
--- a/toolboxes/Dockerfile.rocm-6.4.4-rocwmma
+++ b/toolboxes/Dockerfile.rocm-6.4.4-rocwmma
@@ -42,11 +42,6 @@ WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive
 
 # overwrite upstream header with our local fixed version
diff --git a/toolboxes/Dockerfile.rocm-7.1 b/toolboxes/Dockerfile.rocm-7.1
index 40eff5b..8182b60 100644
--- a/toolboxes/Dockerfile.rocm-7.1
+++ b/toolboxes/Dockerfile.rocm-7.1
@@ -38,11 +38,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && cmake -S . -B build \
       -DGGML_HIP=ON \
diff --git a/toolboxes/Dockerfile.rocm-7.1-rocwmma b/toolboxes/Dockerfile.rocm-7.1-rocwmma
index a4422db..da2734e 100644
--- a/toolboxes/Dockerfile.rocm-7.1-rocwmma
+++ b/toolboxes/Dockerfile.rocm-7.1-rocwmma
@@ -47,11 +47,6 @@ RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.c
 
 # build
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && cmake -S . -B build \
       -DGGML_HIP=ON \
diff --git a/toolboxes/Dockerfile.rocm-7alpha b/toolboxes/Dockerfile.rocm-7alpha
index 6482ddd..842e0e9 100644
--- a/toolboxes/Dockerfile.rocm-7alpha
+++ b/toolboxes/Dockerfile.rocm-7alpha
@@ -56,10 +56,6 @@ RUN printf '%s\n' \
 WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
  && git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive
 
 RUN cmake -S . -B build \
diff --git a/toolboxes/Dockerfile.rocm-7alpha-rocwmma b/toolboxes/Dockerfile.rocm-7alpha-rocwmma
index df4eca5..3f3a795 100644
--- a/toolboxes/Dockerfile.rocm-7alpha-rocwmma
+++ b/toolboxes/Dockerfile.rocm-7alpha-rocwmma
@@ -60,10 +60,6 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh
 WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
  && git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive
 COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh
 RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.cpp
diff --git a/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved b/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved
index 16be308..b34dbf2 100644
--- a/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved
+++ b/toolboxes/Dockerfile.rocm-7alpha-rocwmma-improved
@@ -60,10 +60,6 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh
 WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/hjc4869/llama.cpp.git . \
  && git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive
 COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh
 RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.cpp
diff --git a/toolboxes/Dockerfile.rocm-7beta b/toolboxes/Dockerfile.rocm-7beta
index 46aa581..409bc24 100644
--- a/toolboxes/Dockerfile.rocm-7beta
+++ b/toolboxes/Dockerfile.rocm-7beta
@@ -37,11 +37,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
     cmake -S . -B build \
diff --git a/toolboxes/Dockerfile.rocm-7rc b/toolboxes/Dockerfile.rocm-7rc
index d666dd7..11b27e6 100644
--- a/toolboxes/Dockerfile.rocm-7rc
+++ b/toolboxes/Dockerfile.rocm-7rc
@@ -55,10 +55,6 @@ RUN printf '%s\n' \
 WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
  && git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive
 
 RUN cmake -S . -B build \
diff --git a/toolboxes/Dockerfile.rocm-7rc-rocwmma b/toolboxes/Dockerfile.rocm-7rc-rocwmma
index 15b91fd..f788f3b 100644
--- a/toolboxes/Dockerfile.rocm-7rc-rocwmma
+++ b/toolboxes/Dockerfile.rocm-7rc-rocwmma
@@ -60,10 +60,6 @@ WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
  && git clean -xdf \
  && git submodule update --recursive \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405
 
 COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh
 RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.cpp
diff --git a/toolboxes/Dockerfile.vulkan-amdvlk b/toolboxes/Dockerfile.vulkan-amdvlk
index e7053e9..a4d9e37 100644
--- a/toolboxes/Dockerfile.vulkan-amdvlk
+++ b/toolboxes/Dockerfile.vulkan-amdvlk
@@ -21,11 +21,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && cmake -S . -B build -G Ninja \
       -DGGML_VULKAN=ON \
diff --git a/toolboxes/Dockerfile.vulkan-radv b/toolboxes/Dockerfile.vulkan-radv
index 42668e2..a8c197f 100644
--- a/toolboxes/Dockerfile.vulkan-radv
+++ b/toolboxes/Dockerfile.vulkan-radv
@@ -15,11 +15,6 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build
 RUN git clean -xdf \
- && git config user.email "builder@localhost" \
- && git config user.name "Container Builder" \
- && git pull \
- && git fetch origin pull/15405/head:pr-15405 \
- && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && cmake -S . -B build -G Ninja \
       -DGGML_VULKAN=ON \