1a5d680c53
For release note since 0.52.1, see: https://github.com/OpenRC/openrc/blob/0.56/NEWS.md Other changes: - Update 0007-allow-setting-rc_libexecdir-path.patch to apply cleanly - Remove the split-usr logic, as it was removed in version 0.54. This logic is now handled by passing the following to meson during the configure stage: --bindir /bin --libdir /lib64 --libexecdir /lib --sbindir /sbin - libcap is now a dependency - The audit package must be explicity set as disabled if not available. If not, configuration errors occure if audit is not found. ./support/testing/run-tests tests.init.test_openrc 11:45:44 TestInitSystemOpenrcRwFull Starting 11:45:57 TestInitSystemOpenrcRwFull Cleaning up 11:45:57 TestInitSystemOpenrcRoFull Starting 11:46:10 TestInitSystemOpenrcRoFull Cleaning up 11:46:10 TestInitSystemOpenrcMergedUsrFull Starting 11:46:10 TestInitSystemOpenrcMergedUsrFull Building 11:51:59 TestInitSystemOpenrcMergedUsrFull Building done 11:52:12 TestInitSystemOpenrcMergedUsrFull Cleaning up ---------------------------------------------------------------------- Ran 3 tests in 388.180s OK Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> [Julien: add link to release notes] Signed-off-by: Julien Olivain <ju.o@free.fr>
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 89c42e7e0d8d5913789a76b007ed6a0c43078c63 Mon Sep 17 00:00:00 2001
|
|
From: artoo <artoo@artixlinux.org>
|
|
Date: Wed, 8 Sep 2021 22:41:58 +0200
|
|
Subject: [PATCH] allow setting rc_libexecdir path
|
|
|
|
- Allow to change the rc dir name of the rc_libexecdir path
|
|
- Introduce a librcdir option for override with value 'rc'6
|
|
|
|
Upstream: https://github.com/OpenRC/openrc/pull/443
|
|
|
|
Signed-off-by: artoo <artoo@artixlinux.org>
|
|
[Adam: update for 0.56]
|
|
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
|
|
---
|
|
meson.build | 2 +-
|
|
meson_options.txt | 2 ++
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 5b3f8fa..40d4be1 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -85,7 +85,7 @@ bindir = get_option('prefix') / get_option('bindir')
|
|
libdir = get_option('prefix') / get_option('libdir')
|
|
pluginsdir = libdir / 'rc/plugins'
|
|
libexecdir = get_option('prefix') / get_option('libexecdir')
|
|
-rc_libexecdir = libexecdir / 'rc'
|
|
+rc_libexecdir = libexecdir / get_option('librcdir')
|
|
rc_bindir = rc_libexecdir / 'bin'
|
|
rc_sbindir = rc_libexecdir / 'sbin'
|
|
rc_shdir = rc_libexecdir / 'sh'
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 2c74152..d2f67e4 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -26,3 +26,5 @@ option('sysvinit', type : 'boolean', value : false,
|
|
description : 'enable SysVinit compatibility (linux only)')
|
|
option('zsh-completions', type : 'boolean',
|
|
description : 'install zsh completions')
|
|
+option('librcdir', type : 'string', value : 'rc',
|
|
+ description : 'default location of rc libexec dir')
|
|
--
|
|
2.41.0
|
|
|