aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2025-03-26 10:34:55 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2025-03-26 10:41:41 +0100
commit081ae45ea2b0e7af9a18724a0420781509947750 (patch)
treeda20ac8ffd1a262c3723b7cad5b994aba71abf28
parent4d425851437bebbd8099d182aa28502f8cdc7899 (diff)
downloadmatterbridge-main.tar.gz
matterbridge-main.tar.bz2
matterbridge-main.zip
Fix issue with UTF-8 / charset in names.HEADmain
Without that fix we have things like that: 09:36 < SIC> <▒NUtoo@H> test hackint 09:42 < SIC> <␉_@O> tests failed successfully And if we create an AppImage we instead get that (with sudo journalctl -f) despite the 'fuse' package being installed: fuse: device not found, try 'modprobe fuse' first Cannot mount AppImage, please check your FUSE setup. You might still be able to extract the contents of this AppImage if you run it with the --appimage-extract option. See https://github.com/AppImage/AppImageKit/wiki/FUSE for more information This might be because of the systemd sandbox that doesn't let the AppImage access the fuse interface. So for now we reverts the commit 3dcb164e4b450d833ba5cf6c7cc03cd51a917e34 ("Makefile: matterbridge: (only) ship a static binary."), but also the commit 4d425851437bebbd8099d182aa28502f8cdc7899 ("Check the matterbridge binary for reproducibility.") which depends on 3dcb164e4b450d833ba5cf6c7cc03cd51a917e34, until we make AppImages work inside sandboxed systemd services. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--.gitignore2
-rw-r--r--Makefile16
-rw-r--r--matterbridge.tmp.sha5121
3 files changed, 7 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index f2b0654..af2bc98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
*~
\#.*\#
-matterbridge
-matterbridge.tmp
matterbridge-744cf07005745312ccddb549bb1bab5ab7031106.tar
matterbridge-744cf07005745312ccddb549bb1bab5ab7031106.tar.xz
matterbridge.toml
diff --git a/Makefile b/Makefile
index dc8f3a0..a278e10 100644
--- a/Makefile
+++ b/Makefile
@@ -21,18 +21,16 @@ help:
@echo -en "\tmake test "
@echo "# Test the matterbridge.toml configuration locally"
-matterbridge: matterbridge.tmp.sha512
+matterbridge-$(GUIX_COMMIT).tar: matterbridge.service
install -m 755 `guix time-machine \
--commit=$(GUIX_COMMIT) \
-- \
- build \
- matterbridge`/bin/matterbridge $@.tmp
- sha512sum -c $@.tmp.sha512
- mv $@.tmp $@
-
-matterbridge-$(GUIX_COMMIT).tar: matterbridge matterbridge.service
- tar cf $@ matterbridge \
- --transform='s/^/.\/usr\/bin\//'
+ pack \
+ --save-provenance -RR \
+ --compression=xz \
+ matterbridge \
+ --symlink=/usr/bin/matterbridge=bin/matterbridge` $@.xz
+ unxz $@.xz
tar -rf matterbridge-$(GUIX_COMMIT).tar \
matterbridge.service \
--transform='s/^/.\/etc\/systemd\/system\//'
diff --git a/matterbridge.tmp.sha512 b/matterbridge.tmp.sha512
deleted file mode 100644
index 6cf30c4..0000000
--- a/matterbridge.tmp.sha512
+++ /dev/null
@@ -1 +0,0 @@
-fcd05978f3910b68153c9551136a023d1ae61ad9b64f05ae358e750693dfcec2c64ad1a6c990e92212813f616d70f16fcf60f01955ead6a129efab8c61ca397f matterbridge.tmp