Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: ollama-0.1.32
@ 2024-04-30 19:47 iFoundSilentHouse
  2024-04-30 19:59 ` [PR PATCH] [Updated] " iFoundSilentHouse
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: iFoundSilentHouse @ 2024-04-30 19:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]

There is a new pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages ollama
https://github.com/void-linux/void-packages/pull/50133

New package: ollama-0.1.32
I wanted to test ollama myself so reworked @ezag PR: https://github.com/void-linux/void-packages/pull/48199
Now it's fetching files the right way and updated to 0.1.32. I'm fine with @ezag maintaining it. Just wanted to share my progress

- I tested the changes in this PR: yes
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

- I built this PR locally for my native architecture, (x86-64-glibc)
- I built this PR locally for these architectures:
  - aarch64-musl

About archs: The only archs supported by upstream are x86 and arm64 so others were disabled
About `git init` line: `go generate` script has `git submodule` command so build doesn't work without `.git` folder.

Closes https://github.com/void-linux/void-packages/issues/50094
@ezag , thnx. @Bnyro , I used your review messages. Thnx

A patch file from https://github.com/void-linux/void-packages/pull/50133.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ollama-50133.patch --]
[-- Type: text/x-diff, Size: 2085 bytes --]

From 51133987046ed4151e339872713405647cb8e838 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 1 May 2024 01:35:33 +0600
Subject: [PATCH] New package: ollama

reworked @ezag PR: https://github.com/void-linux/void-packages/pull/48199
---
 srcpkgs/ollama/files/ollama/run |  4 ++++
 srcpkgs/ollama/template         | 36 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 srcpkgs/ollama/files/ollama/run
 create mode 100644 srcpkgs/ollama/template

diff --git a/srcpkgs/ollama/files/ollama/run b/srcpkgs/ollama/files/ollama/run
new file mode 100644
index 00000000000000..d74b1845a35fee
--- /dev/null
+++ b/srcpkgs/ollama/files/ollama/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+export USER=ollama
+exec chpst -u ollama:ollama ollama serve 2>&1
diff --git a/srcpkgs/ollama/template b/srcpkgs/ollama/template
new file mode 100644
index 00000000000000..b63c74e2c8ca0b
--- /dev/null
+++ b/srcpkgs/ollama/template
@@ -0,0 +1,36 @@
+# Template file for 'ollama'
+pkgname=ollama
+version=0.1.32
+_llama_cpp_hash=7593639ce335e8d7f89aa9a54d616951f273af60
+revision=1
+archs="i686 x86_64* aarch64*"
+build_style=go
+go_import_path="github.com/ollama/ollama"
+hostmakedepends="cmake git"
+short_desc="Get up and running with large language models, locally"
+maintainer="IFoundSilentHouse <adeptslab@gmail.com>"
+license="MIT"
+homepage="https://ollama.com/"
+system_accounts=ollama
+distfiles="https://github.com/ollama/ollama/archive/refs/tags/v${version}.tar.gz
+  https://github.com/ggerganov/llama.cpp/archive/${_llama_cpp_hash}.tar.gz>llama.cpp-${_llama_cpp_hash}.tgz"
+checksum="b8f43a9ce7731c8e19d801e6c08145e779ee607bf22864e495041e4440c5c283
+ 3183900a2825281df1bd6825b183f8df7febe9dfa666d3197ad6df44007678e1"
+
+skip_extraction=llama.cpp-${_llama_cpp_hash}.tgz
+
+post_extract() {
+	vsrcextract -C llm/llama.cpp llama.cpp-${_llama_cpp_hash}.tgz
+}
+
+pre_build() {
+	# "go generate" script uses "git submodule" command
+	git init
+	git add .
+	go generate ./...
+}
+
+post_install() {
+	vlicense LICENSE
+	vsv ollama
+}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] New package: ollama-0.1.32
  2024-04-30 19:47 [PR PATCH] New package: ollama-0.1.32 iFoundSilentHouse
@ 2024-04-30 19:59 ` iFoundSilentHouse
  2024-04-30 20:07 ` iFoundSilentHouse
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: iFoundSilentHouse @ 2024-04-30 19:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages ollama
https://github.com/void-linux/void-packages/pull/50133

New package: ollama-0.1.32
I wanted to test ollama myself so reworked @ezag PR: https://github.com/void-linux/void-packages/pull/48199
Now it's fetching files the right way and updated to 0.1.32. I'm fine with @ezag maintaining it. Just wanted to share my progress

- I tested the changes in this PR: yes
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

- I built this PR locally for my native architecture, (x86-64-glibc)
- I built this PR locally for these architectures:
  - aarch64-musl

About archs: The only archs supported by upstream are x86 and arm64 so others were disabled
About `git init` line: `go generate` script has `git submodule` command so build doesn't work without `.git` folder.

Closes https://github.com/void-linux/void-packages/issues/50094
@ezag , thnx. @Bnyro , I used your review messages. Thnx

A patch file from https://github.com/void-linux/void-packages/pull/50133.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ollama-50133.patch --]
[-- Type: text/x-diff, Size: 2087 bytes --]

From c4310727a342cf1b4ad2f05d15c941b7bdb5c116 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 1 May 2024 01:35:33 +0600
Subject: [PATCH] New package: ollama

reworked @ezag PR: https://github.com/void-linux/void-packages/pull/48199
---
 srcpkgs/ollama/files/ollama/run |  4 ++++
 srcpkgs/ollama/template         | 37 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/ollama/files/ollama/run
 create mode 100644 srcpkgs/ollama/template

diff --git a/srcpkgs/ollama/files/ollama/run b/srcpkgs/ollama/files/ollama/run
new file mode 100644
index 00000000000000..d74b1845a35fee
--- /dev/null
+++ b/srcpkgs/ollama/files/ollama/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+export USER=ollama
+exec chpst -u ollama:ollama ollama serve 2>&1
diff --git a/srcpkgs/ollama/template b/srcpkgs/ollama/template
new file mode 100644
index 00000000000000..d1cbaf323153f6
--- /dev/null
+++ b/srcpkgs/ollama/template
@@ -0,0 +1,37 @@
+# Template file for 'ollama'
+pkgname=ollama
+version=0.1.32
+revision=1
+_llama_cpp_hash=7593639ce335e8d7f89aa9a54d616951f273af60
+archs="i686 x86_64* aarch64*"
+build_style=go
+go_import_path="github.com/ollama/ollama"
+hostmakedepends="cmake git"
+short_desc="Get up and running with large language models, locally"
+maintainer="IFoundSilentHouse <adeptslab@gmail.com>"
+license="MIT"
+homepage="https://ollama.com/"
+distfiles="https://github.com/ollama/ollama/archive/refs/tags/v${version}.tar.gz
+ https://github.com/ggerganov/llama.cpp/archive/${_llama_cpp_hash}.tar.gz>llama.cpp-${_llama_cpp_hash}.tgz"
+checksum="b8f43a9ce7731c8e19d801e6c08145e779ee607bf22864e495041e4440c5c283
+ 3183900a2825281df1bd6825b183f8df7febe9dfa666d3197ad6df44007678e1"
+
+system_accounts=_ollama
+
+skip_extraction=llama.cpp-${_llama_cpp_hash}.tgz
+
+post_extract() {
+	vsrcextract -C llm/llama.cpp llama.cpp-${_llama_cpp_hash}.tgz
+}
+
+pre_build() {
+	# "go generate" script uses "git submodule" command
+	git init
+	git add .
+	go generate ./...
+}
+
+post_install() {
+	vlicense LICENSE
+	vsv ollama
+}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] New package: ollama-0.1.32
  2024-04-30 19:47 [PR PATCH] New package: ollama-0.1.32 iFoundSilentHouse
  2024-04-30 19:59 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-04-30 20:07 ` iFoundSilentHouse
  2024-05-12 13:05 ` ayoubelmhamdi
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: iFoundSilentHouse @ 2024-04-30 20:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages ollama
https://github.com/void-linux/void-packages/pull/50133

New package: ollama-0.1.32
I wanted to test ollama myself so reworked @ezag PR: https://github.com/void-linux/void-packages/pull/48199
Now it's fetching files the right way and updated to 0.1.32. I'm fine with @ezag maintaining it. Just wanted to share my progress

- I tested the changes in this PR: yes
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

- I built this PR locally for my native architecture, (x86-64-glibc)
- I built this PR locally for these architectures:
  - aarch64-musl

About archs: The only archs supported by upstream are x86 and arm64 so others were disabled
About `git init` line: `go generate` script has `git submodule` command so build doesn't work without `.git` folder.

Closes https://github.com/void-linux/void-packages/issues/50094
@ezag , thnx. @Bnyro , I used your review messages. Thnx

A patch file from https://github.com/void-linux/void-packages/pull/50133.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ollama-50133.patch --]
[-- Type: text/x-diff, Size: 2082 bytes --]

From ef03c533334a4500e76daf0d8a7fc4df789a05d0 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 1 May 2024 01:35:33 +0600
Subject: [PATCH] New package: ollama

reworked @ezag PR: https://github.com/void-linux/void-packages/pull/48199
---
 srcpkgs/ollama/files/ollama/run |  4 ++++
 srcpkgs/ollama/template         | 37 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/ollama/files/ollama/run
 create mode 100644 srcpkgs/ollama/template

diff --git a/srcpkgs/ollama/files/ollama/run b/srcpkgs/ollama/files/ollama/run
new file mode 100644
index 00000000000000..d74b1845a35fee
--- /dev/null
+++ b/srcpkgs/ollama/files/ollama/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+export USER=ollama
+exec chpst -u ollama:ollama ollama serve 2>&1
diff --git a/srcpkgs/ollama/template b/srcpkgs/ollama/template
new file mode 100644
index 00000000000000..12a03a00d7fe46
--- /dev/null
+++ b/srcpkgs/ollama/template
@@ -0,0 +1,37 @@
+# Template file for 'ollama'
+pkgname=ollama
+version=0.1.32
+revision=1
+_llama_cpp_hash=7593639ce335e8d7f89aa9a54d616951f273af60
+archs="x86_64* aarch64*"
+build_style=go
+go_import_path="github.com/ollama/ollama"
+hostmakedepends="cmake git"
+short_desc="Get up and running with large language models, locally"
+maintainer="IFoundSilentHouse <adeptslab@gmail.com>"
+license="MIT"
+homepage="https://ollama.com/"
+distfiles="https://github.com/ollama/ollama/archive/refs/tags/v${version}.tar.gz
+ https://github.com/ggerganov/llama.cpp/archive/${_llama_cpp_hash}.tar.gz>llama.cpp-${_llama_cpp_hash}.tgz"
+checksum="b8f43a9ce7731c8e19d801e6c08145e779ee607bf22864e495041e4440c5c283
+ 3183900a2825281df1bd6825b183f8df7febe9dfa666d3197ad6df44007678e1"
+
+system_accounts=_ollama
+
+skip_extraction=llama.cpp-${_llama_cpp_hash}.tgz
+
+post_extract() {
+	vsrcextract -C llm/llama.cpp llama.cpp-${_llama_cpp_hash}.tgz
+}
+
+pre_build() {
+	# "go generate" script uses "git submodule" command
+	git init
+	git add .
+	go generate ./...
+}
+
+post_install() {
+	vlicense LICENSE
+	vsv ollama
+}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: New package: ollama-0.1.32
  2024-04-30 19:47 [PR PATCH] New package: ollama-0.1.32 iFoundSilentHouse
  2024-04-30 19:59 ` [PR PATCH] [Updated] " iFoundSilentHouse
  2024-04-30 20:07 ` iFoundSilentHouse
@ 2024-05-12 13:05 ` ayoubelmhamdi
  2024-05-12 13:17 ` ayoubelmhamdi
  2024-05-12 13:19 ` ayoubelmhamdi
  4 siblings, 0 replies; 6+ messages in thread
