mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
meson: move declarations of cgroups-agent, id128, volatile-root, and path
This commit is contained in:
parent
98e39a5561
commit
e2bdf00a22
44
meson.build
44
meson.build
@ -2378,6 +2378,7 @@ 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/cgroups-agent')
|
||||||
subdir('src/coredump')
|
subdir('src/coredump')
|
||||||
subdir('src/creds')
|
subdir('src/creds')
|
||||||
subdir('src/cryptenroll')
|
subdir('src/cryptenroll')
|
||||||
@ -2396,6 +2397,7 @@ subdir('src/gpt-auto-generator')
|
|||||||
subdir('src/hibernate-resume')
|
subdir('src/hibernate-resume')
|
||||||
subdir('src/home')
|
subdir('src/home')
|
||||||
subdir('src/hostname')
|
subdir('src/hostname')
|
||||||
|
subdir('src/id128')
|
||||||
subdir('src/import')
|
subdir('src/import')
|
||||||
subdir('src/integritysetup')
|
subdir('src/integritysetup')
|
||||||
subdir('src/journal-remote')
|
subdir('src/journal-remote')
|
||||||
@ -2413,6 +2415,7 @@ subdir('src/nss-resolve')
|
|||||||
subdir('src/nss-systemd')
|
subdir('src/nss-systemd')
|
||||||
subdir('src/oom')
|
subdir('src/oom')
|
||||||
subdir('src/partition')
|
subdir('src/partition')
|
||||||
|
subdir('src/path')
|
||||||
subdir('src/portable')
|
subdir('src/portable')
|
||||||
subdir('src/pstore')
|
subdir('src/pstore')
|
||||||
subdir('src/random-seed')
|
subdir('src/random-seed')
|
||||||
@ -2438,6 +2441,7 @@ subdir('src/user-sessions')
|
|||||||
subdir('src/userdb')
|
subdir('src/userdb')
|
||||||
subdir('src/vconsole')
|
subdir('src/vconsole')
|
||||||
subdir('src/veritysetup')
|
subdir('src/veritysetup')
|
||||||
|
subdir('src/volatile-root')
|
||||||
subdir('src/xdg-autostart-generator')
|
subdir('src/xdg-autostart-generator')
|
||||||
|
|
||||||
subdir('src/systemd')
|
subdir('src/systemd')
|
||||||
@ -2597,38 +2601,9 @@ meson.add_install_script(meson_make_symlink,
|
|||||||
bindir / 'udevadm',
|
bindir / 'udevadm',
|
||||||
libexecdir / 'systemd-udevd')
|
libexecdir / 'systemd-udevd')
|
||||||
|
|
||||||
executable(
|
|
||||||
'systemd-volatile-root',
|
|
||||||
'src/volatile-root/volatile-root.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : userspace,
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install : conf.get('ENABLE_INITRD') == 1,
|
|
||||||
install_dir : libexecdir)
|
|
||||||
|
|
||||||
executable(
|
|
||||||
'systemd-cgroups-agent',
|
|
||||||
'src/cgroups-agent/cgroups-agent.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : userspace,
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install : true,
|
|
||||||
install_dir : libexecdir)
|
|
||||||
|
|
||||||
systemd_id128 = executable(
|
|
||||||
'systemd-id128',
|
|
||||||
'src/id128/id128.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : [userspace],
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install : true)
|
|
||||||
public_programs += systemd_id128
|
|
||||||
|
|
||||||
if want_tests != 'false'
|
if want_tests != 'false'
|
||||||
systemctl = executables_by_name.get('systemctl')
|
systemctl = executables_by_name.get('systemctl')
|
||||||
|
systemd_id128 = executables_by_name.get('systemd-id128')
|
||||||
test('test-systemctl-enable',
|
test('test-systemctl-enable',
|
||||||
test_systemctl_enable_sh,
|
test_systemctl_enable_sh,
|
||||||
# https://github.com/mesonbuild/meson/issues/2681
|
# https://github.com/mesonbuild/meson/issues/2681
|
||||||
@ -2636,15 +2611,6 @@ if want_tests != 'false'
|
|||||||
systemd_id128.full_path()])
|
systemd_id128.full_path()])
|
||||||
endif
|
endif
|
||||||
|
|
||||||
public_programs += executable(
|
|
||||||
'systemd-path',
|
|
||||||
'src/path/path.c',
|
|
||||||
include_directories : includes,
|
|
||||||
link_with : [libshared],
|
|
||||||
dependencies : [userspace],
|
|
||||||
install_rpath : pkglibdir,
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
public_programs += executable(
|
public_programs += executable(
|
||||||
'systemd-ask-password',
|
'systemd-ask-password',
|
||||||
'src/ask-password/ask-password.c',
|
'src/ask-password/ask-password.c',
|
||||||
|
8
src/cgroups-agent/meson.build
Normal file
8
src/cgroups-agent/meson.build
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
libexec_template + {
|
||||||
|
'name' : 'systemd-cgroups-agent',
|
||||||
|
'sources' : files('cgroups-agent.c'),
|
||||||
|
},
|
||||||
|
]
|
9
src/id128/meson.build
Normal file
9
src/id128/meson.build
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
executable_template + {
|
||||||
|
'name' : 'systemd-id128',
|
||||||
|
'public' : true,
|
||||||
|
'sources' : files('id128.c'),
|
||||||
|
},
|
||||||
|
]
|
9
src/path/meson.build
Normal file
9
src/path/meson.build
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
executable_template + {
|
||||||
|
'name' : 'systemd-path',
|
||||||
|
'public' : true,
|
||||||
|
'sources' : files('path.c'),
|
||||||
|
},
|
||||||
|
]
|
9
src/volatile-root/meson.build
Normal file
9
src/volatile-root/meson.build
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
executables += [
|
||||||
|
libexec_template + {
|
||||||
|
'name' : 'systemd-volatile-root',
|
||||||
|
'conditions' : ['ENABLE_INITRD'],
|
||||||
|
'sources' : files('volatile-root.c'),
|
||||||
|
},
|
||||||
|
]
|
Loading…
Reference in New Issue
Block a user