add rust_chost function and general updates

15 files changed, 110 insertions, 60 deletions

diff --git a/fastbangs-rs-git/PKGBUILD b/fastbangs-rs-git/PKGBUILD
index dfa6072..76b828e 100644
--- a/fastbangs-rs-git/PKGBUILD
+++ b/fastbangs-rs-git/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=fastbangs-rs-git
-pkgver=r20.bce539d
+pkgver=r25.4e01df1
 pkgrel=1
 pkgdesc='Shortcut-based meta search engine'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
diff --git a/gnix-git/PKGBUILD b/gnix-git/PKGBUILD
index 6a5aee8..a303b97 100644
--- a/gnix-git/PKGBUILD
+++ b/gnix-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=gnix-git
-pkgver=r151.8123a63
+pkgver=r156.be5e96e
 pkgrel=1
 pkgdesc="a simple stupid http reverse proxy"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -19,20 +19,25 @@ sha256sums=("SKIP"
             "SKIP"
             "SKIP"
             "SKIP")
+
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "gnix"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 prepare() {
     cd "gnix"
-    cargo +nightly fetch --locked --target "$CHOST"
+    cargo +nightly fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "gnix"
-    cargo +nightly build --frozen --release --target "$CHOST"
+    cargo +nightly build --frozen --release --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 gnix/target/$CHOST/release/gnix "$pkgdir/usr/bin/gnix"
+    install -Dm755 gnix/target/$(rust_chost)/release/gnix "$pkgdir/usr/bin/gnix"
     install -Dm644 gnix/src/modules/auth/login.html "$pkgdir/usr/share/gnix/login.html"
     install -Dm644 config.yaml "$pkgdir/etc/gnix.yaml"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/gnix.conf"
diff --git a/gnix/PKGBUILD b/gnix/PKGBUILD
index 17fd2c5..a404359 100644
--- a/gnix/PKGBUILD
+++ b/gnix/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=gnix
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="a simple stupid http reverse proxy"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -13,21 +13,25 @@ source=("$pkgname-$pkgver.tar.gz::https://codeberg.org/metamuffin/gnix/archive/v
         "gnix.service"
         "config.yaml"
         "sysusers.conf")
-sha256sums=('afadc550fe00ca73b2b17d76e7afefcf1ee558721ff73fabb40a858d7ea86a0e'
+sha256sums=('SKIP'
             'a80df54a4e44960decf43ad618dc1afef9cc498370460362e91646ac3f95358e'
             '6f39c6a2e82f9e09eb7ffe5082bfdd795936c3665863f118fcfd4135bc8e70f1'
             '9e03be16b1b3dd4c0d0e5feb5c31221758b68a54bad5ba7232e8565d766ea620')
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 prepare() {
     cd "gnix"
-    cargo +nightly fetch --locked --target "$CHOST"
+    cargo +nightly fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "gnix"
-    cargo +nightly build --frozen --release --target "$CHOST"
+    cargo +nightly build --frozen --release --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 gnix/target/$CHOST/release/gnix "$pkgdir/usr/bin/gnix"
+    install -Dm755 gnix/target/$(rust_chost)/release/gnix "$pkgdir/usr/bin/gnix"
     install -Dm644 gnix/src/modules/auth/login.html "$pkgdir/usr/share/gnix/login.html"
     install -Dm644 config.yaml "$pkgdir/etc/gnix.yaml"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/gnix.conf"
diff --git a/gpn-tron-git/PKGBUILD b/gpn-tron-git/PKGBUILD
index b0def43..feb8870 100644
--- a/gpn-tron-git/PKGBUILD
+++ b/gpn-tron-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=gpn-tron-git
-pkgver=r21.12f974f
+pkgver=r22.821af51
 pkgrel=1
 pkgdesc="GPN-Tron Rust rewrite"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -18,20 +18,24 @@ sha256sums=("SKIP"
             "SKIP"
             "SKIP")
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "gpn-tron"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 prepare() {
     cd "gpn-tron"
-    cargo +nightly fetch --locked --target "$CHOST"
+    cargo +nightly fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "gpn-tron"
-    cargo +nightly build --frozen --release --target "$CHOST"
+    cargo +nightly build --frozen --release --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 gpn-tron/target/$CHOST/release/gpn-tron "$pkgdir/usr/bin/gpn-tron"
+    install -Dm755 gpn-tron/target/$(rust_chost)/release/gpn-tron "$pkgdir/usr/bin/gpn-tron"
     install -Dm644 gpn-tron/COPYING "$pkgdir/usr/share/licenses/gpn-tron/COPYING"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/gpn-tron.conf"
     install -Dm644 gpn-tron.service "$pkgdir/usr/lib/systemd/system/gpn-tron.service"
diff --git a/hurrycurry-client-git/PKGBUILD b/hurrycurry-client-git/PKGBUILD
index daae659..4bb99e4 100644
--- a/hurrycurry-client-git/PKGBUILD
+++ b/hurrycurry-client-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-client-git
-pkgver=r2094.80364528
+pkgver=r2098.ba085c63
 pkgrel=1
 pkgdesc="A game about cooking (client)"
 arch=('any')
diff --git a/hurrycurry-client-web-git/PKGBUILD b/hurrycurry-client-web-git/PKGBUILD
index 91fc7af..f21f3d1 100644
--- a/hurrycurry-client-web-git/PKGBUILD
+++ b/hurrycurry-client-web-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-client-web-git
-pkgver=r2094.80364528
+pkgver=r2098.ba085c63
 pkgrel=1
 pkgdesc="A game about cooking (web client)"
 arch=('any')
diff --git a/hurrycurry-pixel-client-git/PKGBUILD b/hurrycurry-pixel-client-git/PKGBUILD
index d885ce1..4f7596c 100644
--- a/hurrycurry-pixel-client-git/PKGBUILD
+++ b/hurrycurry-pixel-client-git/PKGBUILD
@@ -16,6 +16,10 @@ source=("git+https://codeberg.org/hurrycurry/hurrycurry.git"
 sha256sums=("SKIP"
             "SKIP")
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "hurrycurry"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -23,15 +27,15 @@ pkgver() {
 prepare() {
     cd "hurrycurry"
     rustup default nightly
-    cargo +nightly fetch --locked --target "$CHOST"
+    cargo +nightly fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "hurrycurry"
     make pixel-client
-    cargo build --release --bin pixelcurry --target "$CHOST"
+    cargo build --release --bin pixelcurry --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 hurrycurry/target/$CHOST/release/pixelcurry "$pkgdir/usr/bin/pixelcurry"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/pixelcurry "$pkgdir/usr/bin/pixelcurry"
     install -Dm644 hurrycurry-pixel-client.desktop "$pkgdir/usr/share/applications/hurrycurry-pixel-client.desktop"
     install -Dm644 hurrycurry/COPYING "$pkgdir/usr/share/licenses/hurrycurry-pixel-client/COPYING"
     install -Dm644 hurrycurry/pixel-client/icon.png "$pkgdir/usr/share/icons/hicolor/512x512/apps/pixelcurry.png"
diff --git a/hurrycurry-server-git/PKGBUILD b/hurrycurry-server-git/PKGBUILD
index b2bdfe5..216531b 100644
--- a/hurrycurry-server-git/PKGBUILD
+++ b/hurrycurry-server-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-server-git
-pkgver=r2094.80364528
+pkgver=r2098.ba085c63
 pkgrel=1
 pkgdesc="A game about cooking (server)"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -23,6 +23,10 @@ sha256sums=("SKIP"
             "SKIP"
             "SKIP")
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "hurrycurry"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -30,23 +34,23 @@ pkgver() {
 prepare() {
     cd "hurrycurry"
     rustup default nightly
-    cargo fetch --locked --target "$CHOST"
+    cargo fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "hurrycurry"
-    cargo build --frozen --release --target "$CHOST" --bin hurrycurry-server
-    cargo build --frozen --release --target "$CHOST" --bin hurrycurry-replaytool
-    cargo build --frozen --release --target "$CHOST" --bin hurrycurry-registry
-    cargo build --frozen --release --target "$CHOST" --bin hurrycurry-discover
+    cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-server
+    cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-replaytool
+    cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-registry
+    cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-discover
     make -C data all
     make -C test-client
     make -C data recipes/default.svg
 }
 package() {
-    install -Dm755 hurrycurry/target/$CHOST/release/hurrycurry-server "$pkgdir/usr/bin/hurrycurry-server"
-    install -Dm755 hurrycurry/target/$CHOST/release/hurrycurry-replaytool "$pkgdir/usr/bin/hurrycurry-replaytool"
-    install -Dm755 hurrycurry/target/$CHOST/release/hurrycurry-registry "$pkgdir/usr/bin/hurrycurry-registry"
-    install -Dm755 hurrycurry/target/$CHOST/release/hurrycurry-discover "$pkgdir/usr/bin/hurrycurry-discover"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/hurrycurry-server "$pkgdir/usr/bin/hurrycurry-server"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/hurrycurry-replaytool "$pkgdir/usr/bin/hurrycurry-replaytool"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/hurrycurry-registry "$pkgdir/usr/bin/hurrycurry-registry"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/hurrycurry-discover "$pkgdir/usr/bin/hurrycurry-discover"
     install -Dm644 hurrycurry.service "$pkgdir/usr/lib/systemd/system/hurrycurry.service"
     install -Dm644 hurrycurry-registry.service "$pkgdir/usr/lib/systemd/system/hurrycurry-registry.service"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/hurrycurry.conf"
diff --git a/hurrycurry-server/PKGBUILD b/hurrycurry-server/PKGBUILD
index 985a803..8e8fbe5 100644
--- a/hurrycurry-server/PKGBUILD
+++ b/hurrycurry-server/PKGBUILD
@@ -21,26 +21,31 @@ sha256sums=('c1ec7679441bce07d9223a7eaa210446892c5b8e4d936062991b0c22a66867af'
             '47c6bd933fc96d08322d78a14c7932707b1dd1be2c1bb6eda2d212973f96aac9'
             'bbb29eff6b62d4530b04c0a964a88229212fea165f97a1c4674c53fae9fb4fe4')
 
+
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 prepare() {
     cd "hurrycurry"
     rustup default nightly
-    cargo +nightly fetch --locked --target "$CHOST"
+    cargo +nightly fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "hurrycurry"
-    cargo build --frozen --release --target "$CHOST" --bin hurrycurry-server
-    cargo build --frozen --release --target "$CHOST" --bin hurrycurry-replaytool
-    cargo build --frozen --release --target "$CHOST" --bin hurrycurry-registry
-    cargo build --frozen --release --target "$CHOST" --bin hurrycurry-discover
+    cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-server
+    cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-replaytool
+    cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-registry
+    cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-discover
     make -C data all
     # make -C test-client # TODO currently broken
     make -C data recipes/default.svg
 }
 package() {
-    install -Dm755 hurrycurry/target/$CHOST/release/hurrycurry-server "$pkgdir/usr/bin/hurrycurry-server"
-    install -Dm755 hurrycurry/target/$CHOST/release/hurrycurry-replaytool "$pkgdir/usr/bin/hurrycurry-replaytool"
-    install -Dm755 hurrycurry/target/$CHOST/release/hurrycurry-registry "$pkgdir/usr/bin/hurrycurry-registry"
-    install -Dm755 hurrycurry/target/$CHOST/release/hurrycurry-discover "$pkgdir/usr/bin/hurrycurry-discover"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/hurrycurry-server "$pkgdir/usr/bin/hurrycurry-server"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/hurrycurry-replaytool "$pkgdir/usr/bin/hurrycurry-replaytool"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/hurrycurry-registry "$pkgdir/usr/bin/hurrycurry-registry"
+    install -Dm755 hurrycurry/target/$(rust_chost)/release/hurrycurry-discover "$pkgdir/usr/bin/hurrycurry-discover"
     install -Dm644 hurrycurry.service "$pkgdir/usr/lib/systemd/system/hurrycurry.service"
     install -Dm644 hurrycurry-registry.service "$pkgdir/usr/lib/systemd/system/hurrycurry-registry.service"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/hurrycurry.conf"
diff --git a/jellything-git/PKGBUILD b/jellything-git/PKGBUILD
index 00c38cb..a84feeb 100644
--- a/jellything-git/PKGBUILD
+++ b/jellything-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=jellything-git
-pkgver=r719.bf84be5
+pkgver=r720.1cd966f
 pkgrel=1
 pkgdesc="Jellything media streaming server"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -23,6 +23,10 @@ sha256sums=("SKIP"
             "SKIP"
             "SKIP")
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "jellything"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -31,11 +35,11 @@ prepare() {
     cd "jellything"
     git submodule init
     git submodule update
-    cargo +nightly fetch --locked --target "$CHOST"
+    cargo +nightly fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "jellything"
-    cargo +nightly build --frozen --release --target "$CHOST"
+    cargo +nightly build --frozen --release --target "$(rust_chost)"
     cargo +nightly build --frozen --release --bin generate_completions
     ./target/release/generate_completions completions
     mdbook build doc
@@ -45,8 +49,8 @@ check() {
     cargo test --release
 }
 package() {
-    install -Dm755 jellything/target/$CHOST/release/jellything "$pkgdir/usr/bin/jellything"
-    install -Dm755 jellything/target/$CHOST/release/jellytool "$pkgdir/usr/bin/jellytool"
+    install -Dm755 jellything/target/$(rust_chost)/release/jellything "$pkgdir/usr/bin/jellything"
+    install -Dm755 jellything/target/$(rust_chost)/release/jellytool "$pkgdir/usr/bin/jellytool"
     install -Dm644 jellything/completions/jellytool.fish "$pkgdir/usr/share/fish/completions/jellytool.fish"
     install -Dm644 jellything/completions/jellytool.bash "$pkgdir/usr/share/bash-completion/completions/jellytool"
     install -Dm644 jellything/completions/_jellytool "$pkgdir/usr/share/zsh/site-functions/_jellytool"
diff --git a/keks-meet-server-git/PKGBUILD b/keks-meet-server-git/PKGBUILD
index 7b41703..77685ed 100644
--- a/keks-meet-server-git/PKGBUILD
+++ b/keks-meet-server-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=keks-meet-server-git
-pkgver=r385.55f58e1
+pkgver=r409.8341ed1
 pkgrel=1
 pkgdesc="Server for keks-meet, a simple and secure conferencing application for the web."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -18,21 +18,25 @@ sha256sums=("SKIP"
             "SKIP"
             "SKIP")
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "keks-meet"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 prepare() {
     cd "keks-meet"
-    cargo fetch --locked --target "$CHOST"
+    cargo fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "keks-meet"
     make client-build
-    cargo +nightly build --frozen --release --bin keks-meet-server --target "$CHOST"
+    cargo build --frozen --release --bin keks-meet-server --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 keks-meet/target/$CHOST/release/keks-meet-server "$pkgdir/usr/bin/keks-meet-server"
+    install -Dm755 keks-meet/target/$(rust_chost)/release/keks-meet-server "$pkgdir/usr/bin/keks-meet-server"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/keks-meet-server.conf"
     install -Dm644 keks-meet-server.service "$pkgdir/usr/lib/systemd/system/keks-meet-server.service"
     install -Dm644 keks-meet/COPYING "$pkgdir/usr/share/licenses/keks-meet/COPYING"
diff --git a/keks-meet-server/PKGBUILD b/keks-meet-server/PKGBUILD
index de29bf1..5521d2e 100644
--- a/keks-meet-server/PKGBUILD
+++ b/keks-meet-server/PKGBUILD
@@ -16,17 +16,21 @@ sha256sums=('40cd5203f227d2019bc2179ca018a25a264570dd6c31ba023dacc92847d632db'
             '7760ad9c44dd9a0a8d6e74ae647911eb2375776fea6d0f635024f1126c1618ce'
             '8cc9a7ace869b934732bfe376fd09b4ab82d22f52c70619e9df4ead0fae9a9aa')
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 prepare() {
     cd "keks-meet"
-    cargo fetch --locked --target "$CHOST"
+    cargo fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "keks-meet"
     make client-build
-    cargo +nightly build --frozen --release --bin keks-meet-server --target "$CHOST"
+    cargo +nightly build --frozen --release --bin keks-meet-server --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 keks-meet/target/$CHOST/release/keks-meet-server "$pkgdir/usr/bin/keks-meet-server"
+    install -Dm755 keks-meet/target/$(rust_chost)/release/keks-meet-server "$pkgdir/usr/bin/keks-meet-server"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/keks-meet-server.conf"
     install -Dm644 keks-meet-server.service "$pkgdir/usr/lib/systemd/system/keks-meet-server.service"
     install -Dm644 keks-meet/COPYING "$pkgdir/usr/share/licenses/keks-meet/COPYING"
diff --git a/meta-adservices-git/PKGBUILD b/meta-adservices-git/PKGBUILD
index 2a4e9e6..9eb5147 100644
--- a/meta-adservices-git/PKGBUILD
+++ b/meta-adservices-git/PKGBUILD
@@ -19,6 +19,10 @@ sha256sums=("SKIP"
             "SKIP"
             "SKIP")
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "meta-adservices"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -26,14 +30,14 @@ pkgver() {
 prepare() {
     cd "meta-adservices"
     rustup default nightly
-    cargo +nightly fetch --target "$CHOST"
+    cargo +nightly fetch --target "$(rust_chost)"
 }
 build() {
     cd "meta-adservices"
-    cargo +nightly build --release --target "$CHOST"
+    cargo +nightly build --release --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 meta-adservices/target/$CHOST/release/meta-adservices "$pkgdir/usr/bin/meta-adservices"
+    install -Dm755 meta-adservices/target/$(rust_chost)/release/meta-adservices "$pkgdir/usr/bin/meta-adservices"
     install -Dm644 meta-adservices/COPYING "$pkgdir/usr/share/licenses/meta-adservices/COPYING"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/meta-adservices.conf"
     install -Dm644 meta_adservices.service "$pkgdir/usr/lib/systemd/system/meta_adservices.service"
diff --git a/metamuffin-website-git/PKGBUILD b/metamuffin-website-git/PKGBUILD
index b5d7ea7..19aefeb 100644
--- a/metamuffin-website-git/PKGBUILD
+++ b/metamuffin-website-git/PKGBUILD
@@ -15,6 +15,10 @@ sha256sums=("SKIP"
             "SKIP"
             "SKIP")
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "metamuffin-website"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -22,15 +26,15 @@ pkgver() {
 prepare() {
     cd "metamuffin-website"
     rustup default nightly
-    cargo +nightly fetch --locked --target "$CHOST"
+    cargo +nightly fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "metamuffin-website"
-    cargo +nightly build --frozen --release --target "$CHOST"
+    cargo +nightly build --frozen --release --target "$(rust_chost)"
 }
 package() {
     mkdir -p "$pkgdir/usr/share/metamuffin-website"
-    install -Dm755 metamuffin-website/target/$CHOST/release/metamuffin-website "$pkgdir/usr/bin/metamuffin-website"
+    install -Dm755 metamuffin-website/target/$(rust_chost)/release/metamuffin-website "$pkgdir/usr/bin/metamuffin-website"
     install -Dm644 metamuffin-website.service "$pkgdir/usr/lib/systemd/system/metamuffin-website.service"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/metamuffin-website.conf"
     install -Dm644 metamuffin-website/COPYING "$pkgdir/usr/share/licenses/metamuffin-website/COPYING"
diff --git a/statuspage-git/PKGBUILD b/statuspage-git/PKGBUILD
index a2f9e50..eba5aa4 100644
--- a/statuspage-git/PKGBUILD
+++ b/statuspage-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=statuspage-git
-pkgver=r19.0c33249
+pkgver=r21.e815f6c
 pkgrel=1
 pkgdesc="service status page"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -18,6 +18,10 @@ sha256sums=("SKIP"
             "SKIP"
             "SKIP")
 
+rust_chost() {
+	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
+}
+
 pkgver() {
     cd "statuspage"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -25,15 +29,15 @@ pkgver() {
 prepare() {
     cd "statuspage"
     rustup default nightly
-    cargo +nightly fetch --locked --target "$CHOST"
+    cargo +nightly fetch --locked --target "$(rust_chost)"
 }
 build() {
     cd "statuspage"
-    cargo +nightly build --frozen --release --target "$CHOST"
+    cargo +nightly build --frozen --release --target "$(rust_chost)"
 }
 package() {
     mkdir -p "$pkgdir/usr/share/statuspage"
-    install -Dm755 statuspage/target/$CHOST/release/statuspage "$pkgdir/usr/bin/statuspage"
+    install -Dm755 statuspage/target/$(rust_chost)/release/statuspage "$pkgdir/usr/bin/statuspage"
     install -Dm644 statuspage.service "$pkgdir/usr/lib/systemd/system/statuspage.service"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/statuspage.conf"
     install -Dm644 statuspage/COPYING "$pkgdir/usr/share/licenses/statuspage/COPYING"