From: ayoubelmhamdi @ 2024-05-12 13:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

New comment by ayoubelmhamdi on void-packages repository

https://github.com/void-linux/void-packages/pull/50133#issuecomment-2106240826

Comment:
what's about this problem:
https://github.com/void-linux/void-packages/blob/ef03c533334a4500e76daf0d8a7fc4df789a05d0/srcpkgs/ollama/files/ollama/run#L4

```
2024-05-12T13:03:36.79374 daemon.notice: May 12 14:03:36 ollama: chpst: fatal: unknown user/group: ollama:ollama
```

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: New package: ollama-0.1.32
  2024-04-30 19:47 [PR PATCH] New package: ollama-0.1.32 iFoundSilentHouse
                   ` (2 preceding siblings ...)
  2024-05-12 13:05 ` ayoubelmhamdi
@ 2024-05-12 13:17 ` ayoubelmhamdi
  2024-05-12 13:19 ` ayoubelmhamdi
  4 siblings, 0 replies; 6+ messages in thread
From: ayoubelmhamdi @ 2024-05-12 13:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]

New comment by ayoubelmhamdi on void-packages repository

https://github.com/void-linux/void-packages/pull/50133#issuecomment-2106240826

Comment:
what's about this problem:
https://github.com/void-linux/void-packages/blob/ef03c533334a4500e76daf0d8a7fc4df789a05d0/srcpkgs/ollama/files/ollama/run#L4

