From: lemmi <lemmi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gerbera: runit service fixes
Date: Sun, 10 Jul 2022 22:44:37 +0200 [thread overview]
Message-ID: <20220710204437.gb9g5JQPZqlYPiIa5rE8d3DnTBVXKKWpJ8B2zLPrMio@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37903@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by lemmi against master on the void-packages repository
https://github.com/lemmi/void-packages gerbera
https://github.com/void-linux/void-packages/pull/37903
gerbera: runit service fixes
#### Testing the changes
- I tested the changes in this PR: **briefly**
The `runit` service was missing `exec` and it did not generate a default config. Combined with the fact that there was no `log` service, it was a little inconvenient to get running.
I left the commits separate for now, but the should probably squashed before merge.
@crater2150 @octeep
A patch file from https://github.com/void-linux/void-packages/pull/37903.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gerbera-37903.patch --]
[-- Type: text/x-diff, Size: 1684 bytes --]
From 672cc56c4a9cd2160fc89a41e9966fa3d749a401 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:17:54 +0200
Subject: [PATCH] gerbera: runit fixes
---
srcpkgs/gerbera/files/gerbera/log/run | 1 +
srcpkgs/gerbera/files/gerbera/run | 9 ++++++++-
srcpkgs/gerbera/template | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/gerbera/files/gerbera/log/run
diff --git a/srcpkgs/gerbera/files/gerbera/log/run b/srcpkgs/gerbera/files/gerbera/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/gerbera/files/gerbera/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index 925a4d7fde23..cab802769fe9 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,2 +1,9 @@
#!/bin/sh
-chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera
+
+if [ ! -d /var/lib/gerbera/.config ]; then
+ mkdir -p /var/lib/gerbera/.config/gerbera
+ chown -R gerbera:gerbera /var/lib/gerbera
+ chpst -u gerbera sh -c 'HOME=/var/lib/gerbera gerbera --create-config > /var/lib/gerbera/.config/gerbera/config.xml'
+fi
+
+exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7b4f1a5f1f3d..35136708b3e5 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
next prev parent reply other threads:[~2022-07-10 20:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 19:05 [PR PATCH] " lemmi
2022-07-07 11:35 ` [PR PATCH] [Updated] " lemmi
2022-07-07 11:37 ` lemmi
2022-07-10 20:44 ` lemmi [this message]
2022-07-10 20:45 ` [PR PATCH] [Merged]: " lemmi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220710204437.gb9g5JQPZqlYPiIa5rE8d3DnTBVXKKWpJ8B2zLPrMio@z \
--to=lemmi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).