From 2176c5cae2baaf1489a3e9ac5c3b86552a5eb6b9 Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 30 May 2019 20:55:00 +0200 Subject: [PATCH 1/6] .ci/install-deps.sh: Testing xenial image (trusty is mega dead) to hopefully get a working systemd development package with headers to be picked up during configure. --- .ci/install-deps.sh | 1 + .travis.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/install-deps.sh b/.ci/install-deps.sh index d53f1d18..ffcdad5d 100755 --- a/.ci/install-deps.sh +++ b/.ci/install-deps.sh @@ -40,6 +40,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then libsystemd-login-dev \ libsystemd-id128-dev \ libsystemd-daemon-dev \ + libsystemd-dev \ libpam-systemd \ libdbus-1-dev \ libeigen3-dev \ diff --git a/.travis.yml b/.travis.yml index 05a4de28..278ae90e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: - ubuntu-toolchain-r-test install: - gcc-8 - dist: trusty + dist: xenial env: - MATRIX_EVAL="CC=gcc-8 CXX=g++-8" compiler: gcc From b969e9ea68d2c24a46ce35d006dca2c229ba6268 Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 30 May 2019 20:57:01 +0200 Subject: [PATCH 2/6] .ci/install-deps.sh: Install legacy development packages. --- .ci/install-deps.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.ci/install-deps.sh b/.ci/install-deps.sh index ffcdad5d..99e67adc 100755 --- a/.ci/install-deps.sh +++ b/.ci/install-deps.sh @@ -36,10 +36,6 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then libdb-dev \ systemd-services \ systemd \ - libsystemd-journal-dev \ - libsystemd-login-dev \ - libsystemd-id128-dev \ - libsystemd-daemon-dev \ libsystemd-dev \ libpam-systemd \ libdbus-1-dev \ From f5486efbdc794bb13b3e3230087847941473e09e Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 30 May 2019 21:20:29 +0200 Subject: [PATCH 3/6] systemd/wscript: Making sure to strip trailing new lines from systemd user unit dir. --- systemd/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd/wscript b/systemd/wscript index 00e820d1..1d4563ea 100644 --- a/systemd/wscript +++ b/systemd/wscript @@ -14,8 +14,8 @@ def set_systemd_user_unit_dir(conf): if not systemd_user_unit_dir: conf.env['SYSTEMD_USER_UNIT_DIR'] = None else: - systemd_user_unit_dir.strip() - conf.env['SYSTEMD_USER_UNIT_DIR'] = systemd_user_unit_dir + conf.env['SYSTEMD_USER_UNIT_DIR'] = \ + systemd_user_unit_dir.replace("\n", "") def configure(conf): From c5a9eb32cccf6e94e76187c0f205c27db4dcadbb Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 30 May 2019 21:20:54 +0200 Subject: [PATCH 4/6] .travis.yml: Switching to xenial for all other Linux based builds, too. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 278ae90e..c19f2ebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - ubuntu-toolchain-r-test install: - gcc-7 - dist: trusty + dist: xenial env: - MATRIX_EVAL="CC=gcc-7 CXX=g++-7" compiler: gcc @@ -36,17 +36,17 @@ matrix: - ubuntu-toolchain-r-test install: - gcc-6 - dist: trusty + dist: xenial env: - MATRIX_EVAL="CC=gcc-6 CXX=g++-6" compiler: gcc # linux with gcc default (4.8) - os: linux - dist: trusty + dist: xenial compiler: gcc # linux with clang default (3.5) - os: linux - dist: trusty + dist: xenial compiler: clang # linux with clang 3.8 - os: linux From 7f5a8af8e7d72130a9b5eb9db1b3a243d6a93362 Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 30 May 2019 21:34:59 +0200 Subject: [PATCH 5/6] .travis.yml: Switching last build plan (old clang) to use xenial... oversaw that one. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c19f2ebe..4e37fd31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ matrix: - ubuntu-toolchain-r-test install: - clang-3.8 - dist: trusty + dist: xenial env: - MATRIX_EVAL="CC=clang-3.8 CXX=clang++-3.8" compiler: clang From 7141fe5840bf7da229e8848640a95fff63746625 Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 30 May 2019 21:54:18 +0200 Subject: [PATCH 6/6] systemd/example.conf: Fixing typo and adding further explanation and pointers to relevant documentation. --- systemd/example.conf | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/systemd/example.conf b/systemd/example.conf index dbd8026d..2905d586 100644 --- a/systemd/example.conf +++ b/systemd/example.conf @@ -1,14 +1,19 @@ # Configuration profile for the templated systemd user unit jack@.service # A (modified) copy of this configuration can be used to start jackd staticly # for a user, which has the upside, that other systemd user units can depend on -# it. +# it. # # The systemd user service expects the configuration profiles to be located # below /etc/jack or the user's $XDG_CONFIG_HOME and can then be started using -# ssystemctl (i.e. `systemctl --user start jack@example`). +# systemctl (i.e. `systemctl --user start jack@example`). # -# For further details regarding the various options and drivers, see `man 1 -# jackd`. +# Please note, that setups can be very diverse and therefore this approach +# might or might not suit your requirements. However, it attempts to be as +# versatile as possible. +# +# For further details regarding the various options and drivers used by JACK, +# see `man 1 jackd` and for information on systemd's unit configuration see +# `man 5 systemd.unit`, `man 5 systemd.service` and `man 5 systemd.exec`. # # The name of the JACK server