mirror of
https://github.com/systemd/systemd
synced 2024-07-21 10:17:21 +00:00
meson: move declarations of delta, escape, notify, creds, and battery-check
This commit is contained in:
parent
16b081d6ac
commit
98e39a5561
63
meson.build
63
meson.build
|
@ -2373,17 +2373,21 @@ subdir('src/libsystemd-network')
|
||||||
subdir('src/ac-power')
|
subdir('src/ac-power')
|
||||||
subdir('src/analyze')
|
subdir('src/analyze')
|
||||||
subdir('src/backlight')
|
subdir('src/backlight')
|
||||||
|
subdir('src/battery-check')
|
||||||
subdir('src/binfmt')
|
subdir('src/binfmt')
|
||||||
subdir('src/boot')
|
subdir('src/boot')
|
||||||
subdir('src/boot/efi')
|
subdir('src/boot/efi')
|
||||||
subdir('src/busctl')
|
subdir('src/busctl')
|
||||||
subdir('src/coredump')
|
subdir('src/coredump')
|
||||||
|
subdir('src/creds')
|
||||||
subdir('src/cryptenroll')
|
subdir('src/cryptenroll')
|
||||||
subdir('src/cryptsetup')
|
subdir('src/cryptsetup')
|
||||||
subdir('src/debug-generator')
|
subdir('src/debug-generator')
|
||||||
|
subdir('src/delta')
|
||||||
subdir('src/detect-virt')
|
subdir('src/detect-virt')
|
||||||
subdir('src/dissect')
|
subdir('src/dissect')
|
||||||
subdir('src/environment-d-generator')
|
subdir('src/environment-d-generator')
|
||||||
|
subdir('src/escape')
|
||||||
subdir('src/firstboot')
|
subdir('src/firstboot')
|
||||||
subdir('src/fsck')
|
subdir('src/fsck')
|
||||||
subdir('src/fstab-generator')
|
subdir('src/fstab-generator')
|
||||||
|
@ -2401,6 +2405,7 @@ subdir('src/login')
|
||||||
subdir('src/machine')
|
subdir('src/machine')
|
||||||
subdir('src/machine-id-setup')
|
subdir('src/machine-id-setup')
|
||||||
subdir('src/network')
|
subdir('src/network')
|
||||||
|
subdir('src/notify')
|
||||||
subdir('src/nspawn')
|
subdir('src/nspawn')
|
||||||
subdir('src/nss-myhostname')
|
subdir('src/nss-myhostname')
|
||||||
subdir('src/nss-mymachines')
|
subdir('src/nss-mymachines')
|
||||||
|
@ -2592,64 +2597,6 @@ meson.add_install_script(meson_make_symlink,
|
||||||
bindir / 'udevadm',
|
bindir / 'udevadm',
|
||||||
libexecdir / 'systemd-udevd')
|
libexecdir / 'systemd-udevd')
|
||||||
|
|
||||||
public_programs += executable(
|
|
||||||
'systemd-delta',
|
|
||||||
'src/delta/delta.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : [userspace],
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
public_programs += executable(
|
|
||||||
'systemd-escape',
|
|
||||||
'src/escape/escape.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : [userspace],
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
public_programs += executable(
|
|
||||||
'systemd-notify',
|
|
||||||
'src/notify/notify.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : [userspace],
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
public_programs += executable(
|
|
||||||
'systemd-creds',
|
|
||||||
'src/creds/creds.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : [threads,
|
|
||||||
libopenssl,
|
|
||||||
userspace],
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
public_programs += executable(
|
|
||||||
'systemd-battery-check',
|
|
||||||
'src/battery-check/battery-check.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : [userspace],
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install_dir : libexecdir,
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
# Protecting files from the distro in /usr doesn't make sense since they can be trivially accessed otherwise,
|
|
||||||
# so don't restrict the access mode in /usr. That doesn't apply to /etc, so we do restrict the access mode
|
|
||||||
# there.
|
|
||||||
meson.add_install_script('sh', '-c', mkdir_p.format(credstoredir))
|
|
||||||
if install_sysconfdir
|
|
||||||
# Keep in sync with tmpfiles.d/credstore.conf
|
|
||||||
meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore', '0700'))
|
|
||||||
meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore.encrypted', '0700'))
|
|
||||||
endif
|
|
||||||
|
|
||||||
executable(
|
executable(
|
||||||
'systemd-volatile-root',
|
'systemd-volatile-root',
|
||||||
'src/volatile-root/volatile-root.c',
|
'src/volatile-root/volatile-root.c',
|
||||||
|
|
9
src/battery-check/meson.build
Normal file
9
src/battery-check/meson.build
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
libexec_template + {
|
||||||
|
'name' : 'systemd-battery-check',
|
||||||
|
'public' : true,
|
||||||
|
'sources' : files('battery-check.c'),
|
||||||
|
},
|
||||||
|
]
|
23
src/creds/meson.build
Normal file
23
src/creds/meson.build
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
executable_template + {
|
||||||
|
'name' : 'systemd-creds',
|
||||||
|
'public' : true,
|
||||||
|
'sources' : files('creds.c'),
|
||||||
|
'dependencies' : [
|
||||||
|
libopenssl,
|
||||||
|
threads,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
# Protecting files from the distro in /usr doesn't make sense since they can be trivially accessed otherwise,
|
||||||
|
# so don't restrict the access mode in /usr. That doesn't apply to /etc, so we do restrict the access mode
|
||||||
|
# there.
|
||||||
|
meson.add_install_script('sh', '-c', mkdir_p.format(credstoredir))
|
||||||
|
if install_sysconfdir
|
||||||
|
# Keep in sync with tmpfiles.d/credstore.conf
|
||||||
|
meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore', '0700'))
|
||||||
|
meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore.encrypted', '0700'))
|
||||||
|
endif
|
9
src/delta/meson.build
Normal file
9
src/delta/meson.build
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
executable_template + {
|
||||||
|
'name' : 'systemd-delta',
|
||||||
|
'public' : true,
|
||||||
|
'sources' : files('delta.c'),
|
||||||
|
},
|
||||||
|
]
|
9
src/escape/meson.build
Normal file
9
src/escape/meson.build
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
executable_template + {
|
||||||
|
'name' : 'systemd-escape',
|
||||||
|
'public' : true,
|
||||||
|
'sources' : files('escape.c'),
|
||||||
|
},
|
||||||
|
]
|
9
src/notify/meson.build
Normal file
9
src/notify/meson.build
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
executable_template + {
|
||||||
|
'name' : 'systemd-notify',
|
||||||
|
'public' : true,
|
||||||
|
'sources' : files('notify.c'),
|
||||||
|
},
|
||||||
|
]
|
Loading…
Reference in a new issue