Commit

Author:

Hash:

Timestamp:

+40 -34 +/-5 browse

Kevin Schoon [me@kevinschoon.com]

4fc27f7546457454278d85bd2491e7c3b9b518c7

Sat, 12 Jul 2025 15:46:27 +0000 (4 months ago)

add ayllu archlinux package, update sysusers
1diff --git a/contrib/systemd/ayllu-sysusers.conf b/contrib/systemd/ayllu-sysusers.conf
2index 3c1c7b9..9e57c1d 100644
3--- a/contrib/systemd/ayllu-sysusers.conf
4+++ b/contrib/systemd/ayllu-sysusers.conf
5 @@ -1 +1 @@
6- u ayllu - "ayllu daemon user" /var/lib/ayllu /bin/sh
7+ u ayllu - "ayllu daemon user" /var/lib/ayllu /usr/bin/nologin
8 diff --git a/packaging/archlinux/ayllu-git/PKGBUILD b/packaging/archlinux/ayllu-git/PKGBUILD
9index 588448e..a729e1e 100644
10--- a/packaging/archlinux/ayllu-git/PKGBUILD
11+++ b/packaging/archlinux/ayllu-git/PKGBUILD
12 @@ -53,6 +53,9 @@ package() {
13 install -Dm644 \
14 "${srcdir}/ayllu/config.example.toml" "${pkgdir}/etc/ayllu/config.example.toml"
15 install -Dm644 \
16+ "${srcdir}/ayllu/contrib/systemd/ayllu-sysusers.conf" \
17+ "${pkgdir}/usr/lib/sysusers.d/ayllu.conf"
18+ install -Dm644 \
19 "${srcdir}/ayllu/contrib/systemd/system/ayllu.service" \
20 "${pkgdir}/usr/lib/systemd/system/ayllu.service"
21 install -Dm644 \
22 diff --git a/packaging/archlinux/ayllu-git/ayllu.sysusers b/packaging/archlinux/ayllu-git/ayllu.sysusers
23deleted file mode 100644
24index 26cb1dd..0000000
25--- a/packaging/archlinux/ayllu-git/ayllu.sysusers
26+++ /dev/null
27 @@ -1 +0,0 @@
28- u ayllu - "Ayllu System User" /usr/bin/nologin
29 diff --git a/packaging/archlinux/ayllu/.gitignore b/packaging/archlinux/ayllu/.gitignore
30new file mode 100644
31index 0000000..4d49ef2
32--- /dev/null
33+++ b/packaging/archlinux/ayllu/.gitignore
34 @@ -0,0 +1,3 @@
35+ src
36+ pkg
37+ ayllu-*
38 diff --git a/packaging/archlinux/ayllu/PKGBUILD b/packaging/archlinux/ayllu/PKGBUILD
39index f49921b..77b4083 100644
40--- a/packaging/archlinux/ayllu/PKGBUILD
41+++ b/packaging/archlinux/ayllu/PKGBUILD
42 @@ -1,5 +1,5 @@
43 pkgname=ayllu
44- pkgver=0.3.1
45+ pkgver=0.4.0
46 pkgrel=1
47 pkgdesc="Ayllu Forge"
48 arch=("x86_64")
49 @@ -10,46 +10,47 @@ depends=(
50 )
51 makedepends=(
52 "rust"
53- "sqlx-cli"
54- "sassc"
55- "npm"
56- "capnproto"
57 )
58 provides=("ayllu")
59 optdepends=()
60 source=(
61- "$pkgname-$pkgver::https://ayllu-forge.org/projects/ayllu/refs/archive/$pkgver.tar.gz"
62+ "$pkgname-$pkgver::https://ayllu-forge.org/ayllu/ayllu/refs/archive/$pkgver.tar.gz"
63 )
64
65- sha256sums=("577fdeb4d2cce05ad5963733d56d75aaef84a473d6320088bb649161c111d163")
66+ sha256sums=("1d4cff32a8b927228198c326c4831a07d528dece8b1183dc35fc98479596a2d1")
67+ # See: https://gitlab.archlinux.org/archlinux/packaging/packages/pacman/-/issues/20
68+ options=(!lto)
69
70- build() {
71- cd "$pkgname-$pkgver"
72- [[ -f db/state.db ]] && rm db/state.db
73- scripts/init_db_if_missing.sh
74- cargo build --release
75-
76- npm install
77- scripts/compile_stylesheets.sh
78+ prepare() {
79+ cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
80 }
81
82- package() {
83- cd "$pkgname-$pkgver"
84- install -Dm755 "target/release/ayllu" $pkgdir/usr/bin/ayllu
85- install -Dm644 "LICENSE" $pkgdir/usr/share/licenses/ayllu
86- install -Dm644 "config.example.toml" $pkgdir/etc/ayllu/config.example.toml
87- install -Dm644 "contrib/systemd/system/ayllu.service" $pkgdir/usr/lib/systemd/system/ayllu.service
88- install -Dm644 "contrib/systemd/user/ayllu.service" $pkgdir/usr/lib/systemd/user/ayllu.service
89- install -Dm755 "contrib/hooks/post-commit" $pkgdir/usr/share/ayllu/hooks/post-commit
90- install -Dm755 "contrib/hooks/post-receive" $pkgdir/usr/share/ayllu/hooks/post-receive
91-
92- install -Dm644 "themes/default/main.min.css" $pkgdir/usr/share/ayllu/themes/default/main.min.css
93- find themes/default/templates -name '*.html' -exec install -Dm644 {} $pkgdir/usr/share/ayllu/{} \;
94- find themes/default/assets -type f -exec install -Dm644 {} $pkgdir/usr/share/ayllu/{} \;
95+ check() {
96+ cargo test --frozen --all-features
97+ }
98
99- install -Dm644 "themes/tokyonight/main.min.css" $pkgdir/usr/share/ayllu/themes/tokyonight/main.min.css
100- find themes/tokyonight/templates -name '*.html' -exec install -Dm644 {} $pkgdir/usr/share/ayllu/{} \;
101+ build() {
102+ export CARGO_TARGET_DIR=target
103+ cargo build --frozen --release --all-features
104+ }
105
106- install -Dm644 "themes/adwaita/main.min.css" $pkgdir/usr/share/ayllu/themes/adwaita/main.min.css
107- find themes/adwaita/templates -name '*.html' -exec install -Dm644 {} $pkgdir/usr/share/ayllu/{} \;
108+ package() {
109+ install -Dm755 \
110+ "${srcdir}/target/release/ayllu" "${pkgdir}/usr/bin/ayllu"
111+ install -Dm755 \
112+ "${srcdir}/target/release/quipu" "${pkgdir}/usr/bin/quipu"
113+ install -Dm755 \
114+ "${srcdir}/target/release/ayllu-shell" "${pkgdir}/usr/bin/ayllu-shell"
115+ install -Dm755 \
116+ "${srcdir}/target/release/ayllu-keys" "${pkgdir}/usr/bin/ayllu-keys"
117+ install -Dm644 \
118+ "${srcdir}/ayllu/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
119+ install -Dm644 \
120+ "${srcdir}/ayllu/config.example.toml" "${pkgdir}/etc/ayllu/config.example.toml"
121+ install -Dm644 \
122+ "${srcdir}/ayllu/contrib/systemd/system/ayllu.service" \
123+ "${pkgdir}/usr/lib/systemd/system/ayllu.service"
124+ install -Dm644 \
125+ "${srcdir}/ayllu/contrib/systemd/user/ayllu.service" \
126+ "${pkgdir}/usr/lib/systemd/user/ayllu.service"
127 }