github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-07 00:22:43 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[GH-ISSUE #9492] llama.cpp vendor patch instructions don't work #6181

New Issue
Open
opened 2026-04-12 17:33:04 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-12 17:33:04 -05:00
Owner
Copy Link

Originally created by @bjj on GitHub (Mar 4, 2025).
Original GitHub issue: https://github.com/ollama/ollama/issues/9492

What is the issue?

The README.md says:

make -f Makefile.sync apply-patches

If there are conflicts, you will see an error message. Resolve the conflicts in ./vendor/, and continue the patch series with git am --continue and rerun make -f Makefile.sync apply-patches. Repeat until all patches are successfully applied.

However, Makefile.sync does:

%.patched: %.patch
        @if git -c user.name=nobody -c 'user.email=<>' -C $(WORKDIR) am -3 $(realpath $<); then touch $@; else git -C $(WORKDIR) am --abort; exit 1; fi

The instructions seem to assume that the git am --abort is not in the Makefile.sync

Relevant log output

OS

Linux

GPU

AMD

CPU

Intel

Ollama version

55ab9f371a

Originally created by @bjj on GitHub (Mar 4, 2025). Original GitHub issue: https://github.com/ollama/ollama/issues/9492 ### What is the issue? The README.md says: ``` make -f Makefile.sync apply-patches ``` If there are conflicts, you will see an error message. Resolve the conflicts in ./vendor/, and continue the patch series with git am --continue and rerun make -f Makefile.sync apply-patches. Repeat until all patches are successfully applied. However, Makefile.sync does: ``` %.patched: %.patch @if git -c user.name=nobody -c 'user.email=<>' -C $(WORKDIR) am -3 $(realpath $<); then touch $@; else git -C $(WORKDIR) am --abort; exit 1; fi ``` The instructions seem to assume that the `git am --abort` is not in the `Makefile.sync` ### Relevant log output ```shell ``` ### OS Linux ### GPU AMD ### CPU Intel ### Ollama version 55ab9f371a198a190b423763a1d48e4495fe520e
GiteaMirror added the bug label 2026-04-12 17:33:04 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#6181
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?