dilim/systemd
1
0 Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-11-06 05:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add feature flag for veritysetup

Browse Source 
veritysetup builds and installs binaries, docs, units, etc. Add a
feature flag to make it easier to avoid shipping it.
This commit is contained in:
Luca Boccassi authored and Yu Watanabe committed 2026-10-25 09:34:00 +09:00
1 parent e2a70c2cec
commit 7795f9c66d
9 files changed
+21 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

man/rules/meson.build
+3 -3
View File
@@ -1381,11 +1381,11 @@ manpages = [
'8',
['systemd-vconsole-setup'],
'ENABLE_VCONSOLE'],
['systemd-veritysetup-generator', '8', [], 'HAVE_LIBCRYPTSETUP'],
['systemd-veritysetup-generator', '8', [], 'ENABLE_VERITYSETUP'],
['systemd-veritysetup@.service',
'8',
['systemd-veritysetup'],
'HAVE_LIBCRYPTSETUP'],
'ENABLE_VERITYSETUP'],
['systemd-vmspawn', '1', [], 'ENABLE_VMSPAWN'],
['systemd-volatile-root.service', '8', ['systemd-volatile-root'], ''],
['systemd-vpick', '1', [], ''],
@@ -1531,6 +1531,6 @@ manpages = [
['userdbctl', '1', [], 'ENABLE_USERDB'],
['varlinkctl', '1', [], ''],
['vconsole.conf', '5', [], 'ENABLE_VCONSOLE'],
['veritytab', '5', [], 'HAVE_LIBCRYPTSETUP']
['veritytab', '5', [], 'ENABLE_VERITYSETUP']
]
# Really, do not edit.
man/systemd-veritysetup-generator.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-veritysetup-generator" conditional='HAVE_LIBCRYPTSETUP'
<refentry id="systemd-veritysetup-generator" conditional='ENABLE_VERITYSETUP'
xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
man/systemd-veritysetup@.service.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-veritysetup_.service" conditional='HAVE_LIBCRYPTSETUP'
<refentry id="systemd-veritysetup_.service" conditional='ENABLE_VERITYSETUP'
xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
man/veritytab.xml
+1 -1
View File
@@ -8,7 +8,7 @@
This is based on crypttab(5).
-->
<refentry id="veritytab" conditional='HAVE_LIBCRYPTSETUP' xmlns:xi="http://www.w3.org/2001/XInclude">
<refentry id="veritytab" conditional='ENABLE_VERITYSETUP' xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>veritytab</title>
meson.build
+6
View File
@@ -1804,6 +1804,11 @@ have = get_option('integritysetup').require(
error_message : 'libcryptsetup required for systemd-integritysetup').allowed()
conf.set10('ENABLE_INTEGRITYSETUP', have)
have = get_option('veritysetup').require(
conf.get('HAVE_LIBCRYPTSETUP') == 1,
error_message : 'libcryptsetup required for systemd-veritysetup').allowed()
conf.set10('ENABLE_VERITYSETUP', have)
have = get_option('validatefs').require(
conf.get('HAVE_BLKID') == 1,
error_message : 'blkid required for systemd-validatefs').allowed()
@@ -3506,6 +3511,7 @@ foreach tuple : [
['userdb'],
['validatefs'],
['vconsole'],
['veritysetup'],
['vmspawn'],
['xdg-autostart'],
meson_options.txt
+2
View File
@@ -288,6 +288,8 @@ option('varlink-monitord', type : 'boolean',
description : 'install the systemd-varlink-monitord daemon')
option('vconsole', type : 'boolean',
description : 'support for vconsole configuration')
option('veritysetup', type : 'feature',
description : 'install systemd-veritysetup and associated files')
option('vmspawn', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
description : 'install the systemd-vmspawn tool')
option('xdg-autostart', type : 'boolean',
src/gpt-auto-generator/gpt-auto-generator.c
+2 -2
View File
@@ -205,7 +205,7 @@ static int add_veritysetup(
const char *mount_opts,
MountPointFlags flags) {
#if HAVE_LIBCRYPTSETUP
#if ENABLE_VERITYSETUP
int r;
assert(id);
@@ -305,7 +305,7 @@ static int add_veritysetup(
return 0;
#else
log_warning("Compiled without libcryptsetup support, skipping verity setup for '%s'.", id);
log_warning("Compiled without systemd-veritysetup support, skipping verity setup for '%s'.", id);
return 0;
#endif
}
src/veritysetup/meson.build
+1 -1
View File
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
if conf.get('HAVE_LIBCRYPTSETUP') != 1
if conf.get('ENABLE_VERITYSETUP') != 1
subdir_done()
endif
units/meson.build
+4 -4
View File
@@ -205,7 +205,7 @@ units = [
},
{
'file' : 'remote-veritysetup.target',
'conditions' : ['HAVE_LIBCRYPTSETUP'],
'conditions' : ['ENABLE_VERITYSETUP'],
'symlinks' : ['initrd-root-device.target.wants/'],
},
{ 'file' : 'rescue.service.in' },
@@ -263,7 +263,7 @@ units = [
{
'file' : 'system-systemd-veritysetup.slice',
'name' : 'system-systemd\\x2dveritysetup.slice',
'conditions' : ['HAVE_LIBCRYPTSETUP'],
'conditions' : ['ENABLE_VERITYSETUP'],
},
{ 'file' : 'system-update-cleanup.service' },
{ 'file' : 'system-update-pre.target' },
@@ -1196,11 +1196,11 @@ units = [
},
{
'file' : 'veritysetup-pre.target',
'conditions' : ['HAVE_LIBCRYPTSETUP'],
'conditions' : ['ENABLE_VERITYSETUP'],
},
{
'file' : 'veritysetup.target',
'conditions' : ['HAVE_LIBCRYPTSETUP'],
'conditions' : ['ENABLE_VERITYSETUP'],
'symlinks' : ['sysinit.target.wants/'],
},
]