mirror of
https://github.com/systemd/systemd.git
synced 2026-11-06 05:17:24 +00:00
meson: add feature flag for growfs
growfs builds and installs binaries, docs, units, etc. Add a feature flag to make it easier to avoid shipping it.
This commit is contained in:
1 parent
c5018d9dbf
commit
5534e9ec66
7 files changed
+21
-7
No files matched your search
@@ -1161,7 +1161,7 @@ manpages = [
|
||||
'systemd-growfs@.service',
|
||||
'systemd-makefs',
|
||||
'systemd-mkswap@.service'],
|
||||
''],
|
||||
'ENABLE_GROWFS'],
|
||||
['systemd-measure', '1', [], 'ENABLE_MEASURE'],
|
||||
['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'],
|
||||
['systemd-mount', '1', ['systemd-umount'], ''],
|
||||
|
||||
@@ -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-makefs_.service">
|
||||
<refentry id="systemd-makefs_.service" conditional="ENABLE_GROWFS">
|
||||
|
||||
<refentryinfo>
|
||||
<title>systemd-makefs@.service</title>
|
||||
|
||||
@@ -1795,6 +1795,7 @@ conf.set10('DEFAULT_MOUNTFSD_TRUSTED_DIRECTORIES', get_option('default-mountfsd-
|
||||
|
||||
conf.set10('ENABLE_BATTERY_CHECK', get_option('battery-check').allowed())
|
||||
conf.set10('ENABLE_CLONESETUP', get_option('clonesetup').allowed())
|
||||
conf.set10('ENABLE_GROWFS', get_option('growfs').allowed())
|
||||
|
||||
foreach tuple : [
|
||||
['analyze'],
|
||||
@@ -3446,6 +3447,7 @@ foreach tuple : [
|
||||
['efi'],
|
||||
['environment.d'],
|
||||
['firstboot'],
|
||||
['growfs'],
|
||||
['hibernate'],
|
||||
['homed'],
|
||||
['hostnamed'],
|
||||
|
||||
@@ -181,6 +181,8 @@ option('environment-d', type : 'boolean',
|
||||
description : 'support for environment.d')
|
||||
option('firstboot', type : 'boolean',
|
||||
description : 'install systemd-firstboot')
|
||||
option('growfs', type : 'feature',
|
||||
description : 'install systemd-growfs, systemd-makefs, and associated files')
|
||||
option('hibernate', type : 'boolean',
|
||||
description : 'support for hibernation')
|
||||
option('homed', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
if conf.get('ENABLE_GROWFS') != 1
|
||||
subdir_done()
|
||||
endif
|
||||
|
||||
executables += [
|
||||
libexec_template + {
|
||||
'name' : 'systemd-growfs',
|
||||
|
||||
@@ -1143,9 +1143,9 @@ if test -f /sys/class/dmi/id/board_vendor && ! systemd-detect-virt --container ;
|
||||
systemd-analyze chid --json=pretty
|
||||
fi
|
||||
|
||||
systemd-analyze condition --instance=tmp --unit=systemd-growfs@.service
|
||||
systemd-analyze verify --instance=tmp --man=no systemd-growfs@.service
|
||||
systemd-analyze security --instance=tmp systemd-growfs@.service
|
||||
systemd-analyze condition --instance=tmp --unit=user@.service
|
||||
systemd-analyze verify --instance=tmp --man=no user@.service
|
||||
systemd-analyze security --instance=tmp user@.service
|
||||
|
||||
systemd-analyze has-tpm2 ||:
|
||||
if systemd-analyze has-tpm2 -q ; then
|
||||
|
||||
+8
-2
@@ -389,8 +389,14 @@ units = [
|
||||
},
|
||||
{ 'file' : 'systemd-fsck-root.service.in' },
|
||||
{ 'file' : 'systemd-fsck@.service.in' },
|
||||
{ 'file' : 'systemd-growfs-root.service.in' },
|
||||
{ 'file' : 'systemd-growfs@.service.in' },
|
||||
{
|
||||
'file' : 'systemd-growfs-root.service.in',
|
||||
'conditions' : ['ENABLE_GROWFS'],
|
||||
},
|
||||
{
|
||||
'file' : 'systemd-growfs@.service.in',
|
||||
'conditions' : ['ENABLE_GROWFS'],
|
||||
},
|
||||
{ 'file' : 'systemd-halt.service' },
|
||||
{
|
||||
'file' : 'systemd-hibernate-clear.service.in',
|
||||
|
||||
Reference in new issue
Block a user