```
2024-05-12T13:03:36.79374 daemon.notice: May 12 14:03:36 ollama: chpst: fatal: unknown user/group: ollama:ollama
```

in [ollama.sh](https://ollama.com/install.sh) script:
```bash
configure_systemd() {
    if ! id ollama >/dev/null 2>&1; then
        status "Creating ollama user..."
        sudo useradd -r -s /bin/false -U -m -d /usr/share/ollama ollama
    fi
    if getent group render >/dev/null 2>&1; then
        sudo usermod -a -G render ollama
    fi
    if getent group video >/dev/null 2>&1; then
        status "Adding ollama user to video group..."
        sudo usermod -a -G video ollama
    fi

    status "Adding current user to ollama group..."
    $SUDO usermod -a -G ollama $(whoami)
    # ....
}
```

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: New package: ollama-0.1.32
  2024-04-30 19:47 [PR PATCH] New package: ollama-0.1.32 iFoundSilentHouse
                   ` (3 preceding siblings ...)
  2024-05-12 13:17 ` ayoubelmhamdi
@ 2024-05-12 13:19 ` ayoubelmhamdi
  4 siblings, 0 replies; 6+ messages in thread
From: ayoubelmhamdi @ 2024-05-12 13:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1049 bytes --]

New comment by ayoubelmhamdi on void-packages repository

https://github.com/void-linux/void-packages/pull/50133#issuecomment-2106240826

Comment:
what's about this problem:
https://github.com/void-linux/void-packages/blob/ef03c533334a4500e76daf0d8a7fc4df789a05d0/srcpkgs/ollama/files/ollama/run#L4

```
2024-05-12T13:03:36.79374 daemon.notice: May 12 14:03:36 ollama: chpst: fatal: unknown user/group: ollama:ollama
```

in [ollama.sh](https://ollama.com/install.sh) script:
```bash
configure_systemd() {
    if ! id ollama >/dev/null 2>&1; then
        status "Creating ollama user..."
        sudo useradd -r -s /bin/false -U -m -d /usr/share/ollama ollama
    fi
    if getent group render >/dev/null 2>&1; then
        sudo usermod -a -G render ollama
    fi
    if getent group video >/dev/null 2>&1; then
        status "Adding ollama user to video group..."
        sudo usermod -a -G video ollama
    fi

    status "Adding current user to ollama group..."
    sudo usermod -a -G ollama $(whoami)
    # ....
}
```

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-05-12 13:19 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-30 19:47 [PR PATCH] New package: ollama-0.1.32 iFoundSilentHouse
2024-04-30 19:59 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-04-30 20:07 ` iFoundSilentHouse
2024-05-12 13:05 ` ayoubelmhamdi
2024-05-12 13:17 ` ayoubelmhamdi
2024-05-12 13:19 ` ayoubelmhamdi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).