diff --git a/01-build-verbose.patch b/01-build-verbose.patch deleted file mode 100644 index 58e8e18..0000000 --- a/01-build-verbose.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/llama/make/Makefile.default b/llama/make/Makefile.default -index 95b13a7..6a9b9ef 100644 ---- a/llama/make/Makefile.default -+++ b/llama/make/Makefile.default -@@ -24,17 +24,17 @@ all: $(BUILD_RUNNERS) $(DIST_RUNNERS) $(PAYLOAD_RUNNERS) - $(RUNNERS_BUILD_DIR)/$(DEFAULT_RUNNER)/ollama_llama_server$(EXE_EXT): TARGET_CPU_FLAGS=$(CUSTOM_CPU_FLAGS) - $(RUNNERS_BUILD_DIR)/$(DEFAULT_RUNNER)/ollama_llama_server$(EXE_EXT): *.go ./runner/*.go $(COMMON_SRCS) $(COMMON_HDRS) - @-mkdir -p $(dir $@) -- GOARCH=$(ARCH) go build -buildmode=pie $(CPU_GOFLAGS) -trimpath $(if $(CUSTOM_CPU_FLAGS),-tags $(subst $(space),$(comma),$(CUSTOM_CPU_FLAGS))) -o $@ ./runner -+ GOARCH=$(ARCH) go build -buildmode=pie -v $(CPU_GOFLAGS) -trimpath $(if $(CUSTOM_CPU_FLAGS),-tags $(subst $(space),$(comma),$(CUSTOM_CPU_FLAGS))) -o $@ ./runner - - $(RUNNERS_BUILD_DIR)/cpu_avx/ollama_llama_server$(EXE_EXT): TARGET_CPU_FLAGS="avx" - $(RUNNERS_BUILD_DIR)/cpu_avx/ollama_llama_server$(EXE_EXT): *.go ./runner/*.go $(COMMON_SRCS) $(COMMON_HDRS) - @-mkdir -p $(dir $@) -- GOARCH=$(ARCH) go build -buildmode=pie $(CPU_GOFLAGS) -trimpath -tags $(subst $(space),$(comma),$(TARGET_CPU_FLAGS)) -o $@ ./runner -+ GOARCH=$(ARCH) go build -buildmode=pie -v $(CPU_GOFLAGS) -trimpath -tags $(subst $(space),$(comma),$(TARGET_CPU_FLAGS)) -o $@ ./runner - - $(RUNNERS_BUILD_DIR)/cpu_avx2/ollama_llama_server$(EXE_EXT): TARGET_CPU_FLAGS="avx avx2" - $(RUNNERS_BUILD_DIR)/cpu_avx2/ollama_llama_server$(EXE_EXT): *.go ./runner/*.go $(COMMON_SRCS) $(COMMON_HDRS) - @-mkdir -p $(dir $@) -- GOARCH=$(ARCH) go build -buildmode=pie $(CPU_GOFLAGS) -trimpath -tags $(subst $(space),$(comma),$(TARGET_CPU_FLAGS)) -o $@ ./runner -+ GOARCH=$(ARCH) go build -buildmode=pie -v $(CPU_GOFLAGS) -trimpath -tags $(subst $(space),$(comma),$(TARGET_CPU_FLAGS)) -o $@ ./runner - - $(RUNNERS_DIST_DIR)/%: $(RUNNERS_BUILD_DIR)/% - @-mkdir -p $(dir $@) -@@ -44,7 +44,7 @@ $(RUNNERS_PAYLOAD_DIR)/%/ollama_llama_server$(EXE_EXT).gz: $(RUNNERS_BUILD_DIR)/ - @-mkdir -p $(dir $@) - ${GZIP} --best -c $< > $@ - --clean: -+clean: - rm -f $(BUILD_RUNNERS) $(DIST_RUNNERS) $(PAYLOAD_RUNNERS) - - .PHONY: clean all diff --git a/_service b/_service index 4563a54..1f6f5ed 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/ollama/ollama.git git - v0.5.1 + v0.5.7 @PARENT_TAG@ v(.*) enable diff --git a/_servicedata b/_servicedata index 11239ea..adb73c6 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/ollama/ollama.git - de52b6c2f90ff220ed9469167d51e3f5d7474fa2 \ No newline at end of file + a420a453b4783841e3e79c248ef0fe9548df6914 \ No newline at end of file diff --git a/ollama-0.5.1.obscpio b/ollama-0.5.1.obscpio deleted file mode 100644 index fa2783d..0000000 --- a/ollama-0.5.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63c5155baa6ded2940ab8ff2bce7007bd44279de31c58ed11e99452c15c3e55c -size 18445837 diff --git a/ollama-0.5.7.obscpio b/ollama-0.5.7.obscpio new file mode 100644 index 0000000..6696d60 --- /dev/null +++ b/ollama-0.5.7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efb1f1510c40a71f933e8b1ad3b88acb499f017e1bfd271492d9ccf5b7a69d2c +size 154515982 diff --git a/ollama.changes b/ollama.changes index 93a2c5c..72db136 100644 --- a/ollama.changes +++ b/ollama.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Mon Jan 27 14:21:42 UTC 2025 - Adrian Schröter + +- Make ollama configurable by the admin via /etc/sysconfig/ollama + (boo#1236008) +- cleanup reproducible.patch + +------------------------------------------------------------------- +Thu Jan 16 23:52:45 UTC 2025 - Eyad Issa + +- Removed 01-build-verbose.patch: embedded GOFLAG into .spec file +- Disabled reproducible.patch: should be not needed, as .gz is + not produced anymore + +- Update to version 0.5.7: + * Fixed issue where using two FROM commands in Modelfile + * Support importing Command R and Command R+ architectures + from safetensors + +- Update to version 0.5.6: + * Fixed errors that would occur when running ollama create on + Windows and when using absolute paths + +- Update to version 0.5.5: + * New models: + ~ Phi-4 + ~ Command R7B + ~ DeepSeek-V3 + ~ OLMo 2 + ~ Dolphin 3 + ~ SmallThinker: + ~ Granite 3.1 Dense + ~ Granite 3.1 MoE + * The /api/create API endpoint that powers ollama create has + been changed to improve conversion time and also accept a JSON + object. + * Fixed runtime error that would occur when filling the model's + context window + * Fixed crash that would occur when quotes were used in /save + * Fixed errors that would occur when sending x-stainless headers + from OpenAI clients + +- Update to version 0.5.4: + * New model: Falcon3 + * Fixed issue where providing null to format would result in + an error + +- Update to version 0.5.3: + * Fixed runtime errors on older Intel Macs + * Fixed issue where setting the format field to "" would cause + an error + + +- Update to version 0.5.2: + * New model: EXAONE 3.5 + * Fixed issue where whitespace would get trimmed from prompt + when images were provided + * Improved memory estimation when scheduling models + * OLLAMA_ORIGINS will now check hosts in a case insensitive + manner + ------------------------------------------------------------------- Thu Dec 12 14:00:56 UTC 2024 - Bernhard Wiedemann diff --git a/ollama.obsinfo b/ollama.obsinfo index 04833d2..4c016bb 100644 --- a/ollama.obsinfo +++ b/ollama.obsinfo @@ -1,4 +1,4 @@ name: ollama -version: 0.5.1 -mtime: 1733523195 -commit: de52b6c2f90ff220ed9469167d51e3f5d7474fa2 +version: 0.5.7 +mtime: 1737018844 +commit: a420a453b4783841e3e79c248ef0fe9548df6914 diff --git a/ollama.service b/ollama.service index 22828b1..42eb593 100644 --- a/ollama.service +++ b/ollama.service @@ -8,6 +8,7 @@ User=ollama Group=ollama Restart=always RestartSec=3 +EnvironmentFile=-/etc/sysconfig/ollama [Install] WantedBy=default.target diff --git a/ollama.spec b/ollama.spec index 8124210..a6f2108 100644 --- a/ollama.spec +++ b/ollama.spec @@ -1,7 +1,7 @@ # # spec file for package ollama # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ollama -Version: 0.5.1 +Version: 0.5.7 Release: 0 Summary: Tool for running AI models on-premise License: MIT @@ -26,8 +26,7 @@ Source: %{name}-%{version}.tar Source1: vendor.tar.zstd Source2: ollama.service Source3: %{name}-user.conf -Patch1: 01-build-verbose.patch -Patch2: reproducible.patch +Source4: sysconfig.ollama BuildRequires: cmake >= 3.24 BuildRequires: git BuildRequires: sysuser-tools @@ -42,6 +41,7 @@ BuildRequires: libstdc++6-gcc12 %else BuildRequires: gcc-c++ >= 11.4.0 %endif +Requires(pre): %{fillup_prereq} %description Ollama is a tool for running AI models on one's own hardware. @@ -67,15 +67,16 @@ export CC=gcc-12 export GOFLAGS="-mod=vendor" %endif -export OLLAMA_SKIP_PATCHING=1 +export GOFLAGS="${GOFLAGS} -v" -go generate ./... -go build -v . +%make_build %install install -D -m 0755 %{name} %{buildroot}/%{_bindir}/%{name} + install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}-user.conf +install -D -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%name install -d %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p "%{buildroot}/%{_docdir}/%{name}" @@ -95,6 +96,7 @@ go test -v ./... %post %service_add_post %{name}.service +%fillup_only %preun %service_del_preun %{name}.service @@ -109,6 +111,7 @@ go test -v ./... %{_bindir}/%{name} %{_unitdir}/%{name}.service %{_sysusersdir}/%{name}-user.conf +%{_fillupdir}/sysconfig.%name %attr(-, ollama, ollama) %{_localstatedir}/lib/%{name} %changelog diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index 6066adc..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/llama/make/Makefile.default b/llama/make/Makefile.default -index 6a9b9ef..2ab7dfe 100644 ---- a/llama/make/Makefile.default -+++ b/llama/make/Makefile.default -@@ -42,7 +42,7 @@ $(RUNNERS_DIST_DIR)/%: $(RUNNERS_BUILD_DIR)/% - - $(RUNNERS_PAYLOAD_DIR)/%/ollama_llama_server$(EXE_EXT).gz: $(RUNNERS_BUILD_DIR)/%/ollama_llama_server$(EXE_EXT) - @-mkdir -p $(dir $@) -- ${GZIP} --best -c $< > $@ -+ ${GZIP} -n --best -c $< > $@ - - clean: - rm -f $(BUILD_RUNNERS) $(DIST_RUNNERS) $(PAYLOAD_RUNNERS) diff --git a/sysconfig.ollama b/sysconfig.ollama new file mode 100644 index 0000000..06184e0 --- /dev/null +++ b/sysconfig.ollama @@ -0,0 +1,58 @@ +## Path: Network/Ollama +## Description: Ollama server access +## Type: string +## Default: "http://127.0.0.1:11434" +## ServiceRestart: ollama +# +# set it to 0.0.0.0 for global network access +# +OLLAMA_HOST="http://127.0.0.1:11434" + +## Type: string +## Description: Ollama default quantization type for the K/V cache +## Default: "f16" +## ServiceRestart: ollama +OLLAMA_KV_CACHE_TYPE=f16 + +## Type: string +## Description: Ollama default quantization type for the K/V cache +## Default: "f16" +## ServiceRestart: ollama +OLLAMA_KEEP_ALIVE= + +## Type: string +## Description: Parallel processes +## Default: "" +## ServiceRestart: ollama +OLLAMA_NUM_PARALLEL= + +## Type: string +## Description: Maxmimal memory to be used +## Default: "" +## ServiceRestart: ollama +OLLAMA_MAX_VRAM= + +## Type: string +## Description: Ollama runner directory +## Default: "" +## ServiceRestart: ollama +OLLAMA_RUNNERS_DIR= + +## Type: string +## Description: Ollama temporary directory +## Default: "" +## ServiceRestart: ollama +OLLAMA_TMPDIR= + +## Type: string +## Description: Models to be loaded by default +## Default: "" +## ServiceRestart: ollama +OLLAMA_MODELS= + +## Type: string +## Description: List of allowed remote hosts +## Default: "" +## ServiceRestart: ollama +OLLAMA_ORIGINS= + diff --git a/vendor.tar.zstd b/vendor.tar.zstd index 9dbc5c2..186a849 100644 --- a/vendor.tar.zstd +++ b/vendor.tar.zstd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67e7c6793fd168073f049f2d7f1377a362a596e0ec623be098ff7d55b94b9e0e -size 5368998 +oid sha256:8859600b0cadcc09f5301ff86e18d25676e263146758e949aa614a5d6819e829 +size 5374849