diff options
45 files changed, 4137 insertions, 4212 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index 3e1b2d76c0..9dfdbe3fe2 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -20,4 +20,5 @@ (eval . (c-set-offset 'arglist-intro '++)) (eval . (c-set-offset 'arglist-close 0)))) (nxml-mode . ((nxml-child-indent . 2) - (fill-column . 119)))) + (fill-column . 119))) + (meson-mode . ((meson-indent-basic . 8)))) diff --git a/catalog/meson.build b/catalog/meson.build index 0ac48f69c3..6d205b1d42 100644 --- a/catalog/meson.build +++ b/catalog/meson.build @@ -1,17 +1,15 @@ -# -*- mode: meson -*- - in_files = ''' - systemd.bg.catalog - systemd.be.catalog - systemd.be@latin.catalog - systemd.fr.catalog - systemd.it.catalog - systemd.pl.catalog - systemd.pt_BR.catalog - systemd.ru.catalog - systemd.zh_CN.catalog - systemd.zh_TW.catalog - systemd.catalog + systemd.bg.catalog + systemd.be.catalog + systemd.be@latin.catalog + systemd.fr.catalog + systemd.it.catalog + systemd.pl.catalog + systemd.pt_BR.catalog + systemd.ru.catalog + systemd.zh_CN.catalog + systemd.zh_TW.catalog + systemd.catalog '''.split() support_url = get_option('support-url') @@ -19,12 +17,12 @@ support_sed = 's~%SUPPORT_URL%~@0@~'.format(support_url) build_catalog_dir = meson.current_build_dir() foreach file : in_files - custom_target( - file, - input : file + '.in', - output: file, - command : [sed, support_sed, '@INPUT@'], - capture : true, - install : true, - install_dir : catalogdir) + custom_target( + file, + input : file + '.in', + output: file, + command : [sed, support_sed, '@INPUT@'], + capture : true, + install : true, + install_dir : catalogdir) endforeach diff --git a/docs/sysvinit/meson.build b/docs/sysvinit/meson.build index a519f74cee..36b2f6f98c 100644 --- a/docs/sysvinit/meson.build +++ b/docs/sysvinit/meson.build @@ -1,8 +1,6 @@ -# -*- mode: meson -*- - file = configure_file( - input : 'README.in', - output : 'README', - configuration : substs) + input : 'README.in', + output : 'README', + configuration : substs) install_data(file, install_dir : sysvinit_path) diff --git a/docs/var-log/meson.build b/docs/var-log/meson.build index c3d0cdbf82..43078c40e9 100644 --- a/docs/var-log/meson.build +++ b/docs/var-log/meson.build @@ -1,8 +1,6 @@ -# -*- mode: meson -*- - file = configure_file( - input : 'README.in', - output : 'README', - configuration : substs) + input : 'README.in', + output : 'README', + configuration : substs) install_data(file, install_dir : varlogdir) diff --git a/hwdb/meson.build b/hwdb/meson.build index 1e859fd20d..b9fc5ab594 100644 --- a/hwdb/meson.build +++ b/hwdb/meson.build @@ -1,39 +1,37 @@ -# -*- mode: meson -*- - hwdb_files = files(''' - 20-pci-vendor-model.hwdb - 20-pci-classes.hwdb - 20-usb-vendor-model.hwdb - 20-usb-classes.hwdb - 20-sdio-vendor-model.hwdb - 20-sdio-classes.hwdb - 20-bluetooth-vendor-product.hwdb - 20-acpi-vendor.hwdb - 20-OUI.hwdb - 20-net-ifname.hwdb - 60-evdev.hwdb - 60-keyboard.hwdb - 60-sensor.hwdb - 70-mouse.hwdb - 70-pointingstick.hwdb - 70-touchpad.hwdb + 20-pci-vendor-model.hwdb + 20-pci-classes.hwdb + 20-usb-vendor-model.hwdb + 20-usb-classes.hwdb + 20-sdio-vendor-model.hwdb + 20-sdio-classes.hwdb + 20-bluetooth-vendor-product.hwdb + 20-acpi-vendor.hwdb + 20-OUI.hwdb + 20-net-ifname.hwdb + 60-evdev.hwdb + 60-keyboard.hwdb + 60-sensor.hwdb + 70-mouse.hwdb + 70-pointingstick.hwdb + 70-touchpad.hwdb '''.split()) if conf.get('ENABLE_HWDB', 0) == 1 - install_data(hwdb_files, - install_dir : udevhwdbdir) + install_data(hwdb_files, + install_dir : udevhwdbdir) - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) + meson.add_install_script('sh', '-c', + mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) - meson.add_install_script('sh', '-c', - 'test -n "$DESTDIR" || @0@/systemd-hwdb update' - .format(rootbindir)) + meson.add_install_script('sh', '-c', + 'test -n "$DESTDIR" || @0@/systemd-hwdb update' + .format(rootbindir)) endif ############################################################ custom_target( - 'update', - output : 'update', - command : [hwdb_update_sh, meson.current_source_dir()]) + 'update', + output : 'update', + command : [hwdb_update_sh, meson.current_source_dir()]) diff --git a/man/meson.build b/man/meson.build index 9d8d1a9922..1c1dbd86b7 100644 --- a/man/meson.build +++ b/man/meson.build @@ -1,5 +1,3 @@ -# -*- mode: meson -*- - # This is lame, I know, but meson has no other include mechanism subdir('rules') @@ -14,123 +12,122 @@ want_man = want_man != 'false' and xsltproc.found() want_html = want_html != 'false' and xsltproc.found() xsltproc_flags = [ - '--nonet', - '--xinclude', - '--stringparam', 'man.output.quietly', '1', - '--stringparam', 'funcsynopsis.style', 'ansi', - '--stringparam', 'man.authors.section.enabled', '0', - '--stringparam', 'man.copyright.section.enabled', '0', - '--stringparam', 'systemd.version', '@0@'.format(meson.project_version()), - '--path', - '@0@:@1@'.format(meson.current_build_dir(), meson.current_source_dir())] + '--nonet', + '--xinclude', + '--stringparam', 'man.output.quietly', '1', + '--stringparam', 'funcsynopsis.style', 'ansi', + '--stringparam', 'man.authors.section.enabled', '0', + '--stringparam', 'man.copyright.section.enabled', '0', + '--stringparam', 'systemd.version', '@0@'.format(meson.project_version()), + '--path', + '@0@:@1@'.format(meson.current_build_dir(), meson.current_source_dir())] custom_man_xsl = files('custom-man.xsl') custom_html_xsl = files('custom-html.xsl') +xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags custom_entities_ent = configure_file( - input : 'custom-entities.ent.in', - output : 'custom-entities.ent', - configuration : conf) + input : 'custom-entities.ent.in', + output : 'custom-entities.ent', + configuration : conf) man_pages = [] html_pages = [] source_xml_files = [] foreach tuple : manpages - stem = tuple[0] - section = tuple[1] - aliases = tuple[2] - condition = tuple[3] - - xml = stem + '.xml' - html = stem + '.html' - man = stem + '.' + section - - manaliases = [] - htmlaliases = [] - foreach alias : aliases - manaliases += [alias + '.' + section] - htmlaliases += [alias + '.html'] - endforeach - - mandirn = join_paths(get_option('mandir'), 'man' + section) - - have = condition == '' or conf.get(condition, 0) == 1 - - if have - p1 = custom_target( - man, - input : xml, - output : [man] + manaliases, - command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_man_xsl, '@INPUT@'], - depend_files : custom_entities_ent, - install : want_man, - install_dir : mandirn) - man_pages += [p1] - - p2 = custom_target( - html, - input : xml, - output : [html] + htmlaliases, - command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'], - depend_files : custom_entities_ent, - install : want_html, - install_dir : join_paths(docdir, 'html')) - html_pages += [p2] - - source_xml_files += files(tuple[0] + '.xml') - else - message('Skipping @0@.@1@ because @2@ is @3@'.format(stem, section, condition, have)) - endif + stem = tuple[0] + section = tuple[1] + aliases = tuple[2] + condition = tuple[3] + + xml = stem + '.xml' + html = stem + '.html' + man = stem + '.' + section + + manaliases = [] + htmlaliases = [] + foreach alias : aliases + manaliases += [alias + '.' + section] + htmlaliases += [alias + '.html'] + endforeach + + mandirn = join_paths(get_option('mandir'), 'man' + section) + + if condition == '' or conf.get(condition, 0) == 1 + p1 = custom_target( + man, + input : xml, + output : [man] + manaliases, + command : xslt_cmd + [custom_man_xsl, '@INPUT@'], + depend_files : custom_entities_ent, + install : want_man, + install_dir : mandirn) + man_pages += [p1] + + p2 = custom_target( + html, + input : xml, + output : [html] + htmlaliases, + command : xslt_cmd + [custom_html_xsl, '@INPUT@'], + depend_files : custom_entities_ent, + install : want_html, + install_dir : join_paths(docdir, 'html')) + html_pages += [p2] + + source_xml_files += files(tuple[0] + '.xml') + else + message('Skipping @0@.@1@ because @2@ is false'.format(stem, section, condition)) + endif endforeach ############################################################ have_lxml = run_command(xml_helper_py).returncode() == 0 if not have_lxml - message('python-lxml not available, not making man page indices') + message('python-lxml not available, not making man page indices') endif systemd_directives_xml = custom_target( - 'systemd.directives.xml', - input : source_xml_files, - output : 'systemd.directives.xml', - command : [make_directive_index_py, '@OUTPUT@'] + source_xml_files) + 'systemd.directives.xml', + input : source_xml_files, + output : 'systemd.directives.xml', + command : [make_directive_index_py, '@OUTPUT@'] + source_xml_files) nonindex_xml_files = source_xml_files + [systemd_directives_xml] systemd_index_xml = custom_target( - 'systemd.index.xml', - input : nonindex_xml_files, - output : 'systemd.index.xml', - command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files) + 'systemd.index.xml', + input : nonindex_xml_files, + output : 'systemd.index.xml', + command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files) foreach tuple : [['systemd.directives', '7', systemd_directives_xml], ['systemd.index', '7', systemd_index_xml]] - stem = tuple[0] - section = tuple[1] - xml = tuple[2] - - html = stem + '.html' - man = stem + '.' + section - - mandirn = join_paths(get_option('mandir'), 'man' + section) - - p1 = custom_target( - man, - input : xml, - output : man, - command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_man_xsl, '@INPUT@'], - install : want_man and have_lxml, - install_dir : mandirn) - man_pages += [p1] - - p2 = custom_target( - html, - input : xml, - output : html, - command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'], - install : want_html and have_lxml, - install_dir : join_paths(docdir, 'html')) - html_pages += [p2] + stem = tuple[0] + section = tuple[1] + xml = tuple[2] + + html = stem + '.html' + man = stem + '.' + section + + mandirn = join_paths(get_option('mandir'), 'man' + section) + + p1 = custom_target( + man, + input : xml, + output : man, + command : xslt_cmd + [custom_man_xsl, '@INPUT@'], + install : want_man and have_lxml, + install_dir : mandirn) + man_pages += [p1] + + p2 = custom_target( + html, + input : xml, + output : html, + command : xslt_cmd + [custom_html_xsl, '@INPUT@'], + install : want_html and have_lxml, + install_dir : join_paths(docdir, 'html')) + html_pages += [p2] endforeach man = custom_target('man', diff --git a/meson.build b/meson.build index 9504e984ec..a9011e50d2 100644 --- a/meson.build +++ b/meson.build @@ -1,13 +1,11 @@ -# -*- mode: meson -*- - project('systemd', 'c', version : '233', license : 'LGPLv2+', default_options: [ - 'c_std=gnu99', - 'prefix=/usr', - 'sysconfdir=/etc', - 'localstatedir=/var', + 'c_std=gnu99', + 'prefix=/usr', + 'sysconfdir=/etc', + 'localstatedir=/var', ], meson_version : '>= 0.39.1', ) @@ -30,18 +28,18 @@ m4_defines = [] rootprefixdir = get_option('rootprefix') if get_option('split-usr') - conf.set('HAVE_SPLIT_USR', 1) - rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/' + conf.set('HAVE_SPLIT_USR', 1) + rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/' else - rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/usr' + rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/usr' endif sysvinit_path = get_option('sysvinit-path') sysvrcnd_path = get_option('sysvrcnd-path') if sysvinit_path != '' or sysvrcnd_path != '' - conf.set('HAVE_SYSV_COMPAT', 1, - description : 'SysV init scripts and rcN.d links are supported') - m4_defines += ['-DHAVE_SYSV_COMPAT'] + conf.set('HAVE_SYSV_COMPAT', 1, + description : 'SysV init scripts and rcN.d links are supported') + m4_defines += ['-DHAVE_SYSV_COMPAT'] endif # join_paths ignore the preceding arguments if an absolute component is @@ -49,7 +47,7 @@ endif # absolute or relative. prefixdir = get_option('prefix') if not prefixdir.startswith('/') - error('Prefix is not absolute: "@0@"'.format(prefixdir)) + error('Prefix is not absolute: "@0@"'.format(prefixdir)) endif bindir = join_paths(prefixdir, get_option('bindir')) libdir = join_paths(prefixdir, get_option('libdir')) @@ -63,7 +61,7 @@ rootlibexecdir = join_paths(rootprefixdir, 'lib/systemd') rootlibdir = get_option('rootlibdir') if rootlibdir == '' - rootlibdir = join_paths(rootprefixdir, libdir.split('/')[-1]) + rootlibdir = join_paths(rootprefixdir, libdir.split('/')[-1]) endif # Dirs of external packages @@ -113,27 +111,27 @@ randomseeddir = join_paths(localstatedir, 'lib/systemd') dbuspolicydir = get_option('dbuspolicydir') if dbuspolicydir == '' - dbuspolicydir = join_paths(datadir, 'dbus-1/system.d') + dbuspolicydir = join_paths(datadir, 'dbus-1/system.d') endif dbussessionservicedir = get_option('dbussessionservicedir') if dbussessionservicedir == '' - dbussessionservicedir = join_paths(datadir, 'dbus-1/services') + dbussessionservicedir = join_paths(datadir, 'dbus-1/services') endif dbussystemservicedir = get_option('dbussystemservicedir') if dbussystemservicedir == '' - dbussystemservicedir = join_paths(datadir, 'dbus-1/system-services') + dbussystemservicedir = join_paths(datadir, 'dbus-1/system-services') endif pamlibdir = get_option('pamlibdir') if pamlibdir == '' - pamlibdir = join_paths(rootlibdir, 'security') + pamlibdir = join_paths(rootlibdir, 'security') endif pamconfdir = get_option('pamconfdir') if pamconfdir == '' - pamconfdir = join_paths(sysconfdir, 'pam.d') + pamconfdir = join_paths(sysconfdir, 'pam.d') endif conf.set_quoted('PKGSYSCONFDIR', pkgsysconfdir) @@ -264,9 +262,9 @@ foreach arg : ['-Wundef', '-fPIE', '--param=ssp-buffer-size=4', ] - if cc.has_argument(arg) - add_project_arguments(arg, language : 'c') - endif + if cc.has_argument(arg) + add_project_arguments(arg, language : 'c') + endif endforeach if cc.compiles(' @@ -279,18 +277,18 @@ if cc.compiles(' return 0; } ') - # TODO: message? - add_project_arguments('-Werror=shadow', language : 'c') + # TODO: message? + add_project_arguments('-Werror=shadow', language : 'c') endif if cc.get_id() == 'clang' - foreach arg : ['-Wno-typedef-redefinition', - '-Wno-gnu-variable-sized-type-not-at-end', - ] - if cc.has_argument(arg) - add_project_arguments(arg, language : 'c') - endif - endforeach + foreach arg : ['-Wno-typedef-redefinition', + '-Wno-gnu-variable-sized-type-not-at-end', + ] + if cc.has_argument(arg) + add_project_arguments(arg, language : 'c') + endif + endforeach endif # --as-needed and --no-undefined are provided by meson by default, @@ -300,9 +298,9 @@ foreach arg : ['-Wl,-z,relro', '-pie', '-Wl,-fuse-ld=gold', ] - if cc.has_argument(arg) - add_project_link_arguments(arg, language : 'c') - endif + if cc.has_argument(arg) + add_project_link_arguments(arg, language : 'c') + endif endforeach cpp = ' '.join(cc.cmd_array()) + ' -E' @@ -332,10 +330,10 @@ foreach decl : ['char16_t', 'key_serial_t', 'struct ethtool_link_settings', ] - if cc.sizeof(decl, prefix : decl_headers) > 0 - # We get -1 if the size cannot be determined - conf.set('HAVE_' + decl.underscorify().to_upper(), 1) - endif + if cc.sizeof(decl, prefix : decl_headers) > 0 + # We get -1 if the size cannot be determined + conf.set('HAVE_' + decl.underscorify().to_upper(), 1) + endif endforeach foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], @@ -360,41 +358,41 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], ['IFA_FLAGS', 'linux/if_addr.h'], ['LO_FLAGS_PARTSCAN', 'linux/loop.h'], ] - prefix = decl.length() > 2 ? decl[2] : '' - have = cc.has_header_symbol(decl[1], decl[0], prefix : prefix) - conf.set10('HAVE_DECL_' + decl[0], have) + prefix = decl.length() > 2 ? decl[2] : '' + have = cc.has_header_symbol(decl[1], decl[0], prefix : prefix) + conf.set10('HAVE_DECL_' + decl[0], have) endforeach skip = false foreach ident : ['secure_getenv', '__secure_getenv'] - if not skip and cc.has_function(ident) - conf.set('HAVE_' + ident.to_upper(), 1) - skip = true - endif + if not skip and cc.has_function(ident) + conf.set('HAVE_' + ident.to_upper(), 1) + skip = true + endif endforeach foreach ident : [ - ['memfd_create', '''#include <sys/memfd.h>'''], - ['gettid', '''#include <sys/types.h>'''], - ['pivot_root', '''#include <stdlib.h>'''], # no known header declares pivot_root - ['name_to_handle_at', '''#define _GNU_SOURCE - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h>'''], - ['setns', '''#define _GNU_SOURCE - #include <sched.h>'''], - ['getrandom', '''#include <sys/random.h>'''], - ['renameat2', '''#include <stdio.h>'''], - ['kcmp', '''#include <linux/kcmp.h>'''], - ['keyctl', '''#include <sys/types.h> - #include <keyutils.h>'''], - ['copy_file_range', '''#include <sys/syscall.h> - #include <unistd.h>'''], - ['explicit_bzero' , '''#include <strings.h>'''], - ] - - have = cc.has_function(ident[0], prefix : ident[1]) - conf.set10('HAVE_DECL_' + ident[0].to_upper(), have) + ['memfd_create', '''#include <sys/memfd.h>'''], + ['gettid', '''#include <sys/types.h>'''], + ['pivot_root', '''#include <stdlib.h>'''], # no known header declares pivot_root + ['name_to_handle_at', '''#define _GNU_SOURCE + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h>'''], + ['setns', '''#define _GNU_SOURCE + #include <sched.h>'''], + ['getrandom', '''#include <sys/random.h>'''], + ['renameat2', '''#include <stdio.h>'''], + ['kcmp', '''#include <linux/kcmp.h>'''], + ['keyctl', '''#include <sys/types.h> + #include <keyutils.h>'''], + ['copy_file_range', '''#include <sys/syscall.h> + #include <unistd.h>'''], + ['explicit_bzero' , '''#include <strings.h>'''], +] + + have = cc.has_function(ident[0], prefix : ident[1]) + conf.set10('HAVE_DECL_' + ident[0].to_upper(), have) endforeach ##################################################################### @@ -428,16 +426,19 @@ progs = [['telinit', '/lib/sysvinit/telinit'], ['setfont', '/usr/bin/setfont', 'KBD_SETFONT'], ] foreach prog : progs - path = get_option(prog[0] + '-path') - if path != '' - message('Using @1@ for @0@'.format(prog[0], path)) - else - exe = find_program(prog[0], '/usr/sbin/' + prog[0], '/sbin/' + prog[0], required: false) - path = exe.found() ? exe.path() : prog[1] - endif - name = prog.length() > 2 ? prog[2] : prog[0].to_upper() - conf.set_quoted(name, path) - substs.set(name, path) + path = get_option(prog[0] + '-path') + if path != '' + message('Using @1@ for @0@'.format(prog[0], path)) + else + exe = find_program(prog[0], + '/usr/sbin/' + prog[0], + '/sbin/' + prog[0], + required: false) + path = exe.found() ? exe.path() : prog[1] + endif + name = prog.length() > 2 ? prog[2] : prog[0].to_upper() + conf.set_quoted(name, path) + substs.set(name, path) endforeach # TODO: add ln --relative check @@ -456,22 +457,23 @@ gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C' gperf_snippet = run_command('sh', '-c', gperf_snippet_format.format(gperf.path())) gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout()) if cc.compiles(gperf_test) - gperf_len_type = 'size_t' + gperf_len_type = 'size_t' else - gperf_test = gperf_test_format.format('unsigned', gperf_snippet.stdout()) - if cc.compiles(gperf_test) - gperf_len_type = 'unsigned' - else - error('unable to determine gperf len type') - endif + gperf_test = gperf_test_format.format('unsigned', gperf_snippet.stdout()) + if cc.compiles(gperf_test) + gperf_len_type = 'unsigned' + else + error('unable to determine gperf len type') + endif endif message('gperf len type is @0@'.format(gperf_len_type)) -conf.set('GPERF_LEN_TYPE', gperf_len_type, description : 'The type of gperf "len" parameter') +conf.set('GPERF_LEN_TYPE', gperf_len_type, + description : 'The type of gperf "len" parameter') ############################################################ if not cc.has_header('sys/capability.h') - error('POSIX caps headers not found') + error('POSIX caps headers not found') endif foreach header : ['linux/btrfs.h', 'linux/memfd.h', @@ -479,9 +481,9 @@ foreach header : ['linux/btrfs.h', 'valgrind/memcheck.h', 'valgrind/valgrind.h', ] - if cc.has_header(header) - conf.set('HAVE_' + header.underscorify().to_upper(), 1) - endif + if cc.has_header(header) + conf.set('HAVE_' + header.underscorify().to_upper(), 1) + endif endforeach ############################################################ @@ -492,27 +494,27 @@ default_hierarchy = get_option('default-hierarchy') conf.set_quoted('DEFAULT_HIERARCHY_NAME', default_hierarchy, description : 'default cgroup hierarchy as string') if default_hierarchy == 'legacy' - conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_NONE') + conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_NONE') elif default_hierarchy == 'hybrid' - conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_SYSTEMD') + conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_SYSTEMD') else - conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_ALL') + conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_ALL') endif time_epoch = get_option('time-epoch') if time_epoch == '' - NEWS = files('NEWS') - time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout() + NEWS = files('NEWS') + time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout() endif time_epoch = time_epoch.to_int() conf.set('TIME_EPOCH', time_epoch) system_uid_max = get_option('system-uid-max') if system_uid_max == '' - system_uid_max = run_command( - awk, - 'BEGIN { uid=999 } /^\s*SYS_UID_MAX\s+/ { uid=$2 } END { print uid }', - '/etc/login.defs').stdout() + system_uid_max = run_command( + awk, + 'BEGIN { uid=999 } /^\s*SYS_UID_MAX\s+/ { uid=$2 } END { print uid }', + '/etc/login.defs').stdout() endif system_uid_max = system_uid_max.to_int() conf.set('SYSTEM_UID_MAX', system_uid_max) @@ -524,10 +526,10 @@ conf.set_quoted('NOBODY_GROUP_NAME', get_option('nobody-group')) system_gid_max = get_option('system-gid-max') if system_gid_max == '' - system_gid_max = run_command( - awk, - 'BEGIN { gid=999 } /^\s*SYS_GID_MAX\s+/ { gid=$2 } END { print gid }', - '/etc/login.defs').stdout() + system_gid_max = run_command( + awk, + 'BEGIN { gid=999 } /^\s*SYS_GID_MAX\s+/ { gid=$2 } END { print gid }', + '/etc/login.defs').stdout() endif system_gid_max = system_gid_max.to_int() conf.set('SYSTEM_GID_MAX', system_gid_max) @@ -539,11 +541,11 @@ conf.set('TTY_GID', tty_gid) substs.set('TTY_GID', tty_gid) if get_option('adm-group') - m4_defines += ['-DENABLE_ADM_GROUP'] + m4_defines += ['-DENABLE_ADM_GROUP'] endif if get_option('wheel-group') - m4_defines += ['-DENABLE_WHEEL_GROUP'] + m4_defines += ['-DENABLE_WHEEL_GROUP'] endif substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode')) @@ -582,346 +584,346 @@ libmount = dependency('mount', want_seccomp = get_option('seccomp') if want_seccomp != 'false' - libseccomp = dependency('libseccomp', - required : want_seccomp == 'true') - if libseccomp.found() - conf.set('HAVE_SECCOMP', 1) - m4_defines += ['-DHAVE_SECCOMP'] - endif + libseccomp = dependency('libseccomp', + required : want_seccomp == 'true') + if libseccomp.found() + conf.set('HAVE_SECCOMP', 1) + m4_defines += ['-DHAVE_SECCOMP'] + endif else - libseccomp = [] + libseccomp = [] endif want_selinux = get_option('selinux') if want_selinux != 'false' - libselinux = dependency('libselinux', - version : '>= 2.1.9', - required : want_selinux == 'true') - if libselinux.found() - conf.set('HAVE_SELINUX', 1) - m4_defines += ['-DHAVE_SELINUX'] - endif + libselinux = dependency('libselinux', + version : '>= 2.1.9', + required : want_selinux == 'true') + if libselinux.found() + conf.set('HAVE_SELINUX', 1) + m4_defines += ['-DHAVE_SELINUX'] + endif else - libselinux = [] + libselinux = [] endif want_apparmor = get_option('apparmor') if want_apparmor != 'false' - libapparmor = dependency('libapparmor', - required : want_apparmor == 'true') - if libapparmor.found() - conf.set('HAVE_APPARMOR', 1) - m4_defines += ['-DHAVE_APPARMOR'] - endif + libapparmor = dependency('libapparmor', + required : want_apparmor == 'true') + if libapparmor.found() + conf.set('HAVE_APPARMOR', 1) + m4_defines += ['-DHAVE_APPARMOR'] + endif else - libapparmor = [] + libapparmor = [] endif want_smack = get_option('smack') if want_smack != 'false' - libsmack = dependency('libsmack', - required : want_smack == 'true') - if libsmack.found() - conf.set('HAVE_SMACK', 1) - m4_defines += ['-DHAVE_SMACK'] - endif + libsmack = dependency('libsmack', + required : want_smack == 'true') + if libsmack.found() + conf.set('HAVE_SMACK', 1) + m4_defines += ['-DHAVE_SMACK'] + endif else - libsmack = [] + libsmack = [] endif smack_run_label = get_option('smack-run-label') if smack_run_label != '' - conf.set_quoted('SMACK_RUN_LABEL', smack_run_label) - m4_defines += ['-DHAVE_SMACK_RUN_LABEL'] + conf.set_quoted('SMACK_RUN_LABEL', smack_run_label) + m4_defines += ['-DHAVE_SMACK_RUN_LABEL'] endif want_polkit = get_option('polkit') install_polkit = false install_polkit_pkla = false if want_polkit != 'false' - conf.set('ENABLE_POLKIT', 1) - install_polkit = true + conf.set('ENABLE_POLKIT', 1) + install_polkit = true - libpolkit = dependency('polkit-gobject-1', - required : false) - if libpolkit.found() and libpolkit.version().version_compare('< 0.106') - message('Old polkit detected, will install pkla files') - install_polkit_pkla = true - endif + libpolkit = dependency('polkit-gobject-1', + required : false) + if libpolkit.found() and libpolkit.version().version_compare('< 0.106') + message('Old polkit detected, will install pkla files') + install_polkit_pkla = true + endif endif want_audit = get_option('audit') if want_audit != 'false' - libaudit = dependency('audit', required : want_audit == 'true') - if libaudit.found() - conf.set('HAVE_AUDIT', 1) - endif + libaudit = dependency('audit', required : want_audit == 'true') + if libaudit.found() + conf.set('HAVE_AUDIT', 1) + endif else - libaudit = [] + libaudit = [] endif want_blkid = get_option('blkid') if want_blkid != 'false' - libblkid = dependency('blkid', required : want_blkid == 'true') - if libblkid.found() - conf.set('HAVE_BLKID', 1) - endif + libblkid = dependency('blkid', required : want_blkid == 'true') + if libblkid.found() + conf.set('HAVE_BLKID', 1) + endif else - libblkid = [] + libblkid = [] endif want_kmod = get_option('kmod') if want_kmod != 'false' - libkmod = dependency('libkmod', - version : '>= 15', - required : want_kmod == 'true') - if libkmod.found() - conf.set('HAVE_KMOD', 1) - endif + libkmod = dependency('libkmod', + version : '>= 15', + required : want_kmod == 'true') + if libkmod.found() + conf.set('HAVE_KMOD', 1) + endif else - libkmod = [] + libkmod = [] endif want_pam = get_option('pam') if want_pam != 'false' - libpam = cc.find_library('pam', required : want_pam == 'true') - libpam_misc = cc.find_library('pam_misc', required : want_pam == 'true') - if libpam.found() and libpam_misc.found() - conf.set('HAVE_PAM', 1) - m4_defines += ['-DHAVE_PAM'] - endif + libpam = cc.find_library('pam', required : want_pam == 'true') + libpam_misc = cc.find_library('pam_misc', required : want_pam == 'true') + if libpam.found() and libpam_misc.found() + conf.set('HAVE_PAM', 1) + m4_defines += ['-DHAVE_PAM'] + endif else - libpam = [] - libpam_misc = [] + libpam = [] + libpam_misc = [] endif want_microhttpd = get_option('microhttpd') if want_microhttpd != 'false' - libmicrohttpd = dependency('libmicrohttpd', - version : '>= 0.9.33', - required : want_microhttpd == 'true') - if libmicrohttpd.found() - conf.set('HAVE_MICROHTTPD', 1) - m4_defines += ['-DHAVE_MICROHTTPD'] - endif + libmicrohttpd = dependency('libmicrohttpd', + version : '>= 0.9.33', + required : want_microhttpd == 'true') + if libmicrohttpd.found() + conf.set('HAVE_MICROHTTPD', 1) + m4_defines += ['-DHAVE_MICROHTTPD'] + endif else - libmicrohttpd = [] + libmicrohttpd = [] endif want_libcryptsetup = get_option('libcryptsetup') if want_libcryptsetup != 'false' - libcryptsetup = dependency('libcryptsetup', - version : '>= 1.6.0', - required : want_libcryptsetup == 'true') - if libcryptsetup.found() - conf.set('HAVE_LIBCRYPTSETUP', 1) - endif + libcryptsetup = dependency('libcryptsetup', + version : '>= 1.6.0', + required : want_libcryptsetup == 'true') + if libcryptsetup.found() + conf.set('HAVE_LIBCRYPTSETUP', 1) + endif else - libcryptsetup = [] + libcryptsetup = [] endif want_libcurl = get_option('libcurl') if want_libcurl != 'false' - libcurl = dependency('libcurl', - version : '>= 7.32.0', - required : want_libcurl == 'true') - if libcurl.found() - conf.set('HAVE_LIBCURL', 1) - m4_defines += ['-DHAVE_LIBCURL'] - endif + libcurl = dependency('libcurl', + version : '>= 7.32.0', + required : want_libcurl == 'true') + if libcurl.found() + conf.set('HAVE_LIBCURL', 1) + m4_defines += ['-DHAVE_LIBCURL'] + endif else - libcurl = [] + libcurl = [] endif want_libidn = get_option('libidn') if want_libidn != 'false' - libidn = dependency('libidn', - required : want_libidn == 'true') - if libidn.found() - conf.set('HAVE_LIBIDN', 1) - m4_defines += ['-DHAVE_LIBIDN'] - endif + libidn = dependency('libidn', + required : want_libidn == 'true') + if libidn.found() + conf.set('HAVE_LIBIDN', 1) + m4_defines += ['-DHAVE_LIBIDN'] + endif else - libidn = [] + libidn = [] endif want_libiptc = get_option('libiptc') if want_libiptc != 'false' - libiptc = dependency('libiptc', - required : want_libiptc == 'true') - if libiptc.found() - conf.set('HAVE_LIBIPTC', 1) - m4_defines += ['-DHAVE_LIBIPTC'] - endif + libiptc = dependency('libiptc', + required : want_libiptc == 'true') + if libiptc.found() + conf.set('HAVE_LIBIPTC', 1) + m4_defines += ['-DHAVE_LIBIPTC'] + endif else - libiptc = [] + libiptc = [] endif want_qrencode = get_option('qrencode') if want_qrencode != 'false' - libqrencode = dependency('libqrencode', - required : want_qrencode == 'true') - if libqrencode.found() - conf.set('HAVE_QRENCODE', 1) - endif + libqrencode = dependency('libqrencode', + required : want_qrencode == 'true') + if libqrencode.found() + conf.set('HAVE_QRENCODE', 1) + endif else - libqrencode = [] + libqrencode = [] endif want_gnutls = get_option('gnutls') if want_gnutls != 'false' - libgnutls = dependency('gnutls', - version : '>= 3.1.4', - required : want_gnutls == 'true') - if libgnutls.found() - conf.set('HAVE_GNUTLS', 1) - endif + libgnutls = dependency('gnutls', + version : '>= 3.1.4', + required : want_gnutls == 'true') + if libgnutls.found() + conf.set('HAVE_GNUTLS', 1) + endif else - libgnutls = [] + libgnutls = [] endif want_elfutils = get_option('elfutils') if want_elfutils != 'false' - libdw = dependency('libdw', - required : want_elfutils == 'true') - if libdw.found() - conf.set('HAVE_ELFUTILS', 1) - endif + libdw = dependency('libdw', + required : want_elfutils == 'true') + if libdw.found() + conf.set('HAVE_ELFUTILS', 1) + endif else - libdw = [] + libdw = [] endif want_zlib = get_option('zlib') if want_zlib != 'false' - libz = dependency('zlib', - required : want_zlib == 'true') - if libz.found() - conf.set('HAVE_ZLIB', 1) - endif + libz = dependency('zlib', + required : want_zlib == 'true') + if libz.found() + conf.set('HAVE_ZLIB', 1) + endif else - libz = [] + libz = [] endif want_bzip2 = get_option('bzip2') if want_bzip2 != 'false' - libbzip2 = cc.find_library('bz2', - required : want_bzip2 == 'true') - if libbzip2.found() - conf.set('HAVE_BZIP2', 1) - endif + libbzip2 = cc.find_library('bz2', + required : want_bzip2 == 'true') + if libbzip2.found() + conf.set('HAVE_BZIP2', 1) + endif else - libbzip2 = [] + libbzip2 = [] endif want_xz = get_option('xz') if want_xz != 'false' - libxz = dependency('liblzma', - required : want_xz == 'true') - if libxz.found() - conf.set('HAVE_XZ', 1) - endif + libxz = dependency('liblzma', + required : want_xz == 'true') + if libxz.found() + conf.set('HAVE_XZ', 1) + endif else - libxz = [] + libxz = [] endif want_lz4 = get_option('lz4') if want_lz4 != 'false' - liblz4 = dependency('liblz4', - required : want_lz4 == 'true') - if liblz4.found() - conf.set('HAVE_LZ4', 1) - endif + liblz4 = dependency('liblz4', + required : want_lz4 == 'true') + if liblz4.found() + conf.set('HAVE_LZ4', 1) + endif else - liblz4 = [] + liblz4 = [] endif libacl = cc.find_library('acl', required : false) if libacl.found() - conf.set('HAVE_ACL', 1) - m4_defines += ['-DHAVE_ACL'] + conf.set('HAVE_ACL', 1) + m4_defines += ['-DHAVE_ACL'] endif want_glib = get_option('glib') if want_glib != 'false' - libglib = dependency('glib-2.0', - version : '>= 2.22.0', - required : want_glib == 'true') - libgobject = dependency('gobject-2.0', - version : '>= 2.22.0', - required : want_glib == 'true') - libgio = dependency('gio-2.0', - required : want_glib == 'true') - if libglib.found() and libgobject.found() and libgio.found() - conf.set('HAVE_GLIB', 1) - endif + libglib = dependency('glib-2.0', + version : '>= 2.22.0', + required : want_glib == 'true') + libgobject = dependency('gobject-2.0', + version : '>= 2.22.0', + required : want_glib == 'true') + libgio = dependency('gio-2.0', + required : want_glib == 'true') + if libglib.found() and libgobject.found() and libgio.found() + conf.set('HAVE_GLIB', 1) + endif else - libglib = [] - libgobject = [] - libgio = [] + libglib = [] + libgobject = [] + libgio = [] endif want_xkbcommon = get_option('xkbcommon') if want_xkbcommon != 'false' - libxkbcommon = dependency('xkbcommon', - version : '>= 0.3.0', - required : want_xkbcommon == 'true') - if libxkbcommon.found() - conf.set('HAVE_XKBCOMMON', 1) - endif + libxkbcommon = dependency('xkbcommon', + version : '>= 0.3.0', + required : want_xkbcommon == 'true') + if libxkbcommon.found() + conf.set('HAVE_XKBCOMMON', 1) + endif else - libxkbcommon = [] + libxkbcommon = [] endif want_dbus = get_option('dbus') if want_dbus != 'false' - libdbus = dependency('dbus-1', - version : '>= 1.3.2', - required : want_dbus == 'true') - if libdbus.found() - conf.set('HAVE_DBUS', 1) - endif + libdbus = dependency('dbus-1', + version : '>= 1.3.2', + required : want_dbus == 'true') + if libdbus.found() + conf.set('HAVE_DBUS', 1) + endif else - libdbus = [] + libdbus = [] endif want_libgcrypt = get_option('libgcrypt') if want_libgcrypt != 'false' - libgcrypt = cc.find_library('gcrypt', required : want_libgcrypt == 'true') - if libgcrypt.found() - conf.set('HAVE_LIBGCRYPT', 1) - endif + libgcrypt = cc.find_library('gcrypt', required : want_libgcrypt == 'true') + if libgcrypt.found() + conf.set('HAVE_LIBGCRYPT', 1) + endif else - libgcrypt = [] + libgcrypt = [] endif want_importd = get_option('importd') if want_importd != 'false' - have_deps = (conf.get('HAVE_LIBCURL', 0) == 1 and - conf.get('HAVE_ZLIB', 0) == 1 and - conf.get('HAVE_BZIP2', 0) == 1 and - conf.get('HAVE_XZ', 0) == 1 and - conf.get('HAVE_LIBGCRYPT', 0) == 1) - if have_deps - conf.set('ENABLE_IMPORTD', 1) - elif want_importd == 'true' - error('importd support was requested, but dependencies are not available') - endif + have_deps = (conf.get('HAVE_LIBCURL', 0) == 1 and + conf.get('HAVE_ZLIB', 0) == 1 and + conf.get('HAVE_BZIP2', 0) == 1 and + conf.get('HAVE_XZ', 0) == 1 and + conf.get('HAVE_LIBGCRYPT', 0) == 1) + if have_deps + conf.set('ENABLE_IMPORTD', 1) + elif want_importd == 'true' + error('importd support was requested, but dependencies are not available') + endif endif want_remote = get_option('remote') if want_remote != 'false' - have_deps = [conf.get('HAVE_MICROHTTPD', 0) == 1, - conf.get('HAVE_LIBCURL', 0) == 1] - # sd-j-remote requires µhttpd, and sd-j-upload requires libcurl, so - # it's possible to build one without the other. Complain only if - # support was explictly requested. The auxiliary files like sysusers - # config should be installed when any of the programs are built. - if want_remote == 'true' and not (have_deps[0] and have_deps[1]) - error('remote support was requested, but dependencies are not available') - endif - if have_deps[0] or have_deps[1] - conf.set('ENABLE_REMOTE', 1) - endif + have_deps = [conf.get('HAVE_MICROHTTPD', 0) == 1, + conf.get('HAVE_LIBCURL', 0) == 1] + # sd-j-remote requires µhttpd, and sd-j-upload requires libcurl, so + # it's possible to build one without the other. Complain only if + # support was explictly requested. The auxiliary files like sysusers + # config should be installed when any of the programs are built. + if want_remote == 'true' and not (have_deps[0] and have_deps[1]) + error('remote support was requested, but dependencies are not available') + endif + if have_deps[0] or have_deps[1] + conf.set('ENABLE_REMOTE', 1) + endif endif foreach pair : [['utmp', 'HAVE_UTMP'], @@ -952,10 +954,10 @@ foreach pair : [['utmp', 'HAVE_UTMP'], ['ima', 'HAVE_IMA'], ] - if get_option(pair[0]) - conf.set(pair[1], 1) - m4_defines += ['-D' + pair[1]] - endif + if get_option(pair[0]) + conf.set(pair[1], 1) + m4_defines += ['-D' + pair[1]] + endif endforeach want_tests = get_option('tests') @@ -965,29 +967,29 @@ tests = [] ##################################################################### if get_option('efi') - efi_arch = host_machine.cpu_family() + efi_arch = host_machine.cpu_family() - if efi_arch == 'ia32' - EFI_MACHINE_TYPE_NAME = 'ia32' - elif efi_arch == 'x86_64' - EFI_MACHINE_TYPE_NAME = 'x64' - elif efi_arch == 'arm' - EFI_MACHINE_TYPE_NAME = 'arm' - elif efi_arch == 'aarch64' - EFI_MACHINE_TYPE_NAME = 'aa64' - else - EFI_MACHINE_TYPE_NAME = '' - endif + if efi_arch == 'ia32' + EFI_MACHINE_TYPE_NAME = 'ia32' + elif efi_arch == 'x86_64' + EFI_MACHINE_TYPE_NAME = 'x64' + elif efi_arch == 'arm' + EFI_MACHINE_TYPE_NAME = 'arm' + elif efi_arch == 'aarch64' + EFI_MACHINE_TYPE_NAME = 'aa64' + else + EFI_MACHINE_TYPE_NAME = '' + endif - conf.set('ENABLE_EFI', 1) - conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) + conf.set('ENABLE_EFI', 1) + conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) endif ##################################################################### config_h = configure_file( - output : 'config.h', - configuration : conf) + output : 'config.h', + configuration : conf) includes = include_directories('src/basic', 'src/shared', @@ -1023,29 +1025,29 @@ subdir('src/journal') subdir('src/login') libjournal_core = static_library( - 'journal-core', - libjournal_core_sources, - journald_gperf_c, - include_directories : includes, - install : false) + 'journal-core', + libjournal_core_sources, + journald_gperf_c, + include_directories : includes, + install : false) libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym) libsystemd = shared_library( - 'systemd', - libsystemd_internal_sources, - journal_internal_sources, - version : '0.18.0', - include_directories : includes, - link_args : ['-shared', - '-Wl,--version-script=' + libsystemd_sym_path], - link_with : [libbasic], - dependencies : [threads, - librt, - libxz, - liblz4], - link_depends : libsystemd_sym, - install : true, - install_dir : rootlibdir) + 'systemd', + libsystemd_internal_sources, + journal_internal_sources, + version : '0.18.0', + include_directories : includes, + link_args : ['-shared', + '-Wl,--version-script=' + libsystemd_sym_path], + link_with : [libbasic], + dependencies : [threads, + librt, + libxz, + liblz4], + link_depends : libsystemd_sym, + install : true, + install_dir : rootlibdir) ############################################################ @@ -1083,51 +1085,51 @@ subdir('test') # only static linking apart from libdl, to make sure that the # module is linked to all libraries that it uses. test_dlopen = executable( - 'test-dlopen', - test_dlopen_c, - include_directories : includes, - link_with : [libbasic], - dependencies : [libdl]) + 'test-dlopen', + test_dlopen_c, + include_directories : includes, + link_with : [libbasic], + dependencies : [libdl]) foreach tuple : [['myhostname', 'HAVE_MYHOSTNAME', []], ['systemd', '', []], ['mymachines', 'ENABLE_MACHINED', []], ['resolve', 'ENABLE_RESOLVED', [libdl]]] - condition = tuple[1] == '' or conf.get(tuple[1], 0) == 1 - if condition - module = tuple[0] - extra_deps = tuple[2] - - sym = 'src/nss-@0@/nss-@0@.sym'.format(module) - version_script_arg = join_paths(meson.current_source_dir(), sym) - - nss = shared_library( - 'nss_' + module, - 'src/nss-@0@/nss-@0@.c'.format(module), - version : '2', - include_directories : includes, - link_args : ['-shared', - '-Wl,--version-script=' + version_script_arg, - '-Wl,--undefined'], - link_with : [libsystemd_internal, - libbasic], - dependencies : [threads, - librt] + extra_deps, - link_depends : sym, - install : true, - install_dir : rootlibdir) - - # We cannot use shared_module because it does not support version suffix. - # Unfortunately shared_library insists on creating the symlink… - meson.add_install_script('sh', '-c', - 'rm $DESTDIR@0@/libnss_@1@.so' - .format(rootlibdir, module)) - - test('dlopen-nss_' + module, - test_dlopen, - args : [nss.full_path()]) # path to dlopen must include a slash - endif + condition = tuple[1] == '' or conf.get(tuple[1], 0) == 1 + if condition + module = tuple[0] + extra_deps = tuple[2] + + sym = 'src/nss-@0@/nss-@0@.sym'.format(module) + version_script_arg = join_paths(meson.current_source_dir(), sym) + + nss = shared_library( + 'nss_' + module, + 'src/nss-@0@/nss-@0@.c'.format(module), + version : '2', + include_directories : includes, + link_args : ['-shared', + '-Wl,--version-script=' + version_script_arg, + '-Wl,--undefined'], + link_with : [libsystemd_internal, + libbasic], + dependencies : [threads, + librt] + extra_deps, + link_depends : sym, + install : true, + install_dir : rootlibdir) + + # We cannot use shared_module because it does not support version suffix. + # Unfortunately shared_library insists on creating the symlink… + meson.add_install_script('sh', '-c', + 'rm $DESTDIR@0@/libnss_@1@.so' + .format(rootlibdir, module)) + + test('dlopen-nss_' + module, + test_dlopen, + args : [nss.full_path()]) # path to dlopen must include a slash + endif endforeach ############################################################ @@ -1229,161 +1231,161 @@ executable('systemd-fstab-generator', install_dir : systemgeneratordir) if conf.get('ENABLE_ENVIRONMENT_D', 0) == 1 - executable('30-systemd-environment-d-generator', - 'src/environment-d-generator/environment-d-generator.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : userenvgeneratordir) + executable('30-systemd-environment-d-generator', + 'src/environment-d-generator/environment-d-generator.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : userenvgeneratordir) - meson.add_install_script(meson_make_symlink, - join_paths(sysconfdir, 'environment'), - join_paths(environmentdir, '99-environment.conf')) + meson.add_install_script(meson_make_symlink, + join_paths(sysconfdir, 'environment'), + join_paths(environmentdir, '99-environment.conf')) endif if conf.get('ENABLE_HIBERNATE', 0) == 1 - executable('systemd-hibernate-resume-generator', - 'src/hibernate-resume/hibernate-resume-generator.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) - - executable('systemd-hibernate-resume', - 'src/hibernate-resume/hibernate-resume.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) -endif + executable('systemd-hibernate-resume-generator', + 'src/hibernate-resume/hibernate-resume-generator.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) -if conf.get('HAVE_BLKID', 0) == 1 - executable('systemd-gpt-auto-generator', - 'src/gpt-auto-generator/gpt-auto-generator.c', - 'src/basic/blkid-util.h', - include_directories : includes, - link_with : [libshared, - libudev], - dependencies : libblkid, - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) - - exe = executable('systemd-dissect', - 'src/dissect/dissect.c', + executable('systemd-hibernate-resume', + 'src/hibernate-resume/hibernate-resume.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) - public_programs += [exe] +endif + +if conf.get('HAVE_BLKID', 0) == 1 + executable('systemd-gpt-auto-generator', + 'src/gpt-auto-generator/gpt-auto-generator.c', + 'src/basic/blkid-util.h', + include_directories : includes, + link_with : [libshared, + libudev], + dependencies : libblkid, + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) + + exe = executable('systemd-dissect', + 'src/dissect/dissect.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [exe] endif if conf.get('ENABLE_RESOLVED', 0) == 1 - executable('systemd-resolved', - systemd_resolved_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libm, - libidn], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('systemd-resolve', - systemd_resolve_sources, + executable('systemd-resolved', + systemd_resolved_sources, include_directories : includes, link_with : [libshared], dependencies : [threads, libm, libidn], install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + install : true, + install_dir : rootlibexecdir) + + exe = executable('systemd-resolve', + systemd_resolve_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libm, + libidn], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif if conf.get('ENABLE_LOGIND', 0) == 1 - executable('systemd-logind', - systemd_logind_sources, - include_directories : includes, - link_with : [liblogind_core, - libshared, - libudev], - dependencies : [threads, - libacl], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('loginctl', - loginctl_sources, + executable('systemd-logind', + systemd_logind_sources, include_directories : includes, - link_with : [libshared, + link_with : [liblogind_core, + libshared, libudev], dependencies : [threads, - liblz4, - libxz], + libacl], install_rpath : rootlibexecdir, install : true, - install_dir : rootbindir) - public_programs += [exe] + install_dir : rootlibexecdir) + + exe = executable('loginctl', + loginctl_sources, + include_directories : includes, + link_with : [libshared, + libudev], + dependencies : [threads, + liblz4, + libxz], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] + + exe = executable('systemd-inhibit', + 'src/login/inhibit.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] + + if conf.get('HAVE_PAM', 0) == 1 + version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym) + pam_systemd = shared_library( + 'pam_systemd', + pam_systemd_c, + name_prefix : '', + include_directories : includes, + link_args : ['-shared', + '-Wl,--version-script=' + version_script_arg], + link_with : [libsystemd_internal, + libshared_static], + dependencies : [threads, + libpam, + libpam_misc], + link_depends : pam_systemd_sym, + install : true, + install_dir : pamlibdir) + + test('dlopen-pam_systemd', + test_dlopen, + args : [pam_systemd.full_path()]) # path to dlopen must include a slash + endif +endif - exe = executable('systemd-inhibit', - 'src/login/inhibit.c', +if conf.get('HAVE_PAM', 0) == 1 + executable('systemd-user-sessions', + 'src/user-sessions/user-sessions.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true, - install_dir : rootbindir) - public_programs += [exe] - - if conf.get('HAVE_PAM', 0) == 1 - version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym) - pam_systemd = shared_library( - 'pam_systemd', - pam_systemd_c, - name_prefix : '', - include_directories : includes, - link_args : ['-shared', - '-Wl,--version-script=' + version_script_arg], - link_with : [libsystemd_internal, - libshared_static], - dependencies : [threads, - libpam, - libpam_misc], - link_depends : pam_systemd_sym, - install : true, - install_dir : pamlibdir) - - test('dlopen-pam_systemd', - test_dlopen, - args : [pam_systemd.full_path()]) # path to dlopen must include a slash - endif -endif - -if conf.get('HAVE_PAM', 0) == 1 - executable('systemd-user-sessions', - 'src/user-sessions/user-sessions.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + install_dir : rootlibexecdir) endif if conf.get('ENABLE_EFI', 0) == 1 and conf.get('HAVE_BLKID', 0) == 1 - exe = executable('bootctl', - 'src/boot/bootctl.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libblkid], - install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + exe = executable('bootctl', + 'src/boot/bootctl.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libblkid], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif exe = executable('systemd-socket-activate', 'src/activate/activate.c', @@ -1408,25 +1410,25 @@ exe = executable('systemctl', 'src/systemctl/systemctl.c', public_programs += [exe] if conf.get('ENABLE_BACKLIGHT', 0) == 1 - executable('systemd-backlight', - 'src/backlight/backlight.c', - include_directories : includes, - link_with : [libshared, - libudev], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-backlight', + 'src/backlight/backlight.c', + include_directories : includes, + link_with : [libshared, + libudev], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) endif if conf.get('ENABLE_RFKILL', 0) == 1 - executable('systemd-rfkill', - 'src/rfkill/rfkill.c', - include_directories : includes, - link_with : [libshared, - libudev], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-rfkill', + 'src/rfkill/rfkill.c', + include_directories : includes, + link_with : [libshared, + libudev], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) endif executable('systemd-system-update-generator', @@ -1438,323 +1440,323 @@ executable('systemd-system-update-generator', install_dir : systemgeneratordir) if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1 - executable('systemd-cryptsetup', - 'src/cryptsetup/cryptsetup.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - executable('systemd-cryptsetup-generator', - 'src/cryptsetup/cryptsetup-generator.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) - - executable('systemd-veritysetup', - 'src/veritysetup/veritysetup.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - executable('systemd-veritysetup-generator', - 'src/veritysetup/veritysetup-generator.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) + executable('systemd-cryptsetup', + 'src/cryptsetup/cryptsetup.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcryptsetup], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + executable('systemd-cryptsetup-generator', + 'src/cryptsetup/cryptsetup-generator.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcryptsetup], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) + + executable('systemd-veritysetup', + 'src/veritysetup/veritysetup.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcryptsetup], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + executable('systemd-veritysetup-generator', + 'src/veritysetup/veritysetup-generator.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcryptsetup], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) endif if conf.get('HAVE_SYSV_COMPAT', 0) == 1 - executable('systemd-sysv-generator', - 'src/sysv-generator/sysv-generator.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) - - executable('systemd-rc-local-generator', - 'src/rc-local-generator/rc-local-generator.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) + executable('systemd-sysv-generator', + 'src/sysv-generator/sysv-generator.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) + + executable('systemd-rc-local-generator', + 'src/rc-local-generator/rc-local-generator.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) endif if conf.get('ENABLE_HOSTNAMED', 0) == 1 - executable('systemd-hostnamed', - 'src/hostname/hostnamed.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('hostnamectl', - 'src/hostname/hostnamectl.c', + executable('systemd-hostnamed', + 'src/hostname/hostnamed.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + install : true, + install_dir : rootlibexecdir) + + exe = executable('hostnamectl', + 'src/hostname/hostnamectl.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif if conf.get('ENABLE_LOCALED', 0) == 1 - if conf.get('HAVE_XKBCOMMON', 0) == 1 - # logind will load libxkbcommon.so dynamically on its own - deps = [libdl] - else - deps = [] - endif - - executable('systemd-localed', - systemd_localed_sources, - include_directories : includes, - link_with : [libshared], - dependencies : deps, - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('localectl', - localectl_sources, + if conf.get('HAVE_XKBCOMMON', 0) == 1 + # logind will load libxkbcommon.so dynamically on its own + deps = [libdl] + else + deps = [] + endif + + executable('systemd-localed', + systemd_localed_sources, include_directories : includes, link_with : [libshared], + dependencies : deps, install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + install : true, + install_dir : rootlibexecdir) + + exe = executable('localectl', + localectl_sources, + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif if conf.get('ENABLE_TIMEDATED', 0) == 1 - executable('systemd-timedated', - 'src/timedate/timedated.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('timedatectl', - 'src/timedate/timedatectl.c', + executable('systemd-timedated', + 'src/timedate/timedated.c', include_directories : includes, - install_rpath : rootlibexecdir, link_with : [libshared], - install : true) - public_programs += [exe] -endif + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) -if conf.get('ENABLE_TIMESYNCD', 0) == 1 - executable('systemd-timesyncd', - systemd_timesyncd_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libm], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + exe = executable('timedatectl', + 'src/timedate/timedatectl.c', + include_directories : includes, + install_rpath : rootlibexecdir, + link_with : [libshared], + install : true) + public_programs += [exe] endif -if conf.get('ENABLE_MACHINED', 0) == 1 - executable('systemd-machined', - systemd_machined_sources, - include_directories : includes, - link_with : [libmachine_core, - libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('machinectl', - 'src/machine/machinectl.c', +if conf.get('ENABLE_TIMESYNCD', 0) == 1 + executable('systemd-timesyncd', + systemd_timesyncd_sources, include_directories : includes, link_with : [libshared], dependencies : [threads, - libxz, - liblz4], + libm], install_rpath : rootlibexecdir, install : true, - install_dir : rootbindir) - public_programs += [exe] + install_dir : rootlibexecdir) endif -if conf.get('ENABLE_IMPORTD', 0) == 1 - executable('systemd-importd', - systemd_importd_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - systemd_pull = executable('systemd-pull', - systemd_pull_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcurl, - libz, - libbzip2, - libxz, - libgcrypt], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - systemd_import = executable('systemd-import', - systemd_import_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcurl, - libz, - libbzip2, - libxz], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - systemd_export = executable('systemd-export', - systemd_export_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcurl, - libz, - libbzip2, - libxz], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - public_programs += [systemd_pull, systemd_import, systemd_export] +if conf.get('ENABLE_MACHINED', 0) == 1 + executable('systemd-machined', + systemd_machined_sources, + include_directories : includes, + link_with : [libmachine_core, + libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + exe = executable('machinectl', + 'src/machine/machinectl.c', + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] endif -if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 - exe = executable('systemd-journal-upload', - systemd_journal_upload_sources, +if conf.get('ENABLE_IMPORTD', 0) == 1 + executable('systemd-importd', + systemd_importd_sources, include_directories : includes, link_with : [libshared], - dependencies : [threads, - libcurl, - libgnutls, - libxz, - liblz4], + dependencies : [threads], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) - public_programs += [exe] + + systemd_pull = executable('systemd-pull', + systemd_pull_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [libcurl, + libz, + libbzip2, + libxz, + libgcrypt], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + systemd_import = executable('systemd-import', + systemd_import_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [libcurl, + libz, + libbzip2, + libxz], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + systemd_export = executable('systemd-export', + systemd_export_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [libcurl, + libz, + libbzip2, + libxz], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [systemd_pull, systemd_import, systemd_export] +endif + +if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 + exe = executable('systemd-journal-upload', + systemd_journal_upload_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libcurl, + libgnutls, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [exe] endif if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 - s_j_remote = executable('systemd-journal-remote', - systemd_journal_remote_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libmicrohttpd, - libgnutls, - libxz, - liblz4], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - s_j_gatewayd = executable('systemd-journal-gatewayd', - systemd_journal_gatewayd_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libmicrohttpd, - libgnutls, - libxz, - liblz4], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - public_programs += [s_j_remote, s_j_gatewayd] + s_j_remote = executable('systemd-journal-remote', + systemd_journal_remote_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libmicrohttpd, + libgnutls, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + s_j_gatewayd = executable('systemd-journal-gatewayd', + systemd_journal_gatewayd_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libmicrohttpd, + libgnutls, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [s_j_remote, s_j_gatewayd] endif if conf.get('ENABLE_COREDUMP', 0) == 1 - executable('systemd-coredump', - systemd_coredump_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libacl, - libdw, - libxz, - liblz4], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('coredumpctl', - coredumpctl_sources, + executable('systemd-coredump', + systemd_coredump_sources, include_directories : includes, link_with : [libshared], dependencies : [threads, + libacl, + libdw, libxz, liblz4], install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + install : true, + install_dir : rootlibexecdir) + + exe = executable('coredumpctl', + coredumpctl_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif if conf.get('ENABLE_BINFMT', 0) == 1 - exe = executable('systemd-binfmt', - 'src/binfmt/binfmt.c', + exe = executable('systemd-binfmt', + 'src/binfmt/binfmt.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [exe] + + meson.add_install_script('sh', '-c', + mkdir_p.format(binfmtdir)) + meson.add_install_script('sh', '-c', + mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) +endif + +if conf.get('ENABLE_VCONSOLE', 0) == 1 + executable('systemd-vconsole-setup', + 'src/vconsole/vconsole-setup.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) - public_programs += [exe] - - meson.add_install_script('sh', '-c', - mkdir_p.format(binfmtdir)) - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) -endif - -if conf.get('ENABLE_VCONSOLE', 0) == 1 - executable('systemd-vconsole-setup', - 'src/vconsole/vconsole-setup.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) endif if conf.get('ENABLE_RANDOMSEED', 0) == 1 - executable('systemd-random-seed', - 'src/random-seed/random-seed.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-random-seed', + 'src/random-seed/random-seed.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) endif if conf.get('ENABLE_FIRSTBOOT', 0) == 1 - executable('systemd-firstboot', - 'src/firstboot/firstboot.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcrypt], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootbindir) + executable('systemd-firstboot', + 'src/firstboot/firstboot.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcrypt], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) endif executable('systemd-remount-fs', @@ -1957,48 +1959,48 @@ exe = executable('busctl', public_programs += [exe] if conf.get('ENABLE_SYSUSERS', 0) == 1 - exe = executable('systemd-sysusers', - 'src/sysusers/sysusers.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootbindir) - public_programs += [exe] + exe = executable('systemd-sysusers', + 'src/sysusers/sysusers.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] endif if conf.get('ENABLE_TMPFILES', 0) == 1 - exe = executable('systemd-tmpfiles', - 'src/tmpfiles/tmpfiles.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libacl], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootbindir) - public_programs += [exe] + exe = executable('systemd-tmpfiles', + 'src/tmpfiles/tmpfiles.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libacl], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] endif if conf.get('ENABLE_HWDB', 0) == 1 - exe = executable('systemd-hwdb', - 'src/hwdb/hwdb.c', - 'src/libsystemd/sd-hwdb/hwdb-internal.h', + exe = executable('systemd-hwdb', + 'src/hwdb/hwdb.c', + 'src/libsystemd/sd-hwdb/hwdb-internal.h', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] +endif + +if conf.get('ENABLE_QUOTACHECK', 0) == 1 + executable('systemd-quotacheck', + 'src/quotacheck/quotacheck.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true, - install_dir : rootbindir) - public_programs += [exe] -endif - -if conf.get('ENABLE_QUOTACHECK', 0) == 1 - executable('systemd-quotacheck', - 'src/quotacheck/quotacheck.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + install_dir : rootlibexecdir) endif exe = executable('systemd-socket-proxyd', @@ -2072,19 +2074,19 @@ executable('systemd-update-utmp', install_dir : rootlibexecdir) if conf.get('HAVE_KMOD', 0) == 1 - executable('systemd-modules-load', - 'src/modules-load/modules-load.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libkmod], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-modules-load', + 'src/modules-load/modules-load.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libkmod], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) - meson.add_install_script('sh', '-c', - mkdir_p.format(modulesloaddir)) - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) + meson.add_install_script('sh', '-c', + mkdir_p.format(modulesloaddir)) + meson.add_install_script('sh', '-c', + mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) endif exe = executable('systemd-nspawn', @@ -2106,26 +2108,26 @@ exe = executable('systemd-nspawn', public_programs += [exe] if conf.get('ENABLE_NETWORKD', 0) == 1 - executable('systemd-networkd', - systemd_networkd_sources, - include_directories : includes, - link_with : [libnetworkd_core, - libfirewall, - libsystemd_network, - libudev_internal, - libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - executable('systemd-networkd-wait-online', - systemd_networkd_wait_online_sources, - include_directories : includes, - link_with : [libnetworkd_core, - libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-networkd', + systemd_networkd_sources, + include_directories : includes, + link_with : [libnetworkd_core, + libfirewall, + libsystemd_network, + libudev_internal, + libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + executable('systemd-networkd-wait-online', + systemd_networkd_wait_online_sources, + include_directories : includes, + link_with : [libnetworkd_core, + libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) endif exe = executable('networkctl', @@ -2141,67 +2143,67 @@ public_programs += [exe] ############################################################ foreach tuple : tests - sources = tuple[0] - link_with = tuple[1].length() > 0 ? tuple[1] : [libshared] - dependencies = tuple[2] - condition = tuple.length() >= 4 ? tuple[3] : '' - type = tuple.length() >= 5 ? tuple[4] : '' - defs = tuple.length() >= 6 ? tuple[5] : [] - incs = tuple.length() >= 7 ? tuple[6] : includes - timeout = 30 - - name = sources[0].split('/')[-1].split('.')[0] - if type.startswith('timeout=') - timeout = type.split('=')[1].to_int() - type = '' - endif - - if condition == '' or conf.get(condition, 0) == 1 - install = install_tests and type == '' - - exe = executable( - name, - sources, - include_directories : incs, - link_with : link_with, - dependencies : dependencies, - c_args : defs, - install_rpath : rootlibexecdir, - install : install, - install_dir : testsdir) - - if type == 'manual' - message('@0@ is a manual test'.format(name)) - elif type == 'unsafe' and want_tests != 'unsafe' - message('@0@ is an unsafe test'.format(name)) - else - test(name, exe, - env : test_env, - timeout : timeout) - endif - else - message('Not compiling @0@ because @1@ is not true'.format(name, condition)) - endif + sources = tuple[0] + link_with = tuple[1].length() > 0 ? tuple[1] : [libshared] + dependencies = tuple[2] + condition = tuple.length() >= 4 ? tuple[3] : '' + type = tuple.length() >= 5 ? tuple[4] : '' + defs = tuple.length() >= 6 ? tuple[5] : [] + incs = tuple.length() >= 7 ? tuple[6] : includes + timeout = 30 + + name = sources[0].split('/')[-1].split('.')[0] + if type.startswith('timeout=') + timeout = type.split('=')[1].to_int() + type = '' + endif + + if condition == '' or conf.get(condition, 0) == 1 + install = install_tests and type == '' + + exe = executable( + name, + sources, + include_directories : incs, + link_with : link_with, + dependencies : dependencies, + c_args : defs, + install_rpath : rootlibexecdir, + install : install, + install_dir : testsdir) + + if type == 'manual' + message('@0@ is a manual test'.format(name)) + elif type == 'unsafe' and want_tests != 'unsafe' + message('@0@ is an unsafe test'.format(name)) + else + test(name, exe, + env : test_env, + timeout : timeout) + endif + else + message('Not compiling @0@ because @1@ is not true'.format(name, condition)) + endif endforeach test_libsystemd_sym = executable( - 'test-libsystemd-sym', - test_libsystemd_sym_c, - include_directories : includes, - link_with : [libsystemd], - install : install_tests, - install_dir : testsdir) + 'test-libsystemd-sym', + test_libsystemd_sym_c, + include_directories : includes, + link_with : [libsystemd], + install : install_tests, + install_dir : testsdir) test('test-libsystemd-sym', test_libsystemd_sym) test_libudev_sym = executable( - 'test-libudev-sym', - test_libudev_sym_c, - include_directories : includes, - c_args : ['-Wno-deprecated-declarations'], - link_with : [libudev], - install : install_tests, - install_dir : testsdir) + 'test-libudev-sym', + test_libudev_sym_c, + include_directories : includes, + c_args : ['-Wno-deprecated-declarations'], + link_with : [libudev], + install : install_tests, + install_dir : testsdir) test('test-libudev-sym', test_libudev_sym) @@ -2253,33 +2255,33 @@ meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir)) meson_check_help = find_program('tools/meson-check-help.sh') foreach exec : public_programs - name = exec.full_path().split('/')[-1] - test('check-help-' + name, - meson_check_help, - args : [exec.full_path()]) + name = exec.full_path().split('/')[-1] + test('check-help-' + name, + meson_check_help, + args : [exec.full_path()]) endforeach ############################################################ if git.found() and etags.found() - all_files = run_command( - git, - ['--git-dir=@0@/.git'.format(meson.source_root()), - 'ls-files', - ':/*.[ch]']) - all_files = files(all_files.stdout().split()) + all_files = run_command( + git, + ['--git-dir=@0@/.git'.format(meson.source_root()), + 'ls-files', + ':/*.[ch]']) + all_files = files(all_files.stdout().split()) - custom_target( - 'TAGS', - output : 'TAGS', - input : all_files, - command : [etags, '-o', '@OUTPUT@'] + all_files) + custom_target( + 'TAGS', + output : 'TAGS', + input : all_files, + command : [etags, '-o', '@OUTPUT@'] + all_files) endif if git.found() - meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh') - custom_target( - 'git-contrib', - output : 'git-contrib', - command : [meson_git_contrib_sh]) + meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh') + custom_target( + 'git-contrib', + output : 'git-contrib', + command : [meson_git_contrib_sh]) endif diff --git a/network/meson.build b/network/meson.build index 4cca408c7f..f7d73f2db0 100644 --- a/network/meson.build +++ b/network/meson.build @@ -1,13 +1,11 @@ -# -*- mode: meson -*- - if conf.get('ENABLE_NETWORKD', 0) == 1 - install_data('80-container-host0.network', - '80-container-ve.network', - '80-container-vz.network', - install_dir : networkdir) + install_data('80-container-host0.network', + '80-container-ve.network', + '80-container-vz.network', + install_dir : networkdir) - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) + meson.add_install_script('sh', '-c', + mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) endif install_data('99-default.link', diff --git a/po/meson.build b/po/meson.build index c3976b3846..f89291bfc4 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,5 +1,3 @@ -# -*- mode: meson -*- - i18n = import('i18n') i18n.gettext(meson.project_name()) diff --git a/rules/meson.build b/rules/meson.build index 43142ca991..1cd37f3cf3 100644 --- a/rules/meson.build +++ b/rules/meson.build @@ -1,40 +1,38 @@ -# -*- mode: meson -*- - rules = files(''' - 60-block.rules - 60-cdrom_id.rules - 60-drm.rules - 60-evdev.rules - 60-persistent-alsa.rules - 60-persistent-input.rules - 60-persistent-storage.rules - 60-persistent-storage-tape.rules - 60-persistent-v4l.rules - 60-sensor.rules - 60-serial.rules - 64-btrfs.rules - 70-mouse.rules - 70-touchpad.rules - 75-net-description.rules - 75-probe_mtd.rules - 78-sound-card.rules - 80-drivers.rules - 80-net-setup-link.rules + 60-block.rules + 60-cdrom_id.rules + 60-drm.rules + 60-evdev.rules + 60-persistent-alsa.rules + 60-persistent-input.rules + 60-persistent-storage.rules + 60-persistent-storage-tape.rules + 60-persistent-v4l.rules + 60-sensor.rules + 60-serial.rules + 64-btrfs.rules + 70-mouse.rules + 70-touchpad.rules + 75-net-description.rules + 75-probe_mtd.rules + 78-sound-card.rules + 80-drivers.rules + 80-net-setup-link.rules '''.split()) install_data(rules, install_dir : udevrulesdir) rules_in = ''' - 50-udev-default.rules - 99-systemd.rules + 50-udev-default.rules + 99-systemd.rules '''.split() foreach file : rules_in - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - install_data(gen, - install_dir : udevrulesdir) + gen = configure_file( + input : file + '.in', + output : file, + configuration : substs) + install_data(gen, + install_dir : udevrulesdir) endforeach diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index 07de1d232a..8c2eada6cb 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -1,52 +1,50 @@ -# -*- mode: meson -*- - bashcompletiondir = get_option('bashcompletiondir') if bashcompletiondir == '' - bash_completion = dependency('bash-completion', required : false) - if bash_completion.found() - bashcompletiondir = bash_completion.get_pkgconfig_variable('completionsdir') - else - bashcompletiondir = join_paths(datadir, 'bash-completion/completions') - endif + bash_completion = dependency('bash-completion', required : false) + if bash_completion.found() + bashcompletiondir = bash_completion.get_pkgconfig_variable('completionsdir') + else + bashcompletiondir = join_paths(datadir, 'bash-completion/completions') + endif - message('bash completions: @0@'.format(bashcompletiondir)) + message('bash completions: @0@'.format(bashcompletiondir)) endif if bashcompletiondir != 'no' - bash_systemctl = configure_file( - input : 'systemctl.in', - output : 'systemctl', - configuration : substs) + bash_systemctl = configure_file( + input : 'systemctl.in', + output : 'systemctl', + configuration : substs) - items = [['busctl', ''], - ['journalctl', ''], - ['systemd-analyze', ''], - ['systemd-cat', ''], - ['systemd-cgls', ''], - ['systemd-cgtop', ''], - ['systemd-delta', ''], - ['systemd-detect-virt', ''], - ['systemd-nspawn', ''], - ['systemd-path', ''], - ['systemd-run', ''], - ['udevadm', ''], - ['kernel-install', ''], - [bash_systemctl, ''], - ['bootctl', 'ENABLE_EFI'], - ['coredumpctl', 'ENABLE_COREDUMP'], - ['hostnamectl', 'ENABLE_HOSTNAMED'], - ['localectl', 'ENABLE_LOCALED'], - ['loginctl', 'ENABLE_LOGIND'], - ['machinectl', 'ENABLE_MACHINED'], - ['networkctl', 'ENABLE_NETWORKD'], - ['systemd-resolve', 'ENABLE_RESOLVED'], - ['timedatectl', 'ENABLE_TIMEDATED'], - ] + items = [['busctl', ''], + ['journalctl', ''], + ['systemd-analyze', ''], + ['systemd-cat', ''], + ['systemd-cgls', ''], + ['systemd-cgtop', ''], + ['systemd-delta', ''], + ['systemd-detect-virt', ''], + ['systemd-nspawn', ''], + ['systemd-path', ''], + ['systemd-run', ''], + ['udevadm', ''], + ['kernel-install', ''], + [bash_systemctl, ''], + ['bootctl', 'ENABLE_EFI'], + ['coredumpctl', 'ENABLE_COREDUMP'], + ['hostnamectl', 'ENABLE_HOSTNAMED'], + ['localectl', 'ENABLE_LOCALED'], + ['loginctl', 'ENABLE_LOGIND'], + ['machinectl', 'ENABLE_MACHINED'], + ['networkctl', 'ENABLE_NETWORKD'], + ['systemd-resolve', 'ENABLE_RESOLVED'], + ['timedatectl', 'ENABLE_TIMEDATED'], + ] - foreach item : items - if item[1] == '' or conf.get(item[1], 0) == 1 - install_data(item[0], - install_dir : bashcompletiondir) - endif - endforeach + foreach item : items + if item[1] == '' or conf.get(item[1], 0) == 1 + install_data(item[0], + install_dir : bashcompletiondir) + endif + endforeach endif diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build index 0ba4136496..ed1513ed25 100644 --- a/shell-completion/zsh/meson.build +++ b/shell-completion/zsh/meson.build @@ -1,49 +1,47 @@ -# -*- mode: meson -*- - zshcompletiondir = get_option('zshcompletiondir') if zshcompletiondir == '' - zshcompletiondir = join_paths(datadir, 'zsh/site-functions') + zshcompletiondir = join_paths(datadir, 'zsh/site-functions') - message('zsh completions: @0@'.format(zshcompletiondir)) + message('zsh completions: @0@'.format(zshcompletiondir)) endif if zshcompletiondir != 'no' - zsh_systemctl = configure_file( - input : '_systemctl.in', - output : '_systemctl', - configuration : substs) + zsh_systemctl = configure_file( + input : '_systemctl.in', + output : '_systemctl', + configuration : substs) - items = [['_busctl', ''], - ['_journalctl', ''], - ['_systemd-analyze', ''], - ['_systemd-delta', ''], - ['_systemd-nspawn', ''], - ['_systemd', ''], - ['_systemd-run', ''], - ['_udevadm', ''], - ['_kernel-install', ''], - ['_sd_hosts_or_user_at_host', ''], - ['_sd_outputmodes', ''], - ['_sd_unit_files', ''], - ['_sd_machines', ''], - [zsh_systemctl, ''], - ['_bootctl', 'ENABLE_EFI'], - ['_coredumpctl', 'ENABLE_COREDUMP'], - ['_hostnamectl', 'ENABLE_HOSTNAMED'], - ['_localectl', 'ENABLE_LOCALED'], - ['_loginctl', 'ENABLE_LOGIND'], - ['_machinectl', 'ENABLE_MACHINED'], - ['_networkctl', 'ENABLE_NETWORKD'], - ['_systemd-inhibit', 'ENABLE_LOGIND'], - ['_systemd-resolve', 'ENABLE_RESOLVED'], - ['_systemd-tmpfiles', 'ENABLE_TMPFILES'], - ['_timedatectl', 'ENABLE_TIMEDATED'], - ] + items = [['_busctl', ''], + ['_journalctl', ''], + ['_systemd-analyze', ''], + ['_systemd-delta', ''], + ['_systemd-nspawn', ''], + ['_systemd', ''], + ['_systemd-run', ''], + ['_udevadm', ''], + ['_kernel-install', ''], + ['_sd_hosts_or_user_at_host', ''], + ['_sd_outputmodes', ''], + ['_sd_unit_files', ''], + ['_sd_machines', ''], + [zsh_systemctl, ''], + ['_bootctl', 'ENABLE_EFI'], + ['_coredumpctl', 'ENABLE_COREDUMP'], + ['_hostnamectl', 'ENABLE_HOSTNAMED'], + ['_localectl', 'ENABLE_LOCALED'], + ['_loginctl', 'ENABLE_LOGIND'], + ['_machinectl', 'ENABLE_MACHINED'], + ['_networkctl', 'ENABLE_NETWORKD'], + ['_systemd-inhibit', 'ENABLE_LOGIND'], + ['_systemd-resolve', 'ENABLE_RESOLVED'], + ['_systemd-tmpfiles', 'ENABLE_TMPFILES'], + ['_timedatectl', 'ENABLE_TIMEDATED'], + ] - foreach item : items - if item[1] == '' or conf.get(item[1], 0) == 1 - install_data(item[0], - install_dir : zshcompletiondir) - endif - endforeach + foreach item : items + if item[1] == '' or conf.get(item[1], 0) == 1 + install_data(item[0], + install_dir : zshcompletiondir) + endif + endforeach endif diff --git a/src/analyze/meson.build b/src/analyze/meson.build index 1ff6b182d1..fcbd814233 100644 --- a/src/analyze/meson.build +++ b/src/analyze/meson.build @@ -1,7 +1,5 @@ -# -*- mode: meson -*- - systemd_analyze_sources = files(''' - analyze.c - analyze-verify.c - analyze-verify.h + analyze.c + analyze-verify.c + analyze-verify.h '''.split()) diff --git a/src/basic/meson.build b/src/basic/meson.build index 17049481aa..065f0ac4af 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -1,201 +1,199 @@ -# -*- mode: meson -*- - basic_sources_plain = files(''' - af-list.c - af-list.h - alloc-util.c - alloc-util.h - architecture.c - architecture.h - arphrd-list.c - arphrd-list.h - async.c - async.h - audit-util.c - audit-util.h - barrier.c - barrier.h - bitmap.c - bitmap.h - blkid-util.h - btrfs-ctree.h - btrfs-util.c - btrfs-util.h - build.h - bus-label.c - bus-label.h - calendarspec.c - calendarspec.h - capability-util.c - capability-util.h - cap-list.c - cap-list.h - cgroup-util.c - cgroup-util.h - chattr-util.c - chattr-util.h - clock-util.c - clock-util.h - conf-files.c - conf-files.h - copy.c - copy.h - cpu-set-util.c - cpu-set-util.h - def.h - device-nodes.c - device-nodes.h - dirent-util.c - dirent-util.h - env-util.c - env-util.h - errno-list.c - errno-list.h - escape.c - escape.h - ether-addr-util.c - ether-addr-util.h - exec-util.c - exec-util.h - exit-status.c - exit-status.h - extract-word.c - extract-word.h - fd-util.c - fd-util.h - fileio.c - fileio.h - fileio-label.c - fileio-label.h - format-util.h - fs-util.c - fs-util.h - glob-util.c - glob-util.h - gunicode.c - gunicode.h - hash-funcs.c - hash-funcs.h - hashmap.c - hashmap.h - hexdecoct.c - hexdecoct.h - hostname-util.c - hostname-util.h - in-addr-util.c - in-addr-util.h - ioprio.h - io-util.c - io-util.h - journal-importer.c - journal-importer.h - khash.c - khash.h - label.c - label.h - list.h - locale-util.c - locale-util.h - lockfile-util.c - lockfile-util.h - log.c - log.h - login-util.c - login-util.h - macro.h - memfd-util.c - memfd-util.h - mempool.c - mempool.h - missing_syscall.h - mkdir.c - mkdir.h - mkdir-label.c - mount-util.c - mount-util.h - MurmurHash2.c - MurmurHash2.h - nss-util.h - ordered-set.c - ordered-set.h - parse-util.c - parse-util.h - path-util.c - path-util.h - prioq.c - prioq.h - proc-cmdline.c - proc-cmdline.h - process-util.c - process-util.h - random-util.c - random-util.h - ratelimit.c - ratelimit.h - raw-clone.h - refcnt.h - replace-var.c - replace-var.h - rlimit-util.c - rlimit-util.h - rm-rf.c - rm-rf.h - securebits.h - selinux-util.c - selinux-util.h - set.h - sigbus.c - sigbus.h - signal-util.c - signal-util.h - siphash24.c - siphash24.h - smack-util.c - smack-util.h - socket-label.c - socket-util.c - socket-util.h - sparse-endian.h - special.h - stat-util.c - stat-util.h - stdio-util.h - strbuf.c - strbuf.h - string-table.c - string-table.h - string-util.c - string-util.h - strv.c - strv.h - strxcpyx.c - strxcpyx.h - syslog-util.c - syslog-util.h - terminal-util.c - terminal-util.h - time-util.c - time-util.h - umask-util.h - unaligned.h - unit-name.c - unit-name.h - user-util.c - user-util.h - utf8.c - utf8.h - util.c - util.h - verbs.c - verbs.h - virt.c - virt.h - web-util.c - web-util.h - xattr-util.c - xattr-util.h - xml.c - xml.h + af-list.c + af-list.h + alloc-util.c + alloc-util.h + architecture.c + architecture.h + arphrd-list.c + arphrd-list.h + async.c + async.h + audit-util.c + audit-util.h + barrier.c + barrier.h + bitmap.c + bitmap.h + blkid-util.h + btrfs-ctree.h + btrfs-util.c + btrfs-util.h + build.h + bus-label.c + bus-label.h + calendarspec.c + calendarspec.h + capability-util.c + capability-util.h + cap-list.c + cap-list.h + cgroup-util.c + cgroup-util.h + chattr-util.c + chattr-util.h + clock-util.c + clock-util.h + conf-files.c + conf-files.h + copy.c + copy.h + cpu-set-util.c + cpu-set-util.h + def.h + device-nodes.c + device-nodes.h + dirent-util.c + dirent-util.h + env-util.c + env-util.h + errno-list.c + errno-list.h + escape.c + escape.h + ether-addr-util.c + ether-addr-util.h + exec-util.c + exec-util.h + exit-status.c + exit-status.h + extract-word.c + extract-word.h + fd-util.c + fd-util.h + fileio.c + fileio.h + fileio-label.c + fileio-label.h + format-util.h + fs-util.c + fs-util.h + glob-util.c + glob-util.h + gunicode.c + gunicode.h + hash-funcs.c + hash-funcs.h + hashmap.c + hashmap.h + hexdecoct.c + hexdecoct.h + hostname-util.c + hostname-util.h + in-addr-util.c + in-addr-util.h + ioprio.h + io-util.c + io-util.h + journal-importer.c + journal-importer.h + khash.c + khash.h + label.c + label.h + list.h + locale-util.c + locale-util.h + lockfile-util.c + lockfile-util.h + log.c + log.h + login-util.c + login-util.h + macro.h + memfd-util.c + memfd-util.h + mempool.c + mempool.h + missing_syscall.h + mkdir.c + mkdir.h + mkdir-label.c + mount-util.c + mount-util.h + MurmurHash2.c + MurmurHash2.h + nss-util.h + ordered-set.c + ordered-set.h + parse-util.c + parse-util.h + path-util.c + path-util.h + prioq.c + prioq.h + proc-cmdline.c + proc-cmdline.h + process-util.c + process-util.h + random-util.c + random-util.h + ratelimit.c + ratelimit.h + raw-clone.h + refcnt.h + replace-var.c + replace-var.h + rlimit-util.c + rlimit-util.h + rm-rf.c + rm-rf.h + securebits.h + selinux-util.c + selinux-util.h + set.h + sigbus.c + sigbus.h + signal-util.c + signal-util.h + siphash24.c + siphash24.h + smack-util.c + smack-util.h + socket-label.c + socket-util.c + socket-util.h + sparse-endian.h + special.h + stat-util.c + stat-util.h + stdio-util.h + strbuf.c + strbuf.h + string-table.c + string-table.h + string-util.c + string-util.h + strv.c + strv.h + strxcpyx.c + strxcpyx.h + syslog-util.c + syslog-util.h + terminal-util.c + terminal-util.h + time-util.c + time-util.h + umask-util.h + unaligned.h + unit-name.c + unit-name.h + user-util.c + user-util.h + utf8.c + utf8.h + util.c + util.h + verbs.c + verbs.h + virt.c + virt.h + web-util.c + web-util.h + xattr-util.c + xattr-util.h + xml.c + xml.h '''.split()) missing_h = files('missing.h') @@ -204,31 +202,31 @@ generate_gperfs = find_program('generate-gperfs.py') generate_af_list = find_program('generate-af-list.sh') af_list_txt = custom_target( - 'af-list.txt', - output : 'af-list.txt', - command : [generate_af_list, cpp], - capture : true) + 'af-list.txt', + output : 'af-list.txt', + command : [generate_af_list, cpp], + capture : true) generate_arphrd_list = find_program('generate-arphrd-list.sh') arphrd_list_txt = custom_target( - 'arphrd-list.txt', - output : 'arphrd-list.txt', - command : [generate_arphrd_list, cpp], - capture : true) + 'arphrd-list.txt', + output : 'arphrd-list.txt', + command : [generate_arphrd_list, cpp], + capture : true) generate_cap_list = find_program('generate-cap-list.sh') cap_list_txt = custom_target( - 'cap-list.txt', - output : 'cap-list.txt', - command : [generate_cap_list, cpp, config_h, missing_h], - capture : true) + 'cap-list.txt', + output : 'cap-list.txt', + command : [generate_cap_list, cpp, config_h, missing_h], + capture : true) generate_errno_list = find_program('generate-errno-list.sh') errno_list_txt = custom_target( - 'errno-list.txt', - output : 'errno-list.txt', - command : [generate_errno_list, cpp], - capture : true) + 'errno-list.txt', + output : 'errno-list.txt', + command : [generate_errno_list, cpp], + capture : true) generated_gperf_headers = [] foreach item : [['af', af_list_txt, 'af', ''], @@ -236,48 +234,48 @@ foreach item : [['af', af_list_txt, 'af', ''], ['cap', cap_list_txt, 'capability', ''], ['errno', errno_list_txt, 'errno', '']] - fname = '@0@-from-name.gperf'.format(item[0]) - gperf_file = custom_target( - fname, - input : item[1], - output : fname, - command : [generate_gperfs, item[2], item[3], '@INPUT@'], - capture : true) + fname = '@0@-from-name.gperf'.format(item[0]) + gperf_file = custom_target( + fname, + input : item[1], + output : fname, + command : [generate_gperfs, item[2], item[3], '@INPUT@'], + capture : true) - fname = '@0@-from-name.h'.format(item[0]) - target1 = custom_target( - fname, - input : gperf_file, - output : fname, - command : [gperf, - '-L', 'ANSI-C', '-t', '--ignore-case', - '-N', 'lookup_@0@'.format(item[2]), - '-H', 'hash_@0@_name'.format(item[2]), - '-p', '-C', - '@INPUT@'], - capture : true) + fname = '@0@-from-name.h'.format(item[0]) + target1 = custom_target( + fname, + input : gperf_file, + output : fname, + command : [gperf, + '-L', 'ANSI-C', '-t', '--ignore-case', + '-N', 'lookup_@0@'.format(item[2]), + '-H', 'hash_@0@_name'.format(item[2]), + '-p', '-C', + '@INPUT@'], + capture : true) - fname = '@0@-to-name.h'.format(item[0]) - awkscript = '@0@-to-name.awk'.format(item[0]) - target2 = custom_target( - fname, - input : [awkscript, item[1]], - output : fname, - command : [awk, '-f', '@INPUT0@', '@INPUT1@'], - capture : true) + fname = '@0@-to-name.h'.format(item[0]) + awkscript = '@0@-to-name.awk'.format(item[0]) + target2 = custom_target( + fname, + input : [awkscript, item[1]], + output : fname, + command : [awk, '-f', '@INPUT0@', '@INPUT1@'], + capture : true) - generated_gperf_headers += [target1, target2] + generated_gperf_headers += [target1, target2] endforeach basic_sources = basic_sources_plain + [missing_h] + generated_gperf_headers libbasic = static_library( - 'basic', - basic_sources, - include_directories : includes, - dependencies : [threads, - libcap, - libblkid, - libselinux, - ], - install : false) + 'basic', + basic_sources, + include_directories : includes, + dependencies : [threads, + libcap, + libblkid, + libselinux, + ], + install : false) diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index 059cc7be31..bdf54654de 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -1,191 +1,192 @@ efi_headers = files(''' - console.h - disk.h - graphics.h - linux.h - measure.h - pefile.h - splash.h - util.h + console.h + disk.h + graphics.h + linux.h + measure.h + pefile.h + splash.h + util.h '''.split()) common_sources = ''' - disk.c - graphics.c - measure.c - pefile.c - util.c + disk.c + graphics.c + measure.c + pefile.c + util.c '''.split() systemd_boot_sources = ''' - boot.c - console.c + boot.c + console.c '''.split() stub_sources = ''' - linux.c - splash.c - stub.c + linux.c + splash.c + stub.c '''.split() if conf.get('ENABLE_EFI', 0) == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') - efi_ld = get_option('efi-ld') - - efi_incdir = get_option('efi-includedir') - efibind_h = '@0@/@1@/efibind.h'.format(efi_incdir, efi_arch) - have_header = cc.has_header(efibind_h) - - if have_header and EFI_MACHINE_TYPE_NAME == '' - error('gnu-efi is available, but EFI_MACHINE_TYPE_NAME is unknown') - endif - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' - cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) - ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - efi_libdir = ret.stdout().strip() - endif - endif - - have_gnu_efi = have_header and efi_libdir != '' + efi_cc = get_option('efi-cc') + efi_ld = get_option('efi-ld') + + efi_incdir = get_option('efi-includedir') + efibind_h = '@0@/@1@/efibind.h'.format(efi_incdir, efi_arch) + have_header = cc.has_header(efibind_h) + + if have_header and EFI_MACHINE_TYPE_NAME == '' + error('gnu-efi is available, but EFI_MACHINE_TYPE_NAME is unknown') + endif + + efi_libdir = get_option('efi-libdir') + if efi_libdir == '' + cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) + ret = run_command('sh', '-c', cmd) + if ret.returncode() == 0 + efi_libdir = ret.stdout().strip() + endif + endif + + have_gnu_efi = have_header and efi_libdir != '' else - have_gnu_efi = false + have_gnu_efi = false endif if get_option('gnu-efi') == 'true' and not have_gnu_efi - error('gnu-efi support requested, but headers were not found') + error('gnu-efi support requested, but headers were not found') endif if have_gnu_efi - efi_conf = configuration_data() - efi_conf.set_quoted('PACKAGE_VERSION', meson.project_version()) - efi_conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) - - efi_config_h = configure_file( - output : 'efi_config.h', - configuration : efi_conf) - - objcopy = find_program('objcopy') - - efi_ldsdir = get_option('efi-ldsdir') - if efi_ldsdir == '' - efi_ldsdir = join_paths(efi_libdir, 'gnuefi') - endif - - message('efi-libdir: "@0@"'.format(efi_libdir)) - message('efi-ldsdir: "@0@"'.format(efi_ldsdir)) - message('efi-includedir: "@0@"'.format(efi_incdir)) - - compile_args = ['-Wall', - '-Wextra', - '-std=gnu90', - '-nostdinc', - '-ggdb', '-O0', - '-fpic', - '-fshort-wchar', - '-ffreestanding', - '-fno-strict-aliasing', - '-fno-stack-protector', - '-Wsign-compare', - '-Wno-missing-field-initializers', - '-isystem', efi_incdir, - '-isystem', join_paths(efi_incdir, efi_arch), - '-include', efi_config_h] - if efi_arch == 'x86_64' - compile_args += ['-mno-red-zone', - '-mno-sse', - '-mno-mmx', - '-DEFI_FUNCTION_WRAPPER', - '-DGNU_EFI_USE_MS_ABI'] - elif efi_arch == 'ia32' - compile_args += ['-mno-sse', - '-mno-mmx'] - endif - - efi_ldflags = ['-T', - '@0@/elf_@1@_efi.lds'.format(efi_ldsdir, efi_arch), - '-shared', - '-Bsymbolic', - '-nostdlib', - '-znocombreloc', - '-L', efi_libdir, - '@0@/crt0-efi-@1@.o'.format(efi_ldsdir, efi_arch)] - if efi_arch == 'aarch64' or efi_arch == 'arm' - # Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' - # instead, and add required symbols manually. - efi_ldflags += ['--defsym=EFI_SUBSYSTEM=0xa'] - efi_format = ['-O', 'binary'] - else - efi_format = ['--target=efi-app-@0@'.format(efi_arch)] - endif - - systemd_boot_objects = [] - stub_objects = [] - foreach file : common_sources + systemd_boot_sources + stub_sources - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', - command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) - systemd_boot_objects += [o_file] - endif - if (common_sources + stub_sources).contains(file) - stub_objects += [o_file] - endif - endforeach - - libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux@0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') - - foreach tuple : [['systemd_boot.so', systemd_boot_efi_name, systemd_boot_objects], - ['stub.so', stub_efi_name, stub_objects]] - so = custom_target( - tuple[0], - input : tuple[2], - output : tuple[0], - command : [efi_ld, '-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - - test('no-undefined-symbols-' + tuple[0], - no_undefined_symbols, - args : [so]) - - stub = custom_target( - tuple[1], - input : so, - output : tuple[1], - command : [objcopy, - '-j', '.text', - '-j', '.sdata', - '-j', '.data', - '-j', '.dynamic', - '-j', '.dynsym', - '-j', '.rel', - '-j', '.rela', - '-j', '.reloc'] - + efi_format + - ['@INPUT@', '@OUTPUT@'], - install : true, - install_dir : bootlibdir) - - set_variable(tuple[0].underscorify(), so) - set_variable(tuple[0].underscorify() + '_stub', stub) - endforeach + efi_conf = configuration_data() + efi_conf.set_quoted('PACKAGE_VERSION', meson.project_version()) + efi_conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) + + efi_config_h = configure_file( + output : 'efi_config.h', + configuration : efi_conf) + + objcopy = find_program('objcopy') + + efi_ldsdir = get_option('efi-ldsdir') + if efi_ldsdir == '' + efi_ldsdir = join_paths(efi_libdir, 'gnuefi') + endif + + message('efi-libdir: "@0@"'.format(efi_libdir)) + message('efi-ldsdir: "@0@"'.format(efi_ldsdir)) + message('efi-includedir: "@0@"'.format(efi_incdir)) + + compile_args = ['-Wall', + '-Wextra', + '-std=gnu90', + '-nostdinc', + '-ggdb', '-O0', + '-fpic', + '-fshort-wchar', + '-ffreestanding', + '-fno-strict-aliasing', + '-fno-stack-protector', + '-Wsign-compare', + '-Wno-missing-field-initializers', + '-isystem', efi_incdir, + '-isystem', join_paths(efi_incdir, efi_arch), + '-include', efi_config_h] + if efi_arch == 'x86_64' + compile_args += ['-mno-red-zone', + '-mno-sse', + '-mno-mmx', + '-DEFI_FUNCTION_WRAPPER', + '-DGNU_EFI_USE_MS_ABI'] + elif efi_arch == 'ia32' + compile_args += ['-mno-sse', + '-mno-mmx'] + endif + + efi_ldflags = ['-T', + '@0@/elf_@1@_efi.lds'.format(efi_ldsdir, efi_arch), + '-shared', + '-Bsymbolic', + '-nostdlib', + '-znocombreloc', + '-L', efi_libdir, + '@0@/crt0-efi-@1@.o'.format(efi_ldsdir, efi_arch)] + if efi_arch == 'aarch64' or efi_arch == 'arm' + # Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' + # instead, and add required symbols manually. + efi_ldflags += ['--defsym=EFI_SUBSYSTEM=0xa'] + efi_format = ['-O', 'binary'] + else + efi_format = ['--target=efi-app-@0@'.format(efi_arch)] + endif + + systemd_boot_objects = [] + stub_objects = [] + foreach file : common_sources + systemd_boot_sources + stub_sources + o_file = custom_target(file + '.o', + input : file, + output : file + '.o', + command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] + + compile_args, + depend_files : efi_headers) + if (common_sources + systemd_boot_sources).contains(file) + systemd_boot_objects += [o_file] + endif + if (common_sources + stub_sources).contains(file) + stub_objects += [o_file] + endif + endforeach + + libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() + systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(EFI_MACHINE_TYPE_NAME) + stub_efi_name = 'linux@0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) + no_undefined_symbols = find_program('no-undefined-symbols.sh') + + foreach tuple : [['systemd_boot.so', systemd_boot_efi_name, systemd_boot_objects], + ['stub.so', stub_efi_name, stub_objects]] + so = custom_target( + tuple[0], + input : tuple[2], + output : tuple[0], + command : [efi_ld, '-o', '@OUTPUT@'] + + efi_ldflags + tuple[2] + + ['-lefi', '-lgnuefi', libgcc_file_name]) + + test('no-undefined-symbols-' + tuple[0], + no_undefined_symbols, + args : [so]) + + stub = custom_target( + tuple[1], + input : so, + output : tuple[1], + command : [objcopy, + '-j', '.text', + '-j', '.sdata', + '-j', '.data', + '-j', '.dynamic', + '-j', '.dynsym', + '-j', '.rel', + '-j', '.rela', + '-j', '.reloc'] + + efi_format + + ['@INPUT@', '@OUTPUT@'], + install : true, + install_dir : bootlibdir) + + set_variable(tuple[0].underscorify(), so) + set_variable(tuple[0].underscorify() + '_stub', stub) + endforeach endif ############################################################ if have_gnu_efi - test_efi_disk_img = custom_target( - 'test-efi-disk.img', - input : [systemd_boot_so, stub_so_stub], - output : 'test-efi-disk.img', - command : [test_efi_create_disk_sh, '@OUTPUT@', '@INPUT0@', '@INPUT1@', splash_bmp]) + test_efi_disk_img = custom_target( + 'test-efi-disk.img', + input : [systemd_boot_so, stub_so_stub], + output : 'test-efi-disk.img', + command : [test_efi_create_disk_sh, '@OUTPUT@', + '@INPUT0@', '@INPUT1@', splash_bmp]) endif diff --git a/src/core/meson.build b/src/core/meson.build index a06c9414d1..e41922bf0a 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -1,191 +1,189 @@ -# -*- mode: meson -*- - libcore_la_sources = ''' - unit.c - unit.h - unit-printf.c - unit-printf.h - job.c - job.h - manager.c - manager.h - transaction.c - transaction.h - load-fragment.c - load-fragment.h - service.c - service.h - socket.c - socket.h - busname.c - busname.h - bus-policy.c - bus-policy.h - target.c - target.h - device.c - device.h - mount.c - mount.h - automount.c - automount.h - swap.c - swap.h - timer.c - timer.h - path.c - path.h - slice.c - slice.h - scope.c - scope.h - load-dropin.c - load-dropin.h - execute.c - execute.h - dynamic-user.c - dynamic-user.h - kill.c - kill.h - dbus.c - dbus.h - dbus-manager.c - dbus-manager.h - dbus-unit.c - dbus-unit.h - dbus-job.c - dbus-job.h - dbus-service.c - dbus-service.h - dbus-socket.c - dbus-socket.h - dbus-busname.c - dbus-busname.h - dbus-target.c - dbus-target.h - dbus-device.c - dbus-device.h - dbus-mount.c - dbus-mount.h - dbus-automount.c - dbus-automount.h - dbus-swap.c - dbus-swap.h - dbus-timer.c - dbus-timer.h - dbus-path.c - dbus-path.h - dbus-slice.c - dbus-slice.h - dbus-scope.c - dbus-scope.h - dbus-execute.c - dbus-execute.h - dbus-kill.c - dbus-kill.h - dbus-cgroup.c - dbus-cgroup.h - cgroup.c - cgroup.h - selinux-access.c - selinux-access.h - selinux-setup.c - selinux-setup.h - smack-setup.c - smack-setup.h - ima-setup.c - ima-setup.h - locale-setup.h - locale-setup.c - hostname-setup.c - hostname-setup.h - machine-id-setup.c - machine-id-setup.h - mount-setup.c - mount-setup.h - kmod-setup.c - kmod-setup.h - loopback-setup.h - loopback-setup.c - namespace.c - namespace.h - killall.h - killall.c - audit-fd.c - audit-fd.h - show-status.c - show-status.h - emergency-action.c - emergency-action.h + unit.c + unit.h + unit-printf.c + unit-printf.h + job.c + job.h + manager.c + manager.h + transaction.c + transaction.h + load-fragment.c + load-fragment.h + service.c + service.h + socket.c + socket.h + busname.c + busname.h + bus-policy.c + bus-policy.h + target.c + target.h + device.c + device.h + mount.c + mount.h + automount.c + automount.h + swap.c + swap.h + timer.c + timer.h + path.c + path.h + slice.c + slice.h + scope.c + scope.h + load-dropin.c + load-dropin.h + execute.c + execute.h + dynamic-user.c + dynamic-user.h + kill.c + kill.h + dbus.c + dbus.h + dbus-manager.c + dbus-manager.h + dbus-unit.c + dbus-unit.h + dbus-job.c + dbus-job.h + dbus-service.c + dbus-service.h + dbus-socket.c + dbus-socket.h + dbus-busname.c + dbus-busname.h + dbus-target.c + dbus-target.h + dbus-device.c + dbus-device.h + dbus-mount.c + dbus-mount.h + dbus-automount.c + dbus-automount.h + dbus-swap.c + dbus-swap.h + dbus-timer.c + dbus-timer.h + dbus-path.c + dbus-path.h + dbus-slice.c + dbus-slice.h + dbus-scope.c + dbus-scope.h + dbus-execute.c + dbus-execute.h + dbus-kill.c + dbus-kill.h + dbus-cgroup.c + dbus-cgroup.h + cgroup.c + cgroup.h + selinux-access.c + selinux-access.h + selinux-setup.c + selinux-setup.h + smack-setup.c + smack-setup.h + ima-setup.c + ima-setup.h + locale-setup.h + locale-setup.c + hostname-setup.c + hostname-setup.h + machine-id-setup.c + machine-id-setup.h + mount-setup.c + mount-setup.h + kmod-setup.c + kmod-setup.h + loopback-setup.h + loopback-setup.c + namespace.c + namespace.h + killall.h + killall.c + audit-fd.c + audit-fd.h + show-status.c + show-status.h + emergency-action.c + emergency-action.h '''.split() load_fragment_gperf_gperf = custom_target( - 'load-fragment-gperf.gperf', - input : 'load-fragment-gperf.gperf.m4', - output: 'load-fragment-gperf.gperf', - command : [m4, '-P'] + m4_defines + ['@INPUT@'], - capture : true) + 'load-fragment-gperf.gperf', + input : 'load-fragment-gperf.gperf.m4', + output: 'load-fragment-gperf.gperf', + command : [m4, '-P'] + m4_defines + ['@INPUT@'], + capture : true) load_fragment_gperf_c = custom_target( - 'load-fragment-gperf.c', - input : load_fragment_gperf_gperf, - output : 'load-fragment-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + 'load-fragment-gperf.c', + input : load_fragment_gperf_gperf, + output : 'load-fragment-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) awkscript = 'load-fragment-gperf-nulstr.awk' load_fragment_gperf_nulstr_c = custom_target( - 'load-fragment-gperf-nulstr.c', - input : [awkscript, load_fragment_gperf_gperf], - output : 'load-fragment-gperf-nulstr.c', - command : [awk, '-f', '@INPUT0@', '@INPUT1@'], - capture : true) + 'load-fragment-gperf-nulstr.c', + input : [awkscript, load_fragment_gperf_gperf], + output : 'load-fragment-gperf-nulstr.c', + command : [awk, '-f', '@INPUT0@', '@INPUT1@'], + capture : true) libcore = static_library( - 'core', - libcore_la_sources, - load_fragment_gperf_c, - load_fragment_gperf_nulstr_c, - include_directories : includes, - link_with : [libshared_static], - dependencies : [threads, - libpam, - libaudit, - libkmod, - libapparmor, - libmount]) + 'core', + libcore_la_sources, + load_fragment_gperf_c, + load_fragment_gperf_nulstr_c, + include_directories : includes, + link_with : [libshared_static], + dependencies : [threads, + libpam, + libaudit, + libkmod, + libapparmor, + libmount]) systemd_sources = files('main.c') systemd_shutdown_sources = files(''' - shutdown.c - umount.c - umount.h - mount-setup.c - mount-setup.h - killall.c - killall.h + shutdown.c + umount.c + umount.h + mount-setup.c + mount-setup.h + killall.c + killall.h '''.split()) -in_files = [['macros.systemd', rpmmacrosdir], - ['triggers.systemd', ''], - ['systemd.pc', pkgconfigdatadir]] +in_files = [['macros.systemd', rpmmacrosdir], + ['triggers.systemd', ''], + ['systemd.pc', pkgconfigdatadir]] foreach item : in_files - file = item[0] - dir = item[1] - - # If "no", disable generation completely. - # If "", generate, but do not install. - if dir != 'no' - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - if dir != '' - install_data(gen, - install_dir : dir) - endif - endif + file = item[0] + dir = item[1] + + # If 'no', disable generation completely. + # If '', generate, but do not install. + if dir != 'no' + gen = configure_file( + input : file + '.in', + output : file, + configuration : substs) + if dir != '' + install_data(gen, + install_dir : dir) + endif + endif endforeach install_data('org.freedesktop.systemd1.conf', @@ -194,17 +192,17 @@ install_data('org.freedesktop.systemd1.service', install_dir : dbussystemservicedir) policy_in = configure_file( - input : 'org.freedesktop.systemd1.policy.in.in', - output : 'org.freedesktop.systemd1.policy.in', - configuration : substs) + input : 'org.freedesktop.systemd1.policy.in.in', + output : 'org.freedesktop.systemd1.policy.in', + configuration : substs) custom_target( - 'org.freedesktop.systemd1.policy', - input : policy_in, - output : 'org.freedesktop.systemd1.policy', - command : intltool_command, - install : install_polkit, - install_dir : polkitpolicydir) + 'org.freedesktop.systemd1.policy', + input : policy_in, + output : 'org.freedesktop.systemd1.policy', + command : intltool_command, + install : install_polkit, + install_dir : polkitpolicydir) # TODO: this might work with meson from git, see # https://github.com/mesonbuild/meson/issues/1441#issuecomment-283585493 diff --git a/src/coredump/meson.build b/src/coredump/meson.build index f70a65f7a7..ab3be6a7de 100644 --- a/src/coredump/meson.build +++ b/src/coredump/meson.build @@ -1,14 +1,12 @@ -# -*- mode: meson -*- - systemd_coredump_sources = files(''' - coredump.c - coredump-vacuum.c - coredump-vacuum.h + coredump.c + coredump-vacuum.c + coredump-vacuum.h '''.split()) if conf.get('HAVE_ELFUTILS', 0) == 1 - systemd_coredump_sources += files(['stacktrace.c', - 'stacktrace.h']) + systemd_coredump_sources += files(['stacktrace.c', + 'stacktrace.h']) endif coredumpctl_sources = files('coredumpctl.c') @@ -17,10 +15,10 @@ install_data('coredump.conf', install_dir : pkgsysconfdir) tests += [ - [['src/coredump/test-coredump-vacuum.c', - 'src/coredump/coredump-vacuum.c', - 'src/coredump/coredump-vacuum.h'], - [], - [], - 'ENABLE_COREDUMP', 'manual'], - ] + [['src/coredump/test-coredump-vacuum.c', + 'src/coredump/coredump-vacuum.c', + 'src/coredump/coredump-vacuum.h'], + [], + [], + 'ENABLE_COREDUMP', 'manual'], +] diff --git a/src/hostname/meson.build b/src/hostname/meson.build index 6985a41910..68275ba8f5 100644 --- a/src/hostname/meson.build +++ b/src/hostname/meson.build @@ -1,16 +1,14 @@ -# -*- mode: meson -*- - install_data('org.freedesktop.hostname1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.hostname1.service', install_dir : dbussystemservicedir) if conf.get('ENABLE_HOSTNAMED', 0) == 1 - custom_target( - 'org.freedesktop.hostname1.policy', - input : 'org.freedesktop.hostname1.policy.in', - output : 'org.freedesktop.hostname1.policy', - command : intltool_command, - install : install_polkit, - install_dir : polkitpolicydir) + custom_target( + 'org.freedesktop.hostname1.policy', + input : 'org.freedesktop.hostname1.policy.in', + output : 'org.freedesktop.hostname1.policy', + command : intltool_command, + install : install_polkit, + install_dir : polkitpolicydir) endif diff --git a/src/import/meson.build b/src/import/meson.build index 66f43dd714..f0ed92b4c2 100644 --- a/src/import/meson.build +++ b/src/import/meson.build @@ -1,79 +1,77 @@ -# -*- mode: meson -*- - systemd_importd_sources = files(''' - importd.c + importd.c '''.split()) systemd_pull_sources = files(''' - pull.c - pull-raw.c - pull-raw.h - pull-tar.c - pull-tar.h - pull-job.c - pull-job.h - pull-common.c - pull-common.h - import-common.c - import-common.h - import-compress.c - import-compress.h - curl-util.c - curl-util.h - qcow2-util.c - qcow2-util.h + pull.c + pull-raw.c + pull-raw.h + pull-tar.c + pull-tar.h + pull-job.c + pull-job.h + pull-common.c + pull-common.h + import-common.c + import-common.h + import-compress.c + import-compress.h + curl-util.c + curl-util.h + qcow2-util.c + qcow2-util.h '''.split()) systemd_import_sources = files(''' - import.c - import-raw.c - import-raw.h - import-tar.c - import-tar.h - import-common.c - import-common.h - import-compress.c - import-compress.h - qcow2-util.c - qcow2-util.h + import.c + import-raw.c + import-raw.h + import-tar.c + import-tar.h + import-common.c + import-common.h + import-compress.c + import-compress.h + qcow2-util.c + qcow2-util.h '''.split()) systemd_export_sources = files(''' - export.c - export-tar.c - export-tar.h - export-raw.c - export-raw.h - import-common.c - import-common.h - import-compress.c - import-compress.h + export.c + export-tar.c + export-tar.h + export-raw.c + export-raw.h + import-common.c + import-common.h + import-compress.c + import-compress.h '''.split()) if conf.get('ENABLE_IMPORTD', 0) == 1 - install_data('org.freedesktop.import1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.import1.service', - install_dir : dbussystemservicedir) + install_data('org.freedesktop.import1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.import1.service', + install_dir : dbussystemservicedir) - custom_target( - 'org.freedesktop.import1.policy', - input : 'org.freedesktop.import1.policy.in', - output : 'org.freedesktop.import1.policy', - command : intltool_command, - install : install_polkit, - install_dir : polkitpolicydir) + custom_target( + 'org.freedesktop.import1.policy', + input : 'org.freedesktop.import1.policy.in', + output : 'org.freedesktop.import1.policy', + command : intltool_command, + install : install_polkit, + install_dir : polkitpolicydir) - install_data('import-pubring.gpg', - install_dir : rootlibexecdir) - # TODO: shouldn't this be in pkgdatadir? + install_data('import-pubring.gpg', + install_dir : rootlibexecdir) + # TODO: shouldn't this be in pkgdatadir? endif tests += [ - [['src/import/test-qcow2.c', - 'src/import/qcow2-util.c', - 'src/import/qcow2-util.h'], - [libshared], - [libz], - 'HAVE_ZLIB', 'manual'], - ] + [['src/import/test-qcow2.c', + 'src/import/qcow2-util.c', + 'src/import/qcow2-util.h'], + [libshared], + [libz], + 'HAVE_ZLIB', 'manual'], +] diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index c182e7c477..394be7068c 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -1,44 +1,42 @@ -# -*- mode: meson -*- - systemd_journal_upload_sources = files(''' - journal-upload.h - journal-upload.c - journal-upload-journal.c + journal-upload.h + journal-upload.c + journal-upload-journal.c '''.split()) systemd_journal_remote_sources = files(''' - journal-remote-parse.h - journal-remote-parse.c - journal-remote-write.h - journal-remote-write.c - journal-remote.h - journal-remote.c - microhttpd-util.h - microhttpd-util.c + journal-remote-parse.h + journal-remote-parse.c + journal-remote-write.h + journal-remote-write.c + journal-remote.h + journal-remote.c + microhttpd-util.h + microhttpd-util.c '''.split()) systemd_journal_gatewayd_sources = files(''' - journal-gatewayd.c - microhttpd-util.h - microhttpd-util.c + journal-gatewayd.c + microhttpd-util.h + microhttpd-util.c '''.split()) if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 - journal_upload_conf = configure_file( - input : 'journal-upload.conf.in', - output : 'journal-upload.conf', - configuration : substs) - install_data(journal_upload_conf, - install_dir : pkgsysconfdir) + journal_upload_conf = configure_file( + input : 'journal-upload.conf.in', + output : 'journal-upload.conf', + configuration : substs) + install_data(journal_upload_conf, + install_dir : pkgsysconfdir) endif if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 - journal_remote_conf = configure_file( - input : 'journal-remote.conf.in', - output : 'journal-remote.conf', - configuration : substs) - install_data(journal_remote_conf, - install_dir : pkgsysconfdir) + journal_remote_conf = configure_file( + input : 'journal-remote.conf.in', + output : 'journal-remote.conf', + configuration : substs) + install_data(journal_remote_conf, + install_dir : pkgsysconfdir) endif install_data('browse.html', diff --git a/src/journal/meson.build b/src/journal/meson.build index 2457bc7234..71396af529 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -1,25 +1,23 @@ -# -*- mode: meson -*- - journal_internal_sources = files(''' - audit-type.c - audit-type.h - catalog.c - catalog.h - compress.c - compress.h - journal-def.h - journal-file.c - journal-file.h - journal-send.c - journal-vacuum.c - journal-vacuum.h - journal-verify.c - journal-verify.h - lookup3.c - lookup3.h - mmap-cache.c - mmap-cache.h - sd-journal.c + audit-type.c + audit-type.h + catalog.c + catalog.h + compress.c + compress.h + journal-def.h + journal-file.c + journal-file.h + journal-send.c + journal-vacuum.c + journal-vacuum.h + journal-verify.c + journal-verify.h + lookup3.c + lookup3.h + mmap-cache.c + mmap-cache.h + sd-journal.c '''.split()) ############################################################ @@ -28,82 +26,86 @@ audit_type_includes = [config_h, missing_h, 'linux/audit.h'] if conf.get('HAVE_AUDIT', 0) == 1 - audit_type_includes += 'libaudit.h' + audit_type_includes += 'libaudit.h' endif generate_audit_type_list = find_program('generate-audit_type-list.sh') audit_type_list_txt = custom_target( - 'audit_type-list.txt', - output : 'audit_type-list.txt', - command : [generate_audit_type_list, cpp] + audit_type_includes, - capture : true) + 'audit_type-list.txt', + output : 'audit_type-list.txt', + command : [generate_audit_type_list, cpp] + audit_type_includes, + capture : true) audit_type_to_name = custom_target( - 'audit_type-to-name.h', - input : ['audit_type-to-name.awk', audit_type_list_txt], - output : 'audit_type-to-name.h', - command : [awk, '-f', '@INPUT0@', '@INPUT1@'], - capture : true) + 'audit_type-to-name.h', + input : ['audit_type-to-name.awk', audit_type_list_txt], + output : 'audit_type-to-name.h', + command : [awk, '-f', '@INPUT0@', '@INPUT1@'], + capture : true) journal_internal_sources += [audit_type_to_name] ############################################################ libjournal_core_sources = files(''' - journald-kmsg.c - journald-kmsg.h - journald-syslog.c - journald-syslog.h - journald-stream.c - journald-stream.h - journald-server.c - journald-server.h - journald-console.c - journald-console.h - journald-wall.c - journald-wall.h - journald-native.c - journald-native.h - journald-audit.c - journald-audit.h - journald-rate-limit.c - journald-rate-limit.h - journal-internal.h + journald-kmsg.c + journald-kmsg.h + journald-syslog.c + journald-syslog.h + journald-stream.c + journald-stream.h + journald-server.c + journald-server.h + journald-console.c + journald-console.h + journald-wall.c + journald-wall.h + journald-native.c + journald-native.h + journald-audit.c + journald-audit.h + journald-rate-limit.c + journald-rate-limit.h + journal-internal.h '''.split()) systemd_journald_sources = files(''' - journald.c - journald-server.h + journald.c + journald-server.h '''.split()) journald_gperf_c = custom_target( - 'journald-gperf.c', - input : 'journald-gperf.gperf', - output : 'journald-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + 'journald-gperf.c', + input : 'journald-gperf.gperf', + output : 'journald-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) systemd_cat_sources = files('cat.c') journalctl_sources = files('journalctl.c') if conf.get('HAVE_QRENCODE', 0) == 1 - journalctl_sources += files('journal-qrcode.c', - 'journal-qrcode.h') + journalctl_sources += files('journal-qrcode.c', + 'journal-qrcode.h') endif install_data('journald.conf', install_dir : pkgsysconfdir) -meson.add_install_script('sh', '-c', - mkdir_p.format('/var/log/journal')) -meson.add_install_script('sh', '-c', - 'chown 0:0 $DESTDIR/var/log/journal && - chmod 755 $DESTDIR/var/log/journal || :') +meson.add_install_script( + 'sh', '-c', + mkdir_p.format('/var/log/journal')) +meson.add_install_script( + 'sh', '-c', + 'chown 0:0 $DESTDIR/var/log/journal && + chmod 755 $DESTDIR/var/log/journal || :') if get_option('adm-group') - meson.add_install_script('sh', '-c', - 'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :') + meson.add_install_script( + 'sh', '-c', + 'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :') endif if get_option('wheel-group') - meson.add_install_script('sh', '-c', - 'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :') + meson.add_install_script( + 'sh', '-c', + 'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :') endif diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build index 3e2d2e587c..ede3323bab 100644 --- a/src/kernel-install/meson.build +++ b/src/kernel-install/meson.build @@ -1,5 +1,3 @@ -# -*- mode: meson -*- - install_data('kernel-install', install_mode : 'rwxr-xr-x', install_dir : bindir) diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build index 496601dfa7..3285bcaed1 100644 --- a/src/libsystemd-network/meson.build +++ b/src/libsystemd-network/meson.build @@ -1,48 +1,46 @@ -# -*- mode: meson -*- - sources = files(''' - sd-dhcp-client.c - sd-dhcp-server.c - dhcp-network.c - dhcp-option.c - dhcp-packet.c - dhcp-internal.h - dhcp-server-internal.h - dhcp-protocol.h - dhcp-lease-internal.h - sd-dhcp-lease.c - sd-ipv4ll.c - sd-ipv4acd.c - arp-util.h - arp-util.c - network-internal.c - sd-ndisc.c - ndisc-internal.h - ndisc-router.h - ndisc-router.c - icmp6-util.h - icmp6-util.c - sd-dhcp6-client.c - dhcp6-internal.h - dhcp6-protocol.h - dhcp6-network.c - dhcp6-option.c - dhcp6-lease-internal.h - sd-dhcp6-lease.c - dhcp-identifier.h - dhcp-identifier.c - lldp-internal.h - lldp-network.h - lldp-network.c - lldp-neighbor.h - lldp-neighbor.c - sd-lldp.c + sd-dhcp-client.c + sd-dhcp-server.c + dhcp-network.c + dhcp-option.c + dhcp-packet.c + dhcp-internal.h + dhcp-server-internal.h + dhcp-protocol.h + dhcp-lease-internal.h + sd-dhcp-lease.c + sd-ipv4ll.c + sd-ipv4acd.c + arp-util.h + arp-util.c + network-internal.c + sd-ndisc.c + ndisc-internal.h + ndisc-router.h + ndisc-router.c + icmp6-util.h + icmp6-util.c + sd-dhcp6-client.c + dhcp6-internal.h + dhcp6-protocol.h + dhcp6-network.c + dhcp6-option.c + dhcp6-lease-internal.h + sd-dhcp6-lease.c + dhcp-identifier.h + dhcp-identifier.c + lldp-internal.h + lldp-network.h + lldp-network.c + lldp-neighbor.h + lldp-neighbor.c + sd-lldp.c '''.split()) network_internal_h = files('network-internal.h') libsystemd_network = static_library( - 'systemd-network', - sources, - network_internal_h, - include_directories : includes) + 'systemd-network', + sources, + network_internal_h, + include_directories : includes) diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index 15e7d77693..ab69afee42 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -1,98 +1,96 @@ -# -*- mode: meson -*- - sd_login_c = files('sd-login/sd-login.c') libsystemd_internal_sources = files(''' - sd-bus/bus-bloom.c - sd-bus/bus-bloom.h - sd-bus/bus-common-errors.c - sd-bus/bus-common-errors.h - sd-bus/bus-container.c - sd-bus/bus-container.h - sd-bus/bus-control.c - sd-bus/bus-control.h - sd-bus/bus-convenience.c - sd-bus/bus-creds.c - sd-bus/bus-creds.h - sd-bus/bus-dump.c - sd-bus/bus-dump.h - sd-bus/bus-error.c - sd-bus/bus-error.h - sd-bus/bus-gvariant.c - sd-bus/bus-gvariant.h - sd-bus/bus-internal.c - sd-bus/bus-internal.h - sd-bus/bus-introspect.c - sd-bus/bus-introspect.h - sd-bus/bus-kernel.c - sd-bus/bus-kernel.h - sd-bus/bus-match.c - sd-bus/bus-match.h - sd-bus/bus-message.c - sd-bus/bus-message.h - sd-bus/bus-objects.c - sd-bus/bus-objects.h - sd-bus/bus-protocol.h - sd-bus/bus-signature.c - sd-bus/bus-signature.h - sd-bus/bus-slot.c - sd-bus/bus-slot.h - sd-bus/bus-socket.c - sd-bus/bus-socket.h - sd-bus/bus-track.c - sd-bus/bus-track.h - sd-bus/bus-type.c - sd-bus/bus-type.h - sd-bus/kdbus.h - sd-bus/sd-bus.c - sd-daemon/sd-daemon.c - sd-device/device-enumerator-private.h - sd-device/device-enumerator.c - sd-device/device-internal.h - sd-device/device-private.c - sd-device/device-private.h - sd-device/device-util.h - sd-device/sd-device.c - sd-event/sd-event.c - sd-hwdb/hwdb-internal.h - sd-hwdb/hwdb-util.h - sd-hwdb/sd-hwdb.c - sd-id128/id128-util.c - sd-id128/id128-util.h - sd-id128/sd-id128.c - sd-netlink/local-addresses.c - sd-netlink/local-addresses.h - sd-netlink/netlink-internal.h - sd-netlink/netlink-message.c - sd-netlink/netlink-socket.c - sd-netlink/netlink-types.c - sd-netlink/netlink-types.h - sd-netlink/netlink-util.c - sd-netlink/netlink-util.h - sd-netlink/rtnl-message.c - sd-netlink/sd-netlink.c - sd-network/network-util.c - sd-network/network-util.h - sd-network/sd-network.c - sd-path/sd-path.c - sd-resolve/sd-resolve.c - sd-utf8/sd-utf8.c + sd-bus/bus-bloom.c + sd-bus/bus-bloom.h + sd-bus/bus-common-errors.c + sd-bus/bus-common-errors.h + sd-bus/bus-container.c + sd-bus/bus-container.h + sd-bus/bus-control.c + sd-bus/bus-control.h + sd-bus/bus-convenience.c + sd-bus/bus-creds.c + sd-bus/bus-creds.h + sd-bus/bus-dump.c + sd-bus/bus-dump.h + sd-bus/bus-error.c + sd-bus/bus-error.h + sd-bus/bus-gvariant.c + sd-bus/bus-gvariant.h + sd-bus/bus-internal.c + sd-bus/bus-internal.h + sd-bus/bus-introspect.c + sd-bus/bus-introspect.h + sd-bus/bus-kernel.c + sd-bus/bus-kernel.h + sd-bus/bus-match.c + sd-bus/bus-match.h + sd-bus/bus-message.c + sd-bus/bus-message.h + sd-bus/bus-objects.c + sd-bus/bus-objects.h + sd-bus/bus-protocol.h + sd-bus/bus-signature.c + sd-bus/bus-signature.h + sd-bus/bus-slot.c + sd-bus/bus-slot.h + sd-bus/bus-socket.c + sd-bus/bus-socket.h + sd-bus/bus-track.c + sd-bus/bus-track.h + sd-bus/bus-type.c + sd-bus/bus-type.h + sd-bus/kdbus.h + sd-bus/sd-bus.c + sd-daemon/sd-daemon.c + sd-device/device-enumerator-private.h + sd-device/device-enumerator.c + sd-device/device-internal.h + sd-device/device-private.c + sd-device/device-private.h + sd-device/device-util.h + sd-device/sd-device.c + sd-event/sd-event.c + sd-hwdb/hwdb-internal.h + sd-hwdb/hwdb-util.h + sd-hwdb/sd-hwdb.c + sd-id128/id128-util.c + sd-id128/id128-util.h + sd-id128/sd-id128.c + sd-netlink/local-addresses.c + sd-netlink/local-addresses.h + sd-netlink/netlink-internal.h + sd-netlink/netlink-message.c + sd-netlink/netlink-socket.c + sd-netlink/netlink-types.c + sd-netlink/netlink-types.h + sd-netlink/netlink-util.c + sd-netlink/netlink-util.h + sd-netlink/rtnl-message.c + sd-netlink/sd-netlink.c + sd-network/network-util.c + sd-network/network-util.h + sd-network/sd-network.c + sd-path/sd-path.c + sd-resolve/sd-resolve.c + sd-utf8/sd-utf8.c '''.split()) + sd_login_c libsystemd_internal = static_library( - 'systemd', - libsystemd_internal_sources, - install : false, - include_directories : includes, - link_with : libbasic, - dependencies : [threads, - librt]) + 'systemd', + libsystemd_internal_sources, + install : false, + include_directories : includes, + link_with : libbasic, + dependencies : [threads, + librt]) libsystemd_sym = 'src/libsystemd/libsystemd.sym' libsystemd_pc = configure_file( - input : 'libsystemd.pc.in', - output : 'libsystemd.pc', - configuration : substs) + input : 'libsystemd.pc.in', + output : 'libsystemd.pc', + configuration : substs) install_data(libsystemd_pc, install_dir : pkgconfiglibdir) diff --git a/src/libudev/meson.build b/src/libudev/meson.build index 6c5ebebb7c..1378f9a251 100644 --- a/src/libudev/meson.build +++ b/src/libudev/meson.build @@ -1,17 +1,15 @@ -# -*- mode: meson -*- - libudev_sources = files(''' - libudev-private.h - libudev-device-internal.h - libudev.c - libudev-list.c - libudev-util.c - libudev-device.c - libudev-device-private.c - libudev-enumerate.c - libudev-monitor.c - libudev-queue.c - libudev-hwdb.c + libudev-private.h + libudev-device-internal.h + libudev.c + libudev-list.c + libudev-util.c + libudev-device.c + libudev-device-private.c + libudev-enumerate.c + libudev-monitor.c + libudev-queue.c + libudev-hwdb.c '''.split()) ############################################################ @@ -19,25 +17,25 @@ libudev_sources = files(''' libudev_sym = 'libudev.sym' libudev_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libudev_sym) libudev = shared_library( - 'udev', - libudev_sources, - version : '1.6.6', - include_directories : includes, - link_args : ['-shared', - '-Wl,--version-script=' + libudev_sym_path], - link_with : [libbasic, - libsystemd_internal], - dependencies : [threads], - link_depends : libudev_sym, - install : true, - install_dir : rootlibdir) + 'udev', + libudev_sources, + version : '1.6.6', + include_directories : includes, + link_args : ['-shared', + '-Wl,--version-script=' + libudev_sym_path], + link_with : [libbasic, + libsystemd_internal], + dependencies : [threads], + link_depends : libudev_sym, + install : true, + install_dir : rootlibdir) install_headers('libudev.h') libudev_h_path = '@0@/libudev.h'.format(meson.current_source_dir()) libudev_pc = configure_file( - input : 'libudev.pc.in', - output : 'libudev.pc', - configuration : substs) + input : 'libudev.pc.in', + output : 'libudev.pc', + configuration : substs) install_data(libudev_pc, install_dir : pkgconfiglibdir) diff --git a/src/locale/meson.build b/src/locale/meson.build index 8bd22fe321..f722e0ed92 100644 --- a/src/locale/meson.build +++ b/src/locale/meson.build @@ -1,26 +1,24 @@ -# -*- mode: meson -*- - systemd_localed_sources = files(''' - localed.c - keymap-util.c - keymap-util.h + localed.c + keymap-util.c + keymap-util.h '''.split()) localectl_sources = files('localectl.c') if conf.get('ENABLE_LOCALED', 0) == 1 - install_data('org.freedesktop.locale1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.locale1.service', - install_dir : dbussystemservicedir) + install_data('org.freedesktop.locale1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.locale1.service', + install_dir : dbussystemservicedir) - custom_target( - 'org.freedesktop.locale1.policy', - input : 'org.freedesktop.locale1.policy.in', - output : 'org.freedesktop.locale1.policy', - command : intltool_command, - install : install_polkit, - install_dir : polkitpolicydir) + custom_target( + 'org.freedesktop.locale1.policy', + input : 'org.freedesktop.locale1.policy.in', + output : 'org.freedesktop.locale1.policy', + command : intltool_command, + install : install_polkit, + install_dir : polkitpolicydir) endif # If you know a way that allows the same variables to be used @@ -34,9 +32,9 @@ install_data('kbd-model-map', install_dir : pkgdatadir) tests += [ - [['src/locale/test-keymap-util.c', - 'src/locale/keymap-util.c', - 'src/locale/keymap-util.h'], - [libshared], - [libdl]], - ] + [['src/locale/test-keymap-util.c', + 'src/locale/keymap-util.c', + 'src/locale/keymap-util.h'], + [libshared], + [libdl]], +] diff --git a/src/login/meson.build b/src/login/meson.build index d3e2b73e8b..a518215be8 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -1,106 +1,104 @@ -# -*- mode: meson -*- - systemd_logind_sources = files(''' - logind.c - logind.h + logind.c + logind.h '''.split()) logind_gperf_c = custom_target( - 'logind_gperf.c', - input : 'logind-gperf.gperf', - output : 'logind-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + 'logind_gperf.c', + input : 'logind-gperf.gperf', + output : 'logind-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) systemd_logind_sources += [logind_gperf_c] liblogind_core_sources = files(''' - logind-core.c - logind-device.c - logind-device.h - logind-button.c - logind-button.h - logind-action.c - logind-action.h - logind-seat.c - logind-seat.h - logind-session.c - logind-session.h - logind-session-device.c - logind-session-device.h - logind-user.c - logind-user.h - logind-inhibit.c - logind-inhibit.h - logind-dbus.c - logind-session-dbus.c - logind-seat-dbus.c - logind-user-dbus.c - logind-utmp.c - logind-acl.h + logind-core.c + logind-device.c + logind-device.h + logind-button.c + logind-button.h + logind-action.c + logind-action.h + logind-seat.c + logind-seat.h + logind-session.c + logind-session.h + logind-session-device.c + logind-session-device.h + logind-user.c + logind-user.h + logind-inhibit.c + logind-inhibit.h + logind-dbus.c + logind-session-dbus.c + logind-seat-dbus.c + logind-user-dbus.c + logind-utmp.c + logind-acl.h '''.split()) logind_acl_c = files('logind-acl.c') if conf.get('HAVE_ACL', 0) == 1 - liblogind_core_sources += logind_acl_c + liblogind_core_sources += logind_acl_c endif liblogind_core = static_library( - 'logind-core', - liblogind_core_sources, - include_directories : includes, - dependencies : [libacl]) + 'logind-core', + liblogind_core_sources, + include_directories : includes, + dependencies : [libacl]) loginctl_sources = files(''' - loginctl.c - sysfs-show.h - sysfs-show.c + loginctl.c + sysfs-show.h + sysfs-show.c '''.split()) if conf.get('ENABLE_LOGIND', 0) == 1 - logind_conf = configure_file( - input : 'logind.conf.in', - output : 'logind.conf', - configuration : substs) - install_data(logind_conf, - install_dir : pkgsysconfdir) + logind_conf = configure_file( + input : 'logind.conf.in', + output : 'logind.conf', + configuration : substs) + install_data(logind_conf, + install_dir : pkgsysconfdir) - pam_systemd_sym = 'src/login/pam_systemd.sym' - pam_systemd_c = files('pam_systemd.c') + pam_systemd_sym = 'src/login/pam_systemd.sym' + pam_systemd_c = files('pam_systemd.c') - install_data('org.freedesktop.login1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.login1.service', - install_dir : dbussystemservicedir) + install_data('org.freedesktop.login1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.login1.service', + install_dir : dbussystemservicedir) - custom_target( - 'org.freedesktop.login1.policy', - input : 'org.freedesktop.login1.policy.in', - output : 'org.freedesktop.login1.policy', - command : intltool_command, - install : install_polkit, - install_dir : polkitpolicydir) + custom_target( + 'org.freedesktop.login1.policy', + input : 'org.freedesktop.login1.policy.in', + output : 'org.freedesktop.login1.policy', + command : intltool_command, + install : install_polkit, + install_dir : polkitpolicydir) - install_data('70-power-switch.rules', - '70-uaccess.rules', - install_dir : udevrulesdir) + install_data('70-power-switch.rules', + '70-uaccess.rules', + install_dir : udevrulesdir) - foreach file : ['71-seat.rules', - '73-seat-late.rules'] - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - install_data(gen, - install_dir : udevrulesdir) - endforeach + foreach file : ['71-seat.rules', + '73-seat-late.rules'] + gen = configure_file( + input : file + '.in', + output : file, + configuration : substs) + install_data(gen, + install_dir : udevrulesdir) + endforeach - custom_target( - 'systemd-user', - input : 'systemd-user.m4', - output: 'systemd-user', - command : [m4, '-P'] + m4_defines + ['@INPUT@'], - capture : true, - install : pamconfdir != 'no', - install_dir : pamconfdir) + custom_target( + 'systemd-user', + input : 'systemd-user.m4', + output: 'systemd-user', + command : [m4, '-P'] + m4_defines + ['@INPUT@'], + capture : true, + install : pamconfdir != 'no', + install_dir : pamconfdir) endif diff --git a/src/machine/meson.build b/src/machine/meson.build index 515defcb6c..4ecb1cdb93 100644 --- a/src/machine/meson.build +++ b/src/machine/meson.build @@ -1,48 +1,46 @@ -# -*- mode: meson -*- - systemd_machined_sources = files(''' - machined.c - machined.h + machined.c + machined.h '''.split()) libmachine_core_sources = files(''' - machine.c - machine.h - machined-dbus.c - machine-dbus.c - machine-dbus.h - image-dbus.c - image-dbus.h - operation.c - operation.h + machine.c + machine.h + machined-dbus.c + machine-dbus.c + machine-dbus.h + image-dbus.c + image-dbus.h + operation.c + operation.h '''.split()) libmachine_core = static_library( - 'machine-core', - libmachine_core_sources, - include_directories : includes, - dependencies : [threads]) + 'machine-core', + libmachine_core_sources, + include_directories : includes, + dependencies : [threads]) if conf.get('ENABLE_MACHINED', 0) == 1 - install_data('org.freedesktop.machine1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.machine1.service', - install_dir : dbussystemservicedir) + install_data('org.freedesktop.machine1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.machine1.service', + install_dir : dbussystemservicedir) - custom_target( - 'org.freedesktop.machine1.policy', - input : 'org.freedesktop.machine1.policy.in', - output : 'org.freedesktop.machine1.policy', - command : intltool_command, - install : install_polkit, - install_dir : polkitpolicydir) + custom_target( + 'org.freedesktop.machine1.policy', + input : 'org.freedesktop.machine1.policy.in', + output : 'org.freedesktop.machine1.policy', + command : intltool_command, + install : install_polkit, + install_dir : polkitpolicydir) endif tests += [ - [['src/machine/test-machine-tables.c'], - [libmachine_core, - libshared, - libudev], - [threads], - 'ENABLE_MACHINED'], - ] + [['src/machine/test-machine-tables.c'], + [libmachine_core, + libshared, + libudev], + [threads], + 'ENABLE_MACHINED'], +] diff --git a/src/network/meson.build b/src/network/meson.build index 1e8da8cfb7..6bbada397d 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -1,74 +1,72 @@ -# -*- mode: meson -*- - sources = files(''' - netdev/bond.c - netdev/bond.h - netdev/bridge.c - netdev/bridge.h - netdev/dummy.c - netdev/dummy.h - netdev/ipvlan.c - netdev/ipvlan.h - netdev/macvlan.c - netdev/macvlan.h - netdev/netdev.c - netdev/netdev.h - netdev/tunnel.c - netdev/tunnel.h - netdev/tuntap.c - netdev/tuntap.h - netdev/vcan.c - netdev/vcan.h - netdev/veth.c - netdev/veth.h - netdev/vlan.c - netdev/vlan.h - netdev/vrf.c - netdev/vrf.h - netdev/vxlan.c - netdev/vxlan.h - networkd-address-pool.c - networkd-address-pool.h - networkd-address.c - networkd-address.h - networkd-brvlan.c - networkd-brvlan.h - networkd-conf.c - networkd-conf.h - networkd-dhcp4.c - networkd-dhcp6.c - networkd-fdb.c - networkd-fdb.h - networkd-ipv4ll.c - networkd-ipv6-proxy-ndp.c - networkd-ipv6-proxy-ndp.h - networkd-link-bus.c - networkd-link.c - networkd-link.h - networkd-lldp-tx.c - networkd-lldp-tx.h - networkd-manager-bus.c - networkd-manager.c - networkd-manager.h - networkd-ndisc.c - networkd-ndisc.h - networkd-network-bus.c - networkd-network.c - networkd-network.h - networkd-route.c - networkd-route.h - networkd-util.c - networkd-util.h + netdev/bond.c + netdev/bond.h + netdev/bridge.c + netdev/bridge.h + netdev/dummy.c + netdev/dummy.h + netdev/ipvlan.c + netdev/ipvlan.h + netdev/macvlan.c + netdev/macvlan.h + netdev/netdev.c + netdev/netdev.h + netdev/tunnel.c + netdev/tunnel.h + netdev/tuntap.c + netdev/tuntap.h + netdev/vcan.c + netdev/vcan.h + netdev/veth.c + netdev/veth.h + netdev/vlan.c + netdev/vlan.h + netdev/vrf.c + netdev/vrf.h + netdev/vxlan.c + netdev/vxlan.h + networkd-address-pool.c + networkd-address-pool.h + networkd-address.c + networkd-address.h + networkd-brvlan.c + networkd-brvlan.h + networkd-conf.c + networkd-conf.h + networkd-dhcp4.c + networkd-dhcp6.c + networkd-fdb.c + networkd-fdb.h + networkd-ipv4ll.c + networkd-ipv6-proxy-ndp.c + networkd-ipv6-proxy-ndp.h + networkd-link-bus.c + networkd-link.c + networkd-link.h + networkd-lldp-tx.c + networkd-lldp-tx.h + networkd-manager-bus.c + networkd-manager.c + networkd-manager.h + networkd-ndisc.c + networkd-ndisc.h + networkd-network-bus.c + networkd-network.c + networkd-network.h + networkd-route.c + networkd-route.h + networkd-util.c + networkd-util.h '''.split()) systemd_networkd_sources = files('networkd.c') systemd_networkd_wait_online_sources = files(''' - wait-online/link.c - wait-online/link.h - wait-online/manager.c - wait-online/manager.h - wait-online/wait-online.c + wait-online/link.c + wait-online/link.h + wait-online/manager.c + wait-online/manager.h + wait-online/wait-online.c '''.split()) + network_internal_h networkctl_sources = files('networkctl.c') @@ -76,48 +74,48 @@ networkctl_sources = files('networkctl.c') network_include_dir = include_directories('.') if conf.get('ENABLE_NETWORKD', 0) == 1 - networkd_gperf_c = custom_target( - 'networkd-gperf.c', - input : 'networkd-gperf.gperf', - output : 'networkd-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + networkd_gperf_c = custom_target( + 'networkd-gperf.c', + input : 'networkd-gperf.gperf', + output : 'networkd-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) - networkd_network_gperf_c = custom_target( - 'networkd-network-gperf.c', - input : 'networkd-network-gperf.gperf', - output : 'networkd-network-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + networkd_network_gperf_c = custom_target( + 'networkd-network-gperf.c', + input : 'networkd-network-gperf.gperf', + output : 'networkd-network-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) - netdev_gperf_c = custom_target( - 'netdev-gperf.c', - input : 'netdev/netdev-gperf.gperf', - output : 'netdev-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + netdev_gperf_c = custom_target( + 'netdev-gperf.c', + input : 'netdev/netdev-gperf.gperf', + output : 'netdev-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) - libnetworkd_core = static_library( - 'networkd-core', - sources, - network_internal_h, - networkd_gperf_c, - networkd_network_gperf_c, - netdev_gperf_c, - include_directories : includes, - link_with : [libshared]) + libnetworkd_core = static_library( + 'networkd-core', + sources, + network_internal_h, + networkd_gperf_c, + networkd_network_gperf_c, + netdev_gperf_c, + include_directories : includes, + link_with : [libshared]) - install_data('org.freedesktop.network1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.network1.service', - install_dir : dbussystemservicedir) - if install_polkit - install_data('systemd-networkd.rules', - install_dir : polkitrulesdir) - endif - if install_polkit_pkla - install_data('systemd-networkd.pkla', - install_dir : polkitpkladir) - endif + install_data('org.freedesktop.network1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.network1.service', + install_dir : dbussystemservicedir) + if install_polkit + install_data('systemd-networkd.rules', + install_dir : polkitrulesdir) + endif + if install_polkit_pkla + install_data('systemd-networkd.pkla', + install_dir : polkitpkladir) + endif - tests += [ + tests += [ [['src/network/test-networkd-conf.c'], [libnetworkd_core, libsystemd_network, diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build index c231486cfc..b6ac6006ab 100644 --- a/src/nspawn/meson.build +++ b/src/nspawn/meson.build @@ -1,42 +1,40 @@ -# -*- mode: meson -*- - systemd_nspawn_sources = files(''' - nspawn.c - nspawn-settings.c - nspawn-settings.h - nspawn-mount.c - nspawn-mount.h - nspawn-network.c - nspawn-network.h - nspawn-expose-ports.c - nspawn-expose-ports.h - nspawn-cgroup.c - nspawn-cgroup.h - nspawn-seccomp.c - nspawn-seccomp.h - nspawn-register.c - nspawn-register.h - nspawn-setuid.c - nspawn-setuid.h - nspawn-stub-pid1.c - nspawn-stub-pid1.h - nspawn-patch-uid.c - nspawn-patch-uid.h + nspawn.c + nspawn-settings.c + nspawn-settings.h + nspawn-mount.c + nspawn-mount.h + nspawn-network.c + nspawn-network.h + nspawn-expose-ports.c + nspawn-expose-ports.h + nspawn-cgroup.c + nspawn-cgroup.h + nspawn-seccomp.c + nspawn-seccomp.h + nspawn-register.c + nspawn-register.h + nspawn-setuid.c + nspawn-setuid.h + nspawn-stub-pid1.c + nspawn-stub-pid1.h + nspawn-patch-uid.c + nspawn-patch-uid.h '''.split()) nspawn_gperf_c = custom_target( - 'nspawn-gperf.c', - input : 'nspawn-gperf.gperf', - output : 'nspawn-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + 'nspawn-gperf.c', + input : 'nspawn-gperf.gperf', + output : 'nspawn-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) systemd_nspawn_sources += [nspawn_gperf_c] tests += [ - [['src/nspawn/test-patch-uid.c', - 'src/nspawn/nspawn-patch-uid.c', - 'src/nspawn/nspawn-patch-uid.h'], - [libshared], - [libacl], - '', 'manual'], - ] + [['src/nspawn/test-patch-uid.c', + 'src/nspawn/nspawn-patch-uid.c', + 'src/nspawn/nspawn-patch-uid.h'], + [libshared], + [libacl], + '', 'manual'], +] diff --git a/src/resolve/meson.build b/src/resolve/meson.build index f0bbce49c4..b8feb7bb1b 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -1,64 +1,62 @@ -# -*- mode: meson -*- - basic_dns_sources = files(''' - resolved-dns-dnssec.c - resolved-dns-dnssec.h - resolved-dns-packet.c - resolved-dns-packet.h - resolved-dns-rr.c - resolved-dns-rr.h - resolved-dns-answer.c - resolved-dns-answer.h - resolved-dns-question.c - resolved-dns-question.h - dns-type.c + resolved-dns-dnssec.c + resolved-dns-dnssec.h + resolved-dns-packet.c + resolved-dns-packet.h + resolved-dns-rr.c + resolved-dns-rr.h + resolved-dns-answer.c + resolved-dns-answer.h + resolved-dns-question.c + resolved-dns-question.h + dns-type.c '''.split()) dns_type_h = files('dns-type.h')[0] systemd_resolved_only_sources = files(''' - resolved.c - resolved-manager.c - resolved-manager.h - resolved-conf.c - resolved-conf.h - resolved-resolv-conf.c - resolved-resolv-conf.h - resolved-bus.c - resolved-bus.h - resolved-link.h - resolved-link.c - resolved-link-bus.c - resolved-link-bus.h - resolved-llmnr.h - resolved-llmnr.c - resolved-mdns.h - resolved-mdns.c - resolved-def.h - resolved-dns-query.h - resolved-dns-query.c - resolved-dns-synthesize.h - resolved-dns-synthesize.c - resolved-dns-transaction.h - resolved-dns-transaction.c - resolved-dns-scope.h - resolved-dns-scope.c - resolved-dns-server.h - resolved-dns-server.c - resolved-dns-search-domain.h - resolved-dns-search-domain.c - resolved-dns-cache.h - resolved-dns-cache.c - resolved-dns-zone.h - resolved-dns-zone.c - resolved-dns-stream.h - resolved-dns-stream.c - resolved-dns-trust-anchor.h - resolved-dns-trust-anchor.c - resolved-dns-stub.h - resolved-dns-stub.c - resolved-etc-hosts.h - resolved-etc-hosts.c + resolved.c + resolved-manager.c + resolved-manager.h + resolved-conf.c + resolved-conf.h + resolved-resolv-conf.c + resolved-resolv-conf.h + resolved-bus.c + resolved-bus.h + resolved-link.h + resolved-link.c + resolved-link-bus.c + resolved-link-bus.h + resolved-llmnr.h + resolved-llmnr.c + resolved-mdns.h + resolved-mdns.c + resolved-def.h + resolved-dns-query.h + resolved-dns-query.c + resolved-dns-synthesize.h + resolved-dns-synthesize.c + resolved-dns-transaction.h + resolved-dns-transaction.c + resolved-dns-scope.h + resolved-dns-scope.c + resolved-dns-server.h + resolved-dns-server.c + resolved-dns-search-domain.h + resolved-dns-search-domain.c + resolved-dns-cache.h + resolved-dns-cache.c + resolved-dns-zone.h + resolved-dns-zone.c + resolved-dns-stream.h + resolved-dns-stream.c + resolved-dns-trust-anchor.h + resolved-dns-trust-anchor.c + resolved-dns-stub.h + resolved-dns-stub.c + resolved-etc-hosts.h + resolved-etc-hosts.c '''.split()) systemd_resolve_only_sources = files('resolve-tool.c') @@ -66,114 +64,112 @@ systemd_resolve_only_sources = files('resolve-tool.c') ############################################################ dns_type_list_txt = custom_target( - 'dns_type-list.txt', - input : ['generate-dns_type-list.sed', dns_type_h], - output : 'dns_type-list.txt', - command : [sed, '-n', '-r', '-f', '@INPUT0@', '@INPUT1@'], - capture : true) + 'dns_type-list.txt', + input : ['generate-dns_type-list.sed', dns_type_h], + output : 'dns_type-list.txt', + command : [sed, '-n', '-r', '-f', '@INPUT0@', '@INPUT1@'], + capture : true) generate_dns_type_gperf = find_program('generate-dns_type-gperf.py') dns_type_headers = [dns_type_h] foreach item : [['dns_type', dns_type_list_txt, 'dns_type', 'DNS_TYPE_']] - fname = '@0@-from-name.gperf'.format(item[0]) - gperf_file = custom_target( - fname, - input : item[1], - output : fname, - command : [generate_dns_type_gperf, item[2], item[3], '@INPUT@'], - capture : true) - - fname = '@0@-from-name.h'.format(item[0]) - target1 = custom_target( - fname, - input : gperf_file, - output : fname, - command : [gperf, - '-L', 'ANSI-C', '-t', '--ignore-case', - '-N', 'lookup_@0@'.format(item[2]), - '-H', 'hash_@0@_name'.format(item[2]), - '-p', '-C', - '@INPUT@'], - capture : true) - - fname = '@0@-to-name.h'.format(item[0]) - awkscript = '@0@-to-name.awk'.format(item[0]) - target2 = custom_target( - fname, - input : [awkscript, item[1]], - output : fname, - command : [awk, '-f', '@INPUT0@', '@INPUT1@'], - capture : true) - - dns_type_headers += [target1, target2] + fname = '@0@-from-name.gperf'.format(item[0]) + gperf_file = custom_target( + fname, + input : item[1], + output : fname, + command : [generate_dns_type_gperf, item[2], item[3], '@INPUT@'], + capture : true) + + fname = '@0@-from-name.h'.format(item[0]) + target1 = custom_target( + fname, + input : gperf_file, + output : fname, + command : [gperf, + '-L', 'ANSI-C', '-t', '--ignore-case', + '-N', 'lookup_@0@'.format(item[2]), + '-H', 'hash_@0@_name'.format(item[2]), + '-p', '-C', + '@INPUT@'], + capture : true) + + fname = '@0@-to-name.h'.format(item[0]) + awkscript = '@0@-to-name.awk'.format(item[0]) + target2 = custom_target( + fname, + input : [awkscript, item[1]], + output : fname, + command : [awk, '-f', '@INPUT0@', '@INPUT1@'], + capture : true) + + dns_type_headers += [target1, target2] endforeach resolved_gperf_c = custom_target( - 'resolved_gperf.c', - input : 'resolved-gperf.gperf', - output : 'resolved-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) - -systemd_resolved_sources = ( - basic_dns_sources + - [resolved_gperf_c] + - systemd_resolved_only_sources + - dns_type_headers) - -systemd_resolve_sources = ( - basic_dns_sources + - systemd_resolve_only_sources + - dns_type_headers) + 'resolved_gperf.c', + input : 'resolved-gperf.gperf', + output : 'resolved-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + +systemd_resolved_sources = (basic_dns_sources + + [resolved_gperf_c] + + systemd_resolved_only_sources + + dns_type_headers) + +systemd_resolve_sources = (basic_dns_sources + + systemd_resolve_only_sources + + dns_type_headers) if conf.get('ENABLE_RESOLVED', 0) == 1 - install_data('org.freedesktop.resolve1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.resolve1.service', - install_dir : dbussystemservicedir) - - resolved_conf = configure_file( - input : 'resolved.conf.in', - output : 'resolved.conf', - configuration : substs) - install_data(resolved_conf, - install_dir : pkgsysconfdir) + install_data('org.freedesktop.resolve1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.resolve1.service', + install_dir : dbussystemservicedir) + + resolved_conf = configure_file( + input : 'resolved.conf.in', + output : 'resolved.conf', + configuration : substs) + install_data(resolved_conf, + install_dir : pkgsysconfdir) endif install_data('resolv.conf', install_dir : rootlibexecdir) tests += [ - [['src/resolve/test-resolve-tables.c', - basic_dns_sources, - dns_type_headers, - 'src/shared/test-tables.h'], - [], - [libgcrypt, - libm], - 'ENABLE_RESOLVED'], - - [['src/resolve/test-dns-packet.c', - basic_dns_sources, - dns_type_headers], - [], - [libgcrypt, - libm], - 'ENABLE_RESOLVED'], - - [['src/resolve/test-dnssec.c', - basic_dns_sources, - dns_type_headers], - [], - [libgcrypt, - libm], - 'ENABLE_RESOLVED'], - - [['src/resolve/test-dnssec-complex.c', - 'src/resolve/dns-type.c', - dns_type_headers], - [], - [], - 'ENABLE_RESOLVED', 'manual'], - ] + [['src/resolve/test-resolve-tables.c', + basic_dns_sources, + dns_type_headers, + 'src/shared/test-tables.h'], + [], + [libgcrypt, + libm], + 'ENABLE_RESOLVED'], + + [['src/resolve/test-dns-packet.c', + basic_dns_sources, + dns_type_headers], + [], + [libgcrypt, + libm], + 'ENABLE_RESOLVED'], + + [['src/resolve/test-dnssec.c', + basic_dns_sources, + dns_type_headers], + [], + [libgcrypt, + libm], + 'ENABLE_RESOLVED'], + + [['src/resolve/test-dnssec-complex.c', + 'src/resolve/dns-type.c', + dns_type_headers], + [], + [], + 'ENABLE_RESOLVED', 'manual'], +] diff --git a/src/shared/meson.build b/src/shared/meson.build index 4a51241d44..5f48567817 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -1,173 +1,171 @@ -# -*- mode: meson -*- - shared_sources = ''' - acl-util.h - acpi-fpdt.c - acpi-fpdt.h - apparmor-util.c - apparmor-util.h - ask-password-api.c - ask-password-api.h - base-filesystem.c - base-filesystem.h - boot-timestamps.c - boot-timestamps.h - bus-unit-util.c - bus-unit-util.h - bus-util.c - bus-util.h - cgroup-show.c - cgroup-show.h - clean-ipc.c - clean-ipc.h - condition.c - condition.h - conf-parser.c - conf-parser.h - dev-setup.c - dev-setup.h - dissect-image.c - dissect-image.h - dns-domain.c - dns-domain.h - dropin.c - dropin.h - efivars.c - efivars.h - fdset.c - fdset.h - fstab-util.c - fstab-util.h - gcrypt-util.c - gcrypt-util.h - generator.c - generator.h - gpt.h - ima-util.c - ima-util.h - import-util.c - import-util.h - initreq.h - install.c - install.h - install-printf.c - install-printf.h - journal-util.c - journal-util.h - logs-show.c - logs-show.h - loop-util.c - loop-util.h - machine-image.c - machine-image.h - machine-pool.c - machine-pool.h - nsflags.c - nsflags.h - output-mode.c - output-mode.h - pager.c - pager.h - path-lookup.c - path-lookup.h - ptyfwd.c - ptyfwd.h - resolve-util.c - resolve-util.h - seccomp-util.h - sleep-config.c - sleep-config.h - spawn-ask-password-agent.c - spawn-ask-password-agent.h - spawn-polkit-agent.c - spawn-polkit-agent.h - specifier.c - specifier.h - switch-root.c - switch-root.h - sysctl-util.c - sysctl-util.h - tests.c - tests.h - udev-util.h - uid-range.c - uid-range.h - utmp-wtmp.h - vlan-util.c - vlan-util.h - volatile-util.c - volatile-util.h - watchdog.c - watchdog.h + acl-util.h + acpi-fpdt.c + acpi-fpdt.h + apparmor-util.c + apparmor-util.h + ask-password-api.c + ask-password-api.h + base-filesystem.c + base-filesystem.h + boot-timestamps.c + boot-timestamps.h + bus-unit-util.c + bus-unit-util.h + bus-util.c + bus-util.h + cgroup-show.c + cgroup-show.h + clean-ipc.c + clean-ipc.h + condition.c + condition.h + conf-parser.c + conf-parser.h + dev-setup.c + dev-setup.h + dissect-image.c + dissect-image.h + dns-domain.c + dns-domain.h + dropin.c + dropin.h + efivars.c + efivars.h + fdset.c + fdset.h + fstab-util.c + fstab-util.h + gcrypt-util.c + gcrypt-util.h + generator.c + generator.h + gpt.h + ima-util.c + ima-util.h + import-util.c + import-util.h + initreq.h + install.c + install.h + install-printf.c + install-printf.h + journal-util.c + journal-util.h + logs-show.c + logs-show.h + loop-util.c + loop-util.h + machine-image.c + machine-image.h + machine-pool.c + machine-pool.h + nsflags.c + nsflags.h + output-mode.c + output-mode.h + pager.c + pager.h + path-lookup.c + path-lookup.h + ptyfwd.c + ptyfwd.h + resolve-util.c + resolve-util.h + seccomp-util.h + sleep-config.c + sleep-config.h + spawn-ask-password-agent.c + spawn-ask-password-agent.h + spawn-polkit-agent.c + spawn-polkit-agent.h + specifier.c + specifier.h + switch-root.c + switch-root.h + sysctl-util.c + sysctl-util.h + tests.c + tests.h + udev-util.h + uid-range.c + uid-range.h + utmp-wtmp.h + vlan-util.c + vlan-util.h + volatile-util.c + volatile-util.h + watchdog.c + watchdog.h '''.split() test_tables_h = files('test-tables.h') shared_sources += [test_tables_h] if conf.get('HAVE_ACL', 0) == 1 - shared_sources += ['acl-util.c'] + shared_sources += ['acl-util.c'] endif if conf.get('HAVE_UTMP', 0) == 1 - shared_sources += ['utmp-wtmp.c'] + shared_sources += ['utmp-wtmp.c'] endif if conf.get('HAVE_SECCOMP', 0) == 1 - shared_sources += ['seccomp-util.c'] + shared_sources += ['seccomp-util.c'] endif libshared_name = 'systemd-shared-@0@'.format(meson.project_version()) libshared = shared_library( - libshared_name, - shared_sources, - basic_sources, - journal_internal_sources, - libsystemd_internal_sources, - include_directories : includes, - link_args : ['-shared'], - c_args : ['-fvisibility=default'], - link_with : [libudev], - dependencies : [threads, - librt, - libcap, - libacl, - libcryptsetup, - libiptc, - libseccomp, - libselinux, - libidn, - libxz, - liblz4, - libblkid], - install : true, - install_dir : rootlibexecdir) + libshared_name, + shared_sources, + basic_sources, + journal_internal_sources, + libsystemd_internal_sources, + include_directories : includes, + link_args : ['-shared'], + c_args : ['-fvisibility=default'], + link_with : [libudev], + dependencies : [threads, + librt, + libcap, + libacl, + libcryptsetup, + libiptc, + libseccomp, + libselinux, + libidn, + libxz, + liblz4, + libblkid], + install : true, + install_dir : rootlibexecdir) libshared_static = static_library( - libshared_name, - shared_sources, - basic_sources, - include_directories : includes, - dependencies : [threads, - librt, - libcap, - libacl, - libcryptsetup, - libiptc, - libseccomp, - libselinux, - libidn, - libxz, - liblz4, - libblkid]) + libshared_name, + shared_sources, + basic_sources, + include_directories : includes, + dependencies : [threads, + librt, + libcap, + libacl, + libcryptsetup, + libiptc, + libseccomp, + libselinux, + libidn, + libxz, + liblz4, + libblkid]) if conf.get('HAVE_LIBIPTC', 0) == 1 - libfirewall = static_library( - 'firewall', - 'firewall-util.h', - 'firewall-util.c', - include_directories : includes, - dependencies : [libiptc]) + libfirewall = static_library( + 'firewall', + 'firewall-util.h', + 'firewall-util.c', + include_directories : includes, + dependencies : [libiptc]) else - libfirewall = [] + libfirewall = [] endif diff --git a/src/sulogin-shell/meson.build b/src/sulogin-shell/meson.build index 80ac8c43d0..4ec0d3da1a 100644 --- a/src/sulogin-shell/meson.build +++ b/src/sulogin-shell/meson.build @@ -1,9 +1,7 @@ -# -*- mode: meson -*- - gen = configure_file( - input : 'systemd-sulogin-shell.in', - output : 'systemd-sulogin-shell', - configuration : substs) + input : 'systemd-sulogin-shell.in', + output : 'systemd-sulogin-shell', + configuration : substs) install_data(gen, install_dir : rootlibexecdir) diff --git a/src/systemd/meson.build b/src/systemd/meson.build index f3b969bb2b..0f5a853e2e 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -1,15 +1,13 @@ -# -*- mode: meson -*- - _systemd_headers = ''' - sd-bus.h - sd-bus-protocol.h - sd-bus-vtable.h - sd-daemon.h - sd-event.h - sd-id128.h - sd-journal.h - sd-login.h - sd-messages.h + sd-bus.h + sd-bus-protocol.h + sd-bus-vtable.h + sd-daemon.h + sd-event.h + sd-id128.h + sd-journal.h + sd-login.h + sd-messages.h '''.split() # https://github.com/mesonbuild/meson/issues/1633 @@ -33,9 +31,9 @@ systemd_headers = files(_systemd_headers) # sd-utf8.h install_headers( - systemd_headers, - '_sd-common.h', - subdir : 'systemd') + systemd_headers, + '_sd-common.h', + subdir : 'systemd') ############################################################ @@ -45,12 +43,12 @@ opts = [[], ['-std=iso9899:1990']] foreach header : _systemd_headers - foreach opt : opts - name = ''.join([header] + opt) - test('cc-' + name, - check_compilation_sh, - args : cc.cmd_array() + ['-x', 'c'] + opt + - ['-Werror', '-include', - join_paths(meson.current_source_dir(), header)]) - endforeach + foreach opt : opts + name = ''.join([header] + opt) + test('cc-' + name, + check_compilation_sh, + args : cc.cmd_array() + ['-x', 'c'] + opt + + ['-Werror', '-include', + join_paths(meson.current_source_dir(), header)]) + endforeach endforeach diff --git a/src/test/meson.build b/src/test/meson.build index 0014fed79b..10c3201ab4 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -1,12 +1,10 @@ -# -*- mode: meson -*- - awkscript = 'test-hashmap-ordered.awk' test_hashmap_ordered_c = custom_target( - 'test-hashmap-ordered.c', - input : [awkscript, 'test-hashmap-plain.c'], - output : 'test-hashmap-ordered.c', - command : [awk, '-f', '@INPUT0@', '@INPUT1@'], - capture : true) + 'test-hashmap-ordered.c', + input : [awkscript, 'test-hashmap-plain.c'], + output : 'test-hashmap-ordered.c', + command : [awk, '-f', '@INPUT0@', '@INPUT1@'], + capture : true) test_include_dir = include_directories('.') @@ -22,876 +20,876 @@ test_env.prepend('PATH', meson.build_root()) generate_sym_test_py = find_program('generate-sym-test.py') test_libsystemd_sym_c = custom_target( - 'test-libsystemd-sym.c', - input : [libsystemd_sym_path] + systemd_headers, - output : 'test-libsystemd-sym.c', - command : [generate_sym_test_py, libsystemd_sym_path] + systemd_headers, - capture : true) + 'test-libsystemd-sym.c', + input : [libsystemd_sym_path] + systemd_headers, + output : 'test-libsystemd-sym.c', + command : [generate_sym_test_py, libsystemd_sym_path] + systemd_headers, + capture : true) test_libudev_sym_c = custom_target( - 'test-libudev-sym.c', - input : [libudev_sym_path, libudev_h_path], - output : 'test-libudev-sym.c', - command : [generate_sym_test_py, '@INPUT0@', '@INPUT1@'], - capture : true) + 'test-libudev-sym.c', + input : [libudev_sym_path, libudev_h_path], + output : 'test-libudev-sym.c', + command : [generate_sym_test_py, '@INPUT0@', '@INPUT1@'], + capture : true) test_dlopen_c = files('test-dlopen.c') ############################################################ tests += [ - [['src/test/test-device-nodes.c'], - [], - []], - - [['src/test/test-engine.c'], - [libcore, - libudev, - libsystemd_internal], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-job-type.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-ns.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid], - '', 'unsafe'], - - [['src/test/test-loopback.c'], - [libcore, - libshared], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-hostname.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid], - '', 'unsafe'], - - [['src/test/test-dns-domain.c'], - [libcore, - libsystemd_network], - []], - - [['src/test/test-boot-timestamps.c'], - [], - [], - 'ENABLE_EFI'], - - [['src/test/test-unit-name.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-unit-file.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-utf8.c'], - [], - []], - - [['src/test/test-capability.c'], - [], - [libcap]], - - [['src/test/test-async.c'], - [], - []], - - [['src/test/test-locale-util.c'], - [], - []], - - [['src/test/test-copy.c'], - [libshared_static], - []], - - [['src/test/test-sigbus.c'], - [], - []], - - [['src/test/test-condition.c'], - [], - []], - - [['src/test/test-fdset.c'], - [], - []], - - [['src/test/test-fstab-util.c'], - [], - []], - - [['src/test/test-ratelimit.c'], - [], - []], - - [['src/test/test-util.c'], - [], - []], - - [['src/test/test-mount-util.c'], - [], - []], - - [['src/test/test-exec-util.c'], - [], - []], - - [['src/test/test-hexdecoct.c'], - [], - []], - - [['src/test/test-alloc-util.c'], - [], - []], - - [['src/test/test-xattr-util.c'], - [], - []], - - [['src/test/test-io-util.c'], - [], - []], - - [['src/test/test-glob-util.c'], - [], - []], - - [['src/test/test-fs-util.c'], - [], - []], - - [['src/test/test-proc-cmdline.c'], - [], - []], - - [['src/test/test-fd-util.c'], - [], - []], - - [['src/test/test-web-util.c'], - [], - []], - - [['src/test/test-cpu-set-util.c'], - [], - []], - - [['src/test/test-stat-util.c'], - [], - []], - - [['src/test/test-escape.c'], - [], - []], - - [['src/test/test-string-util.c'], - [], - []], - - [['src/test/test-extract-word.c'], - [], - []], - - [['src/test/test-parse-util.c'], - [], - []], - - [['src/test/test-user-util.c'], - [], - []], - - [['src/test/test-hostname-util.c'], - [], - []], - - [['src/test/test-process-util.c'], - [], - []], - - [['src/test/test-terminal-util.c'], - [], - []], - - [['src/test/test-path-lookup.c'], - [], - []], - - [['src/test/test-uid-range.c'], - [], - []], - - [['src/test/test-cap-list.c', - generated_gperf_headers], - [], - [libcap]], - - [['src/test/test-socket-util.c'], - [], - []], - - [['src/test/test-barrier.c'], - [], - []], - - [['src/test/test-tmpfiles.c'], - [], - []], - - [['src/test/test-namespace.c'], - [libcore, - libshared, - libudev], - [threads, - libblkid]], - - [['src/test/test-verbs.c'], - [], - []], - - [['src/test/test-install-root.c'], - [], - []], - - [['src/test/test-acl-util.c'], - [], - [], - 'HAVE_ACL'], - - [['src/test/test-seccomp.c'], - [], - [libseccomp], - 'HAVE_SECCOMP'], - - [['src/test/test-rlimit-util.c'], - [], - []], - - [['src/test/test-ask-password-api.c'], - [], - [], - '', 'manual'], - - [['src/test/test-dissect-image.c'], - [], - [libblkid], - '', 'manual'], - - [['src/test/test-signal-util.c'], - [], - []], - - [['src/test/test-selinux.c'], - [], - []], - - [['src/test/test-sizeof.c'], - [libbasic], - []], - - [['src/test/test-hashmap.c', - 'src/test/test-hashmap-plain.c', - test_hashmap_ordered_c], - [], - [], - '', 'timeout=90'], - - [['src/test/test-set.c'], - [], - []], - - [['src/test/test-bitmap.c'], - [], - []], - - [['src/test/test-xml.c'], - [], - []], - - [['src/test/test-list.c'], - [], - []], - - [['src/test/test-unaligned.c'], - [], - []], - - [['src/test/test-tables.c', - 'src/shared/test-tables.h', - 'src/journal/journald-server.c', - 'src/journal/journald-server.h'], - [libcore, - libjournal_core, - libudev_core, - libudev_internal, - libsystemd_network, - libshared], - [threads, - libseccomp, - libmount, - libxz, - liblz4, - libblkid], - '', '', [], libudev_core_includes], - - [['src/test/test-prioq.c'], - [], - []], - - [['src/test/test-fileio.c'], - [], - []], - - [['src/test/test-time.c'], - [], - []], - - [['src/test/test-clock.c'], - [], - []], - - [['src/test/test-architecture.c'], - [], - []], - - [['src/test/test-log.c'], - [], - []], - - [['src/test/test-ipcrm.c'], - [], - [], - '', 'unsafe'], - - [['src/test/test-btrfs.c'], - [], - [], - '', 'manual'], - - - [['src/test/test-firewall-util.c'], - [libfirewall, - libshared], - [], - 'HAVE_LIBIPTC'], - - [['src/test/test-netlink-manual.c'], - [], - [libkmod], - 'HAVE_KMOD', 'manual'], - - [['src/test/test-ellipsize.c'], - [], - []], - - [['src/test/test-date.c'], - [], - []], - - [['src/test/test-sleep.c'], - [], - []], - - [['src/test/test-replace-var.c'], - [], - []], - - [['src/test/test-calendarspec.c'], - [], - []], - - [['src/test/test-strip-tab-ansi.c'], - [], - []], - - [['src/test/test-daemon.c'], - [], - []], - - [['src/test/test-cgroup.c'], - [], - [], - '', 'manual'], - - - [['src/test/test-cgroup-mask.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-cgroup-util.c'], - [], - []], - - [['src/test/test-env-util.c'], - [], - []], - - [['src/test/test-strbuf.c'], - [], - []], - - [['src/test/test-strv.c'], - [], - []], - - [['src/test/test-path-util.c'], - [], - []], - - [['src/test/test-path.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-execute.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-siphash24.c'], - [], - []], - - [['src/test/test-strxcpyx.c'], - [], - []], - - [['src/test/test-install.c'], - [libcore, - libshared], - [], - '', 'manual'], - - [['src/test/test-watchdog.c'], - [], - []], - - [['src/test/test-sched-prio.c'], - [libcore, - libshared, - libudev], - [threads, - librt, - libseccomp, - libselinux, - libmount, - libblkid]], - - [['src/test/test-conf-files.c'], - [], - []], - - [['src/test/test-conf-parser.c'], - [], - []], - - [['src/test/test-af-list.c', - generated_gperf_headers], - [], - []], - - [['src/test/test-arphrd-list.c', - generated_gperf_headers], - [], - []], - - [['src/test/test-journal-importer.c'], - [], - []], - - [['src/test/test-libudev.c'], - [libshared, - libudev], - []], - - [['src/test/test-udev.c'], - [libudev_core, - libudev_internal, - libsystemd_network, - libshared], - [threads, - librt, - libblkid, - libkmod, - libacl], - '', 'manual'], - - [['src/test/test-id128.c'], - [], - []], - - [['src/test/test-hash.c'], - [], - []], - - [['src/test/test-nss.c'], - [], - [libdl], - '', 'manual'], - ] + [['src/test/test-device-nodes.c'], + [], + []], + + [['src/test/test-engine.c'], + [libcore, + libudev, + libsystemd_internal], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-job-type.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-ns.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid], + '', 'unsafe'], + + [['src/test/test-loopback.c'], + [libcore, + libshared], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-hostname.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid], + '', 'unsafe'], + + [['src/test/test-dns-domain.c'], + [libcore, + libsystemd_network], + []], + + [['src/test/test-boot-timestamps.c'], + [], + [], + 'ENABLE_EFI'], + + [['src/test/test-unit-name.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-unit-file.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-utf8.c'], + [], + []], + + [['src/test/test-capability.c'], + [], + [libcap]], + + [['src/test/test-async.c'], + [], + []], + + [['src/test/test-locale-util.c'], + [], + []], + + [['src/test/test-copy.c'], + [libshared_static], + []], + + [['src/test/test-sigbus.c'], + [], + []], + + [['src/test/test-condition.c'], + [], + []], + + [['src/test/test-fdset.c'], + [], + []], + + [['src/test/test-fstab-util.c'], + [], + []], + + [['src/test/test-ratelimit.c'], + [], + []], + + [['src/test/test-util.c'], + [], + []], + + [['src/test/test-mount-util.c'], + [], + []], + + [['src/test/test-exec-util.c'], + [], + []], + + [['src/test/test-hexdecoct.c'], + [], + []], + + [['src/test/test-alloc-util.c'], + [], + []], + + [['src/test/test-xattr-util.c'], + [], + []], + + [['src/test/test-io-util.c'], + [], + []], + + [['src/test/test-glob-util.c'], + [], + []], + + [['src/test/test-fs-util.c'], + [], + []], + + [['src/test/test-proc-cmdline.c'], + [], + []], + + [['src/test/test-fd-util.c'], + [], + []], + + [['src/test/test-web-util.c'], + [], + []], + + [['src/test/test-cpu-set-util.c'], + [], + []], + + [['src/test/test-stat-util.c'], + [], + []], + + [['src/test/test-escape.c'], + [], + []], + + [['src/test/test-string-util.c'], + [], + []], + + [['src/test/test-extract-word.c'], + [], + []], + + [['src/test/test-parse-util.c'], + [], + []], + + [['src/test/test-user-util.c'], + [], + []], + + [['src/test/test-hostname-util.c'], + [], + []], + + [['src/test/test-process-util.c'], + [], + []], + + [['src/test/test-terminal-util.c'], + [], + []], + + [['src/test/test-path-lookup.c'], + [], + []], + + [['src/test/test-uid-range.c'], + [], + []], + + [['src/test/test-cap-list.c', + generated_gperf_headers], + [], + [libcap]], + + [['src/test/test-socket-util.c'], + [], + []], + + [['src/test/test-barrier.c'], + [], + []], + + [['src/test/test-tmpfiles.c'], + [], + []], + + [['src/test/test-namespace.c'], + [libcore, + libshared, + libudev], + [threads, + libblkid]], + + [['src/test/test-verbs.c'], + [], + []], + + [['src/test/test-install-root.c'], + [], + []], + + [['src/test/test-acl-util.c'], + [], + [], + 'HAVE_ACL'], + + [['src/test/test-seccomp.c'], + [], + [libseccomp], + 'HAVE_SECCOMP'], + + [['src/test/test-rlimit-util.c'], + [], + []], + + [['src/test/test-ask-password-api.c'], + [], + [], + '', 'manual'], + + [['src/test/test-dissect-image.c'], + [], + [libblkid], + '', 'manual'], + + [['src/test/test-signal-util.c'], + [], + []], + + [['src/test/test-selinux.c'], + [], + []], + + [['src/test/test-sizeof.c'], + [libbasic], + []], + + [['src/test/test-hashmap.c', + 'src/test/test-hashmap-plain.c', + test_hashmap_ordered_c], + [], + [], + '', 'timeout=90'], + + [['src/test/test-set.c'], + [], + []], + + [['src/test/test-bitmap.c'], + [], + []], + + [['src/test/test-xml.c'], + [], + []], + + [['src/test/test-list.c'], + [], + []], + + [['src/test/test-unaligned.c'], + [], + []], + + [['src/test/test-tables.c', + 'src/shared/test-tables.h', + 'src/journal/journald-server.c', + 'src/journal/journald-server.h'], + [libcore, + libjournal_core, + libudev_core, + libudev_internal, + libsystemd_network, + libshared], + [threads, + libseccomp, + libmount, + libxz, + liblz4, + libblkid], + '', '', [], libudev_core_includes], + + [['src/test/test-prioq.c'], + [], + []], + + [['src/test/test-fileio.c'], + [], + []], + + [['src/test/test-time.c'], + [], + []], + + [['src/test/test-clock.c'], + [], + []], + + [['src/test/test-architecture.c'], + [], + []], + + [['src/test/test-log.c'], + [], + []], + + [['src/test/test-ipcrm.c'], + [], + [], + '', 'unsafe'], + + [['src/test/test-btrfs.c'], + [], + [], + '', 'manual'], + + + [['src/test/test-firewall-util.c'], + [libfirewall, + libshared], + [], + 'HAVE_LIBIPTC'], + + [['src/test/test-netlink-manual.c'], + [], + [libkmod], + 'HAVE_KMOD', 'manual'], + + [['src/test/test-ellipsize.c'], + [], + []], + + [['src/test/test-date.c'], + [], + []], + + [['src/test/test-sleep.c'], + [], + []], + + [['src/test/test-replace-var.c'], + [], + []], + + [['src/test/test-calendarspec.c'], + [], + []], + + [['src/test/test-strip-tab-ansi.c'], + [], + []], + + [['src/test/test-daemon.c'], + [], + []], + + [['src/test/test-cgroup.c'], + [], + [], + '', 'manual'], + + + [['src/test/test-cgroup-mask.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-cgroup-util.c'], + [], + []], + + [['src/test/test-env-util.c'], + [], + []], + + [['src/test/test-strbuf.c'], + [], + []], + + [['src/test/test-strv.c'], + [], + []], + + [['src/test/test-path-util.c'], + [], + []], + + [['src/test/test-path.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-execute.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-siphash24.c'], + [], + []], + + [['src/test/test-strxcpyx.c'], + [], + []], + + [['src/test/test-install.c'], + [libcore, + libshared], + [], + '', 'manual'], + + [['src/test/test-watchdog.c'], + [], + []], + + [['src/test/test-sched-prio.c'], + [libcore, + libshared, + libudev], + [threads, + librt, + libseccomp, + libselinux, + libmount, + libblkid]], + + [['src/test/test-conf-files.c'], + [], + []], + + [['src/test/test-conf-parser.c'], + [], + []], + + [['src/test/test-af-list.c', + generated_gperf_headers], + [], + []], + + [['src/test/test-arphrd-list.c', + generated_gperf_headers], + [], + []], + + [['src/test/test-journal-importer.c'], + [], + []], + + [['src/test/test-libudev.c'], + [libshared, + libudev], + []], + + [['src/test/test-udev.c'], + [libudev_core, + libudev_internal, + libsystemd_network, + libshared], + [threads, + librt, + libblkid, + libkmod, + libacl], + '', 'manual'], + + [['src/test/test-id128.c'], + [], + []], + + [['src/test/test-hash.c'], + [], + []], + + [['src/test/test-nss.c'], + [], + [libdl], + '', 'manual'], +] ############################################################ # define some tests here, because the link_with deps were not defined earlier tests += [ - [['src/journal/test-journal.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-journal-send.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-journal-syslog.c'], - [libjournal_core, - libshared, - libudev], - [threads, - libxz, - liblz4, - libselinux]], - - [['src/journal/test-journal-match.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-journal-enum.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-journal-stream.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-journal-flush.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-journal-init.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-journal-verify.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-journal-interleaving.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-mmap-cache.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4]], - - [['src/journal/test-catalog.c'], - [libjournal_core, - libshared], - [threads, - libxz, - liblz4], - '', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)], - - [['src/journal/test-compress.c'], - [libjournal_core, - libshared], - [liblz4, - libxz]], - - [['src/journal/test-compress-benchmark.c'], - [libjournal_core, - libshared], - [liblz4, - libxz], - '', 'timeout=90'], - - [['src/journal/test-audit-type.c'], - [libjournal_core, - libshared], - [liblz4, - libxz]], - ] + [['src/journal/test-journal.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-journal-send.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-journal-syslog.c'], + [libjournal_core, + libshared, + libudev], + [threads, + libxz, + liblz4, + libselinux]], + + [['src/journal/test-journal-match.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-journal-enum.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-journal-stream.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-journal-flush.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-journal-init.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-journal-verify.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-journal-interleaving.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-mmap-cache.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4]], + + [['src/journal/test-catalog.c'], + [libjournal_core, + libshared], + [threads, + libxz, + liblz4], + '', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)], + + [['src/journal/test-compress.c'], + [libjournal_core, + libshared], + [liblz4, + libxz]], + + [['src/journal/test-compress-benchmark.c'], + [libjournal_core, + libshared], + [liblz4, + libxz], + '', 'timeout=90'], + + [['src/journal/test-audit-type.c'], + [libjournal_core, + libshared], + [liblz4, + libxz]], +] ############################################################ tests += [ - [['src/libsystemd/sd-bus/test-bus-marshal.c'], - [], - [threads, - libglib, - libgobject, - libgio, - libdbus]], - - [['src/libsystemd/sd-bus/test-bus-signature.c'], - [], - [threads]], - - [['src/libsystemd/sd-bus/test-bus-chat.c'], - [], - [threads]], - - [['src/libsystemd/sd-bus/test-bus-cleanup.c'], - [], - [threads, - libseccomp]], - - [['src/libsystemd/sd-bus/test-bus-error.c'], - [libshared_static, - libsystemd_internal], - []], - - [['src/libsystemd/sd-bus/test-bus-track.c'], - [], - [libseccomp]], - - [['src/libsystemd/sd-bus/test-bus-server.c'], - [], - [threads]], - - [['src/libsystemd/sd-bus/test-bus-objects.c'], - [], - [threads]], - - [['src/libsystemd/sd-bus/test-bus-gvariant.c'], - [], - [libglib, - libgobject, - libgio]], - - [['src/libsystemd/sd-bus/test-bus-creds.c'], - [], - []], - - [['src/libsystemd/sd-bus/test-bus-match.c'], - [], - []], - - [['src/libsystemd/sd-bus/test-bus-kernel.c'], - [], - []], - - [['src/libsystemd/sd-bus/test-bus-kernel-bloom.c'], - [], - []], - - [['src/libsystemd/sd-bus/test-bus-benchmark.c'], - [], - [threads]], - - [['src/libsystemd/sd-bus/test-bus-zero-copy.c'], - [], - []], - - [['src/libsystemd/sd-bus/test-bus-introspect.c'], - [], - []], - - [['src/libsystemd/sd-event/test-event.c'], - [], - []], - - [['src/libsystemd/sd-netlink/test-netlink.c'], - [], - []], - - [['src/libsystemd/sd-netlink/test-local-addresses.c'], - [], - []], - - [['src/libsystemd/sd-resolve/test-resolve.c'], - [], - [threads]], - - [['src/libsystemd/sd-login/test-login.c'], - [], - [], - '', 'manual'], + [['src/libsystemd/sd-bus/test-bus-marshal.c'], + [], + [threads, + libglib, + libgobject, + libgio, + libdbus]], + + [['src/libsystemd/sd-bus/test-bus-signature.c'], + [], + [threads]], + + [['src/libsystemd/sd-bus/test-bus-chat.c'], + [], + [threads]], + + [['src/libsystemd/sd-bus/test-bus-cleanup.c'], + [], + [threads, + libseccomp]], + + [['src/libsystemd/sd-bus/test-bus-error.c'], + [libshared_static, + libsystemd_internal], + []], + + [['src/libsystemd/sd-bus/test-bus-track.c'], + [], + [libseccomp]], + + [['src/libsystemd/sd-bus/test-bus-server.c'], + [], + [threads]], + + [['src/libsystemd/sd-bus/test-bus-objects.c'], + [], + [threads]], + + [['src/libsystemd/sd-bus/test-bus-gvariant.c'], + [], + [libglib, + libgobject, + libgio]], + + [['src/libsystemd/sd-bus/test-bus-creds.c'], + [], + []], + + [['src/libsystemd/sd-bus/test-bus-match.c'], + [], + []], + + [['src/libsystemd/sd-bus/test-bus-kernel.c'], + [], + []], + + [['src/libsystemd/sd-bus/test-bus-kernel-bloom.c'], + [], + []], + + [['src/libsystemd/sd-bus/test-bus-benchmark.c'], + [], + [threads]], + + [['src/libsystemd/sd-bus/test-bus-zero-copy.c'], + [], + []], + + [['src/libsystemd/sd-bus/test-bus-introspect.c'], + [], + []], + + [['src/libsystemd/sd-event/test-event.c'], + [], + []], + + [['src/libsystemd/sd-netlink/test-netlink.c'], + [], + []], + + [['src/libsystemd/sd-netlink/test-local-addresses.c'], + [], + []], + + [['src/libsystemd/sd-resolve/test-resolve.c'], + [], + [threads]], + + [['src/libsystemd/sd-login/test-login.c'], + [], + [], + '', 'manual'], ] ############################################################ tests += [ - [['src/libsystemd-network/test-dhcp-option.c', - 'src/libsystemd-network/dhcp-protocol.h', - 'src/libsystemd-network/dhcp-internal.h'], - [libshared, - libsystemd_network], - []], - - [['src/libsystemd-network/test-dhcp-client.c', - 'src/libsystemd-network/dhcp-protocol.h', - 'src/libsystemd-network/dhcp-internal.h', - 'src/systemd/sd-dhcp-client.h'], - [libshared, - libsystemd_network, - libudev], - []], - - [['src/libsystemd-network/test-dhcp-server.c'], - [libshared, - libsystemd_network], - []], - - [['src/libsystemd-network/test-ipv4ll.c', - 'src/libsystemd-network/arp-util.h', - 'src/systemd/sd-ipv4ll.h'], - [libshared, - libsystemd_network], - []], - - [['src/libsystemd-network/test-ipv4ll-manual.c', - 'src/systemd/sd-ipv4ll.h'], - [libshared, - libsystemd_network], - [], - '', 'manual'], - - [['src/libsystemd-network/test-acd.c', - 'src/systemd/sd-ipv4acd.h'], - [libshared, - libsystemd_network], - [], - '', 'manual'], - - [['src/libsystemd-network/test-ndisc-rs.c', - 'src/libsystemd-network/dhcp-identifier.h', - 'src/libsystemd-network/dhcp-identifier.c', - 'src/libsystemd-network/icmp6-util.h', - 'src/systemd/sd-dhcp6-client.h', - 'src/systemd/sd-ndisc.h'], - [libshared, - libsystemd_network, - libudev], - []], - - [['src/libsystemd-network/test-dhcp6-client.c', - 'src/libsystemd-network/dhcp-identifier.h', - 'src/libsystemd-network/dhcp-identifier.c', - 'src/libsystemd-network/dhcp6-internal.h', - 'src/systemd/sd-dhcp6-client.h'], - [libshared, - libsystemd_network, - libudev], - []], - - [['src/libsystemd-network/test-lldp.c'], - [libshared, - libsystemd_network], - []], - ] + [['src/libsystemd-network/test-dhcp-option.c', + 'src/libsystemd-network/dhcp-protocol.h', + 'src/libsystemd-network/dhcp-internal.h'], + [libshared, + libsystemd_network], + []], + + [['src/libsystemd-network/test-dhcp-client.c', + 'src/libsystemd-network/dhcp-protocol.h', + 'src/libsystemd-network/dhcp-internal.h', + 'src/systemd/sd-dhcp-client.h'], + [libshared, + libsystemd_network, + libudev], + []], + + [['src/libsystemd-network/test-dhcp-server.c'], + [libshared, + libsystemd_network], + []], + + [['src/libsystemd-network/test-ipv4ll.c', + 'src/libsystemd-network/arp-util.h', + 'src/systemd/sd-ipv4ll.h'], + [libshared, + libsystemd_network], + []], + + [['src/libsystemd-network/test-ipv4ll-manual.c', + 'src/systemd/sd-ipv4ll.h'], + [libshared, + libsystemd_network], + [], + '', 'manual'], + + [['src/libsystemd-network/test-acd.c', + 'src/systemd/sd-ipv4acd.h'], + [libshared, + libsystemd_network], + [], + '', 'manual'], + + [['src/libsystemd-network/test-ndisc-rs.c', + 'src/libsystemd-network/dhcp-identifier.h', + 'src/libsystemd-network/dhcp-identifier.c', + 'src/libsystemd-network/icmp6-util.h', + 'src/systemd/sd-dhcp6-client.h', + 'src/systemd/sd-ndisc.h'], + [libshared, + libsystemd_network, + libudev], + []], + + [['src/libsystemd-network/test-dhcp6-client.c', + 'src/libsystemd-network/dhcp-identifier.h', + 'src/libsystemd-network/dhcp-identifier.c', + 'src/libsystemd-network/dhcp6-internal.h', + 'src/systemd/sd-dhcp6-client.h'], + [libshared, + libsystemd_network, + libudev], + []], + + [['src/libsystemd-network/test-lldp.c'], + [libshared, + libsystemd_network], + []], +] ############################################################ tests += [ - [['src/login/test-login-shared.c'], - [], - []], - - [['src/login/test-inhibit.c'], - [], - [], - '', 'manual'], - - [['src/login/test-login-tables.c'], - [liblogind_core, - libshared, - libudev], - [threads]], - ] + [['src/login/test-login-shared.c'], + [], + []], + + [['src/login/test-inhibit.c'], + [], + [], + '', 'manual'], + + [['src/login/test-login-tables.c'], + [liblogind_core, + libshared, + libudev], + [threads]], +] diff --git a/src/timedate/meson.build b/src/timedate/meson.build index 52518a87e4..2e74245f66 100644 --- a/src/timedate/meson.build +++ b/src/timedate/meson.build @@ -1,16 +1,14 @@ -# -*- mode: meson -*- - if conf.get('ENABLE_TIMEDATED', 0) == 1 - install_data('org.freedesktop.timedate1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.timedate1.service', - install_dir : dbussystemservicedir) + install_data('org.freedesktop.timedate1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.timedate1.service', + install_dir : dbussystemservicedir) - custom_target( - 'org.freedesktop.timedate1.policy', - input : 'org.freedesktop.timedate1.policy.in', - output : 'org.freedesktop.timedate1.policy', - command : intltool_command, - install : install_polkit, - install_dir : polkitpolicydir) + custom_target( + 'org.freedesktop.timedate1.policy', + input : 'org.freedesktop.timedate1.policy.in', + output : 'org.freedesktop.timedate1.policy', + command : intltool_command, + install : install_polkit, + install_dir : polkitpolicydir) endif diff --git a/src/timesync/meson.build b/src/timesync/meson.build index 0d0381305f..dece39ea10 100644 --- a/src/timesync/meson.build +++ b/src/timesync/meson.build @@ -1,28 +1,26 @@ -# -*- mode: meson -*- - systemd_timesyncd_sources = files(''' - timesyncd.c - timesyncd-manager.c - timesyncd-manager.h - timesyncd-conf.c - timesyncd-conf.h - timesyncd-server.c - timesyncd-server.h + timesyncd.c + timesyncd-manager.c + timesyncd-manager.h + timesyncd-conf.c + timesyncd-conf.h + timesyncd-server.c + timesyncd-server.h '''.split()) timesyncd_gperf_c = custom_target( - 'timesyncd-gperf.c', - input : 'timesyncd-gperf.gperf', - output : 'timesyncd-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + 'timesyncd-gperf.c', + input : 'timesyncd-gperf.gperf', + output : 'timesyncd-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) systemd_timesyncd_sources += [timesyncd_gperf_c] if conf.get('ENABLE_TIMESYNCD', 0) == 1 - timesyncd_conf = configure_file( - input : 'timesyncd.conf.in', - output : 'timesyncd.conf', - configuration : substs) - install_data(timesyncd_conf, - install_dir : pkgsysconfdir) + timesyncd_conf = configure_file( + input : 'timesyncd.conf.in', + output : 'timesyncd.conf', + configuration : substs) + install_data(timesyncd_conf, + install_dir : pkgsysconfdir) endif diff --git a/src/udev/meson.build b/src/udev/meson.build index 1eac8754eb..e3d3fa2462 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -1,120 +1,118 @@ -# -*- mode: meson -*- - udevadm_sources = files(''' - udevadm.c - udevadm-info.c - udevadm-control.c - udevadm-monitor.c - udevadm-hwdb.c - udevadm-settle.c - udevadm-trigger.c - udevadm-test.c - udevadm-test-builtin.c - udevadm-util.c - udevadm-util.h + udevadm.c + udevadm-info.c + udevadm-control.c + udevadm-monitor.c + udevadm-hwdb.c + udevadm-settle.c + udevadm-trigger.c + udevadm-test.c + udevadm-test-builtin.c + udevadm-util.c + udevadm-util.h '''.split()) systemd_udevd_sources = files('udevd.c') libudev_core_sources = ''' - udev.h - udev-event.c - udev-watch.c - udev-node.c - udev-rules.c - udev-ctrl.c - udev-builtin.c - udev-builtin-btrfs.c - udev-builtin-hwdb.c - udev-builtin-input_id.c - udev-builtin-keyboard.c - udev-builtin-net_id.c - udev-builtin-net_setup_link.c - udev-builtin-path_id.c - udev-builtin-usb_id.c - net/link-config.c - net/link-config.h - net/ethtool-util.c - net/ethtool-util.h + udev.h + udev-event.c + udev-watch.c + udev-node.c + udev-rules.c + udev-ctrl.c + udev-builtin.c + udev-builtin-btrfs.c + udev-builtin-hwdb.c + udev-builtin-input_id.c + udev-builtin-keyboard.c + udev-builtin-net_id.c + udev-builtin-net_setup_link.c + udev-builtin-path_id.c + udev-builtin-usb_id.c + net/link-config.c + net/link-config.h + net/ethtool-util.c + net/ethtool-util.h '''.split() if conf.get('HAVE_KMOD', 0) == 1 - libudev_core_sources += ['udev-builtin-kmod.c'] + libudev_core_sources += ['udev-builtin-kmod.c'] endif if conf.get('HAVE_BLKID', 0) == 1 - libudev_core_sources += ['udev-builtin-blkid.c'] + libudev_core_sources += ['udev-builtin-blkid.c'] endif if conf.get('HAVE_ACL', 0) == 1 - libudev_core_sources += ['udev-builtin-uaccess.c', - logind_acl_c, - sd_login_c] + libudev_core_sources += ['udev-builtin-uaccess.c', + logind_acl_c, + sd_login_c] endif ############################################################ generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh') keyboard_keys_list_txt = custom_target( - 'keyboard-keys-list.txt', - output : 'keyboard-keys-list.txt', - command : [generate_keyboard_keys_list, cpp], - capture : true) + 'keyboard-keys-list.txt', + output : 'keyboard-keys-list.txt', + command : [generate_keyboard_keys_list, cpp], + capture : true) fname = 'keyboard-keys-from-name.gperf' gperf_file = custom_target( - fname, - input : keyboard_keys_list_txt, - output : fname, - command : [generate_gperfs, 'key', '', '@INPUT@'], - capture : true) + fname, + input : keyboard_keys_list_txt, + output : fname, + command : [generate_gperfs, 'key', '', '@INPUT@'], + capture : true) fname = 'keyboard-keys-from-name.h' keyboard_keys_from_name_h = custom_target( - fname, - input : gperf_file, - output : fname, - command : [gperf, - '-L', 'ANSI-C', '-t', '--ignore-case', - '-N', 'keyboard_lookup_key', - '-H', 'hash_key_name', - '-p', '-C', - '@INPUT@'], - capture : true) + fname, + input : gperf_file, + output : fname, + command : [gperf, + '-L', 'ANSI-C', '-t', '--ignore-case', + '-N', 'keyboard_lookup_key', + '-H', 'hash_key_name', + '-p', '-C', + '@INPUT@'], + capture : true) ############################################################ link_config_gperf_c = custom_target( - 'link-config-gperf.c', - input : 'net/link-config-gperf.gperf', - output : 'link-config-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + 'link-config-gperf.c', + input : 'net/link-config-gperf.gperf', + output : 'link-config-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) ############################################################ if get_option('link-udev-shared') - libudev_link_with = [libshared] - rpath = rootlibexecdir + libudev_link_with = [libshared] + rpath = rootlibexecdir else - libudev_link_with = [libshared_static, - libsystemd_internal] - rpath = '' + libudev_link_with = [libshared_static, + libsystemd_internal] + rpath = '' endif libudev_internal = static_library( - 'udev', - libudev_sources, - include_directories : includes, - link_with : libudev_link_with) + 'udev', + libudev_sources, + include_directories : includes, + link_with : libudev_link_with) libudev_core_includes = [includes, include_directories('net')] libudev_core = static_library( - 'udev-core', - libudev_core_sources, - link_config_gperf_c, - keyboard_keys_from_name_h, - include_directories : libudev_core_includes, - link_with : libudev_link_with) + 'udev-core', + libudev_core_sources, + link_config_gperf_c, + keyboard_keys_from_name_h, + include_directories : libudev_core_includes, + link_with : libudev_link_with) foreach prog : [['ata_id/ata_id.c'], ['cdrom_id/cdrom_id.c'], @@ -128,22 +126,22 @@ foreach prog : [['ata_id/ata_id.c'], 'mtd_probe/mtd_probe.h', 'mtd_probe/probe_smartmedia.c']] - executable(prog[0].split('/')[0], - prog, - include_directories : includes, - link_with : [libudev_internal], - install_rpath : rpath, - install : true, - install_dir : udevlibexecdir) + executable(prog[0].split('/')[0], + prog, + include_directories : includes, + link_with : [libudev_internal], + install_rpath : rpath, + install : true, + install_dir : udevlibexecdir) endforeach install_data('udev.conf', install_dir : join_paths(sysconfdir, 'udev')) udev_pc = configure_file( - input : 'udev.pc.in', - output : 'udev.pc', - configuration : substs) + input : 'udev.pc.in', + output : 'udev.pc', + configuration : substs) install_data(udev_pc, install_dir : pkgconfigdatadir) diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build index f2aa6daf88..ac382e3daa 100644 --- a/src/vconsole/meson.build +++ b/src/vconsole/meson.build @@ -1,10 +1,8 @@ -# -*- mode: meson -*- - if conf.get('ENABLE_VCONSOLE', 0) == 1 - vconsole_rules = configure_file( - input : '90-vconsole.rules.in', - output : '90-vconsole.rules', - configuration : substs) - install_data(vconsole_rules, - install_dir : udevrulesdir) + vconsole_rules = configure_file( + input : '90-vconsole.rules.in', + output : '90-vconsole.rules', + configuration : substs) + install_data(vconsole_rules, + install_dir : udevrulesdir) endif diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build index 826542debc..1205c3a122 100644 --- a/sysctl.d/meson.build +++ b/sysctl.d/meson.build @@ -1,22 +1,20 @@ -# -*- mode: meson -*- - install_data( - '50-default.conf', - install_dir : sysctldir) + '50-default.conf', + install_dir : sysctldir) in_files = [] if conf.get('ENABLE_COREDUMP', 0) == 1 - in_files += ['50-coredump.conf'] + in_files += ['50-coredump.conf'] endif foreach file : in_files - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - install_data(gen, - install_dir : sysctldir) + gen = configure_file( + input : file + '.in', + output : file, + configuration : substs) + install_data(gen, + install_dir : sysctldir) endforeach meson.add_install_script('sh', '-c', diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build index 92b4128f8b..8e126f289a 100644 --- a/sysusers.d/meson.build +++ b/sysusers.d/meson.build @@ -1,33 +1,31 @@ -# -*- mode: meson -*- - in_files = ['basic.conf'] enable_sysusers = conf.get('ENABLE_SYSUSERS', 0) == 1 foreach file : in_files - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - if enable_sysusers - install_data(gen, - install_dir : sysusersdir) - endif + gen = configure_file( + input : file + '.in', + output : file, + configuration : substs) + if enable_sysusers + install_data(gen, + install_dir : sysusersdir) + endif endforeach m4_files = ['systemd.conf'] if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 - m4_files += ['systemd-remote.conf'] + m4_files += ['systemd-remote.conf'] endif foreach file : m4_files - custom_target( - 'sysusers.d/' + file, - input : file + '.m4', - output: file, - command : [m4, '-P'] + m4_defines + ['@INPUT@'], - capture : true, - install : enable_sysusers, - install_dir : sysusersdir) + custom_target( + 'sysusers.d/' + file, + input : file + '.m4', + output: file, + command : [m4, '-P'] + m4_defines + ['@INPUT@'], + capture : true, + install : enable_sysusers, + install_dir : sysusersdir) endforeach diff --git a/test/meson.build b/test/meson.build index 79446d0dad..5823976d10 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,166 +1,166 @@ test_data_files = ''' - a.service - basic.target - b.service - c.service - daughter.service - d.service - end.service - e.service - f.service - grandchild.service - g.service - hello-after-sleep.target - hello.service - h.service - parent-deep.slice - parent.slice - sched_idle_bad.service - sched_idle_ok.service - sched_rr_bad.service - sched_rr_change.service - sched_rr_ok.service - shutdown.target - sleep.service - sockets.target - son.service - sysinit.target - testsuite.target - timers.target - unstoppable.service - test-path/paths.target - test-path/basic.target - test-path/sysinit.target - test-path/path-changed.service - test-path/path-directorynotempty.service - test-path/path-existsglob.service - test-path/path-exists.service - test-path/path-makedirectory.service - test-path/path-modified.service - test-path/path-mycustomunit.service - test-path/path-service.service - test-path/path-changed.path - test-path/path-directorynotempty.path - test-path/path-existsglob.path - test-path/path-exists.path - test-path/path-makedirectory.path - test-path/path-modified.path - test-path/path-unit.path - test-execute/exec-environment-empty.service - test-execute/exec-environment-multiple.service - test-execute/exec-environment.service - test-execute/exec-passenvironment-absent.service - test-execute/exec-passenvironment-empty.service - test-execute/exec-passenvironment-repeated.service - test-execute/exec-passenvironment.service - test-execute/exec-group.service - test-execute/exec-group-nfsnobody.service - test-execute/exec-supplementarygroups.service - test-execute/exec-supplementarygroups-single-group.service - test-execute/exec-supplementarygroups-single-group-user.service - test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service - test-execute/exec-supplementarygroups-multiple-groups-withgid.service - test-execute/exec-supplementarygroups-multiple-groups-withuid.service - test-execute/exec-dynamicuser-fixeduser.service - test-execute/exec-dynamicuser-fixeduser-one-supplementarygroup.service - test-execute/exec-dynamicuser-supplementarygroups.service - test-execute/exec-ignoresigpipe-no.service - test-execute/exec-ignoresigpipe-yes.service - test-execute/exec-personality-x86-64.service - test-execute/exec-personality-x86.service - test-execute/exec-personality-s390.service - test-execute/exec-personality-ppc64.service - test-execute/exec-personality-ppc64le.service - test-execute/exec-personality-aarch64.service - test-execute/exec-privatedevices-no.service - test-execute/exec-privatedevices-yes.service - test-execute/exec-privatedevices-no-capability-mknod.service - test-execute/exec-privatedevices-yes-capability-mknod.service - test-execute/exec-protectkernelmodules-no-capabilities.service - test-execute/exec-protectkernelmodules-yes-capabilities.service - test-execute/exec-protectkernelmodules-yes-mount-propagation.service - test-execute/exec-privatetmp-no.service - test-execute/exec-privatetmp-yes.service - test-execute/exec-readonlypaths.service - test-execute/exec-readonlypaths-mount-propagation.service - test-execute/exec-readwritepaths-mount-propagation.service - test-execute/exec-inaccessiblepaths-mount-propagation.service - test-execute/exec-spec-interpolation.service - test-execute/exec-systemcallerrornumber.service - test-execute/exec-systemcallfilter-failing2.service - test-execute/exec-systemcallfilter-failing.service - test-execute/exec-systemcallfilter-not-failing2.service - test-execute/exec-systemcallfilter-not-failing.service - test-execute/exec-systemcallfilter-system-user.service - test-execute/exec-systemcallfilter-system-user-nfsnobody.service - test-execute/exec-user.service - test-execute/exec-user-nfsnobody.service - test-execute/exec-workingdirectory.service - test-execute/exec-umask-0177.service - test-execute/exec-umask-default.service - test-execute/exec-privatenetwork-yes.service - test-execute/exec-environmentfile.service - test-execute/exec-oomscoreadjust-positive.service - test-execute/exec-oomscoreadjust-negative.service - test-execute/exec-ioschedulingclass-best-effort.service - test-execute/exec-ioschedulingclass-idle.service - test-execute/exec-ioschedulingclass-none.service - test-execute/exec-ioschedulingclass-realtime.service - test-execute/exec-capabilityboundingset-invert.service - test-execute/exec-capabilityboundingset-merge.service - test-execute/exec-capabilityboundingset-reset.service - test-execute/exec-capabilityboundingset-simple.service - test-execute/exec-capabilityambientset.service - test-execute/exec-capabilityambientset-nfsnobody.service - test-execute/exec-capabilityambientset-merge.service - test-execute/exec-capabilityambientset-merge-nfsnobody.service - test-execute/exec-runtimedirectory.service - test-execute/exec-runtimedirectory-mode.service - test-execute/exec-runtimedirectory-owner.service - test-execute/exec-runtimedirectory-owner-nfsnobody.service - test-execute/exec-restrict-namespaces-no.service - test-execute/exec-restrict-namespaces-yes.service - test-execute/exec-restrict-namespaces-mnt.service - test-execute/exec-restrict-namespaces-mnt-blacklist.service - test-execute/exec-read-only-path-succeed.service - test-execute/exec-privatedevices-yes-capability-sys-rawio.service - test-execute/exec-privatedevices-no-capability-sys-rawio.service - bus-policy/hello.conf - bus-policy/methods.conf - bus-policy/ownerships.conf - bus-policy/signals.conf - bus-policy/check-own-rules.conf - bus-policy/many-rules.conf - bus-policy/test.conf - hwdb/10-bad.hwdb - journal-data/journal-1.txt - journal-data/journal-2.txt + a.service + basic.target + b.service + c.service + daughter.service + d.service + end.service + e.service + f.service + grandchild.service + g.service + hello-after-sleep.target + hello.service + h.service + parent-deep.slice + parent.slice + sched_idle_bad.service + sched_idle_ok.service + sched_rr_bad.service + sched_rr_change.service + sched_rr_ok.service + shutdown.target + sleep.service + sockets.target + son.service + sysinit.target + testsuite.target + timers.target + unstoppable.service + test-path/paths.target + test-path/basic.target + test-path/sysinit.target + test-path/path-changed.service + test-path/path-directorynotempty.service + test-path/path-existsglob.service + test-path/path-exists.service + test-path/path-makedirectory.service + test-path/path-modified.service + test-path/path-mycustomunit.service + test-path/path-service.service + test-path/path-changed.path + test-path/path-directorynotempty.path + test-path/path-existsglob.path + test-path/path-exists.path + test-path/path-makedirectory.path + test-path/path-modified.path + test-path/path-unit.path + test-execute/exec-environment-empty.service + test-execute/exec-environment-multiple.service + test-execute/exec-environment.service + test-execute/exec-passenvironment-absent.service + test-execute/exec-passenvironment-empty.service + test-execute/exec-passenvironment-repeated.service + test-execute/exec-passenvironment.service + test-execute/exec-group.service + test-execute/exec-group-nfsnobody.service + test-execute/exec-supplementarygroups.service + test-execute/exec-supplementarygroups-single-group.service + test-execute/exec-supplementarygroups-single-group-user.service + test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service + test-execute/exec-supplementarygroups-multiple-groups-withgid.service + test-execute/exec-supplementarygroups-multiple-groups-withuid.service + test-execute/exec-dynamicuser-fixeduser.service + test-execute/exec-dynamicuser-fixeduser-one-supplementarygroup.service + test-execute/exec-dynamicuser-supplementarygroups.service + test-execute/exec-ignoresigpipe-no.service + test-execute/exec-ignoresigpipe-yes.service + test-execute/exec-personality-x86-64.service + test-execute/exec-personality-x86.service + test-execute/exec-personality-s390.service + test-execute/exec-personality-ppc64.service + test-execute/exec-personality-ppc64le.service + test-execute/exec-personality-aarch64.service + test-execute/exec-privatedevices-no.service + test-execute/exec-privatedevices-yes.service + test-execute/exec-privatedevices-no-capability-mknod.service + test-execute/exec-privatedevices-yes-capability-mknod.service + test-execute/exec-protectkernelmodules-no-capabilities.service + test-execute/exec-protectkernelmodules-yes-capabilities.service + test-execute/exec-protectkernelmodules-yes-mount-propagation.service + test-execute/exec-privatetmp-no.service + test-execute/exec-privatetmp-yes.service + test-execute/exec-readonlypaths.service + test-execute/exec-readonlypaths-mount-propagation.service + test-execute/exec-readwritepaths-mount-propagation.service + test-execute/exec-inaccessiblepaths-mount-propagation.service + test-execute/exec-spec-interpolation.service + test-execute/exec-systemcallerrornumber.service + test-execute/exec-systemcallfilter-failing2.service + test-execute/exec-systemcallfilter-failing.service + test-execute/exec-systemcallfilter-not-failing2.service + test-execute/exec-systemcallfilter-not-failing.service + test-execute/exec-systemcallfilter-system-user.service + test-execute/exec-systemcallfilter-system-user-nfsnobody.service + test-execute/exec-user.service + test-execute/exec-user-nfsnobody.service + test-execute/exec-workingdirectory.service + test-execute/exec-umask-0177.service + test-execute/exec-umask-default.service + test-execute/exec-privatenetwork-yes.service + test-execute/exec-environmentfile.service + test-execute/exec-oomscoreadjust-positive.service + test-execute/exec-oomscoreadjust-negative.service + test-execute/exec-ioschedulingclass-best-effort.service + test-execute/exec-ioschedulingclass-idle.service + test-execute/exec-ioschedulingclass-none.service + test-execute/exec-ioschedulingclass-realtime.service + test-execute/exec-capabilityboundingset-invert.service + test-execute/exec-capabilityboundingset-merge.service + test-execute/exec-capabilityboundingset-reset.service + test-execute/exec-capabilityboundingset-simple.service + test-execute/exec-capabilityambientset.service + test-execute/exec-capabilityambientset-nfsnobody.service + test-execute/exec-capabilityambientset-merge.service + test-execute/exec-capabilityambientset-merge-nfsnobody.service + test-execute/exec-runtimedirectory.service + test-execute/exec-runtimedirectory-mode.service + test-execute/exec-runtimedirectory-owner.service + test-execute/exec-runtimedirectory-owner-nfsnobody.service + test-execute/exec-restrict-namespaces-no.service + test-execute/exec-restrict-namespaces-yes.service + test-execute/exec-restrict-namespaces-mnt.service + test-execute/exec-restrict-namespaces-mnt-blacklist.service + test-execute/exec-read-only-path-succeed.service + test-execute/exec-privatedevices-yes-capability-sys-rawio.service + test-execute/exec-privatedevices-no-capability-sys-rawio.service + bus-policy/hello.conf + bus-policy/methods.conf + bus-policy/ownerships.conf + bus-policy/signals.conf + bus-policy/check-own-rules.conf + bus-policy/many-rules.conf + bus-policy/test.conf + hwdb/10-bad.hwdb + journal-data/journal-1.txt + journal-data/journal-2.txt '''.split() if conf.get('ENABLE_RESOLVED', 0) == 1 - test_data_files += ''' - test-resolve/_openpgpkey.fedoraproject.org.pkts - test-resolve/fedoraproject.org.pkts - test-resolve/gandi.net.pkts - test-resolve/google.com.pkts - test-resolve/root.pkts - test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts - test-resolve/teamits.com.pkts - test-resolve/zbyszek@fedoraproject.org.pkts - test-resolve/_443._tcp.fedoraproject.org.pkts - test-resolve/kyhwana.org.pkts - test-resolve/fake-caa.pkts - '''.split() + test_data_files += ''' + test-resolve/_openpgpkey.fedoraproject.org.pkts + test-resolve/fedoraproject.org.pkts + test-resolve/gandi.net.pkts + test-resolve/google.com.pkts + test-resolve/root.pkts + test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts + test-resolve/teamits.com.pkts + test-resolve/zbyszek@fedoraproject.org.pkts + test-resolve/_443._tcp.fedoraproject.org.pkts + test-resolve/kyhwana.org.pkts + test-resolve/fake-caa.pkts + '''.split() endif if install_tests - foreach file : test_data_files - subdir = file.split('/')[0] - if subdir == file - subdir = '' - endif + foreach file : test_data_files + subdir = file.split('/')[0] + if subdir == file + subdir = '' + endif - install_data(file, - install_dir : testsdir + '/testdata/' + subdir) - endforeach + install_data(file, + install_dir : testsdir + '/testdata/' + subdir) + endforeach endif diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index eebdbb9501..dfbe04a976 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -1,5 +1,3 @@ -# -*- mode: meson -*- - enable_tmpfiles = conf.get('ENABLE_TMPFILES', 0) == 1 tmpfiles = [['home.conf', ''], @@ -14,31 +12,32 @@ tmpfiles = [['home.conf', ''], ] foreach pair : tmpfiles - if not enable_tmpfiles - # do nothing - elif pair[1] == '' or conf.get(pair[1], 0) == 1 - install_data(pair[0], install_dir : tmpfilesdir) - else - message('Not installing tmpfiles.d/@0@ because @1@ is @2@'.format( - pair[0], pair[1], conf.get(pair[1], 0))) - endif + if not enable_tmpfiles + # do nothing + elif pair[1] == '' or conf.get(pair[1], 0) == 1 + install_data(pair[0], install_dir : tmpfilesdir) + else + message('Not installing tmpfiles.d/@0@ because @1@ is @2@' + .format(pair[0], pair[1], conf.get(pair[1], 0))) + endif endforeach m4_files = ['etc.conf', 'systemd.conf'] foreach file : m4_files - custom_target( - 'tmpfiles.d/' + file, - input : file + '.m4', - output: file, - command : [m4, '-P'] + m4_defines + ['@INPUT@'], - capture : true, - install : enable_tmpfiles, - install_dir : tmpfilesdir) + custom_target( + 'tmpfiles.d/' + file, + input : file + '.m4', + output: file, + command : [m4, '-P'] + m4_defines + ['@INPUT@'], + capture : true, + install : enable_tmpfiles, + install_dir : tmpfilesdir) endforeach if enable_tmpfiles - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d'))) + meson.add_install_script( + 'sh', '-c', + mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d'))) endif diff --git a/units/meson.build b/units/meson.build index 37903e45c0..58d9e2b28f 100644 --- a/units/meson.build +++ b/units/meson.build @@ -1,313 +1,312 @@ -# -*- mode: meson -*- - units = [ - ['basic.target', ''], - ['bluetooth.target', ''], - ['cryptsetup-pre.target', 'HAVE_LIBCRYPTSETUP'], - ['cryptsetup.target', 'HAVE_LIBCRYPTSETUP', - 'sysinit.target.wants/'], - ['dev-hugepages.mount', '', - 'sysinit.target.wants/'], - ['dev-mqueue.mount', '', - 'sysinit.target.wants/'], - ['emergency.target', ''], - ['exit.target', ''], - ['final.target', ''], - ['getty.target', '', - 'multi-user.target.wants/'], - ['graphical.target', '', - 'runlevel5.target default.target'], - ['halt.target', ''], - ['hibernate.target', 'ENABLE_HIBERNATE'], - ['hybrid-sleep.target', 'ENABLE_HIBERNATE'], - ['initrd-fs.target', ''], - ['initrd-root-device.target', ''], - ['initrd-root-fs.target', ''], - ['initrd-switch-root.target', ''], - ['initrd.target', ''], - ['kexec.target', ''], - ['ldconfig.service', 'ENABLE_LDCONFIG', - 'sysinit.target.wants/'], - ['local-fs-pre.target', ''], - ['local-fs.target', ''], - ['machine.slice', 'ENABLE_MACHINED'], - ['machines.target', 'ENABLE_MACHINED', - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], - ['multi-user.target', '', - 'runlevel2.target runlevel3.target runlevel4.target'], - ['network-online.target', ''], - ['network-pre.target', ''], - ['network.target', ''], - ['nss-lookup.target', ''], - ['nss-user-lookup.target', ''], - ['paths.target', ''], - ['poweroff.target', '', - 'runlevel0.target'], - ['printer.target', ''], - ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT', - 'sysinit.target.wants/'], - ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], - ['reboot.target', '', - 'runlevel6.target ctrl-alt-del.target'], - ['remote-fs-pre.target', ''], - ['remote-fs.target', '', - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], - ['rescue.target', '', - 'runlevel1.target'], - ['rpcbind.target', ''], - ['shutdown.target', ''], - ['sigpwr.target', ''], - ['sleep.target', ''], - ['slices.target', ''], - ['smartcard.target', ''], - ['sockets.target', ''], - ['sound.target', ''], - ['suspend.target', ''], - ['swap.target', ''], - ['sys-fs-fuse-connections.mount', '', - 'sysinit.target.wants/'], - ['sys-kernel-config.mount', '', - 'sysinit.target.wants/'], - ['sys-kernel-debug.mount', '', - 'sysinit.target.wants/'], - ['sysinit.target', ''], - ['syslog.socket', ''], - ['system-update.target', ''], - ['system.slice', ''], - ['systemd-ask-password-console.path', '', - 'sysinit.target.wants/'], - ['systemd-ask-password-wall.path', '', - 'multi-user.target.wants/'], - ['systemd-coredump.socket', 'ENABLE_COREDUMP', - 'sockets.target.wants/'], - ['systemd-initctl.socket', '', - 'sockets.target.wants/'], - ['systemd-journal-gatewayd.socket', ''], - ['systemd-journal-remote.socket', ''], - ['systemd-journald-audit.socket', '', - 'sockets.target.wants/'], - ['systemd-journald-dev-log.socket', '', - 'sockets.target.wants/'], - ['systemd-journald.socket', '', - 'sockets.target.wants/'], - ['systemd-networkd.socket', '', - join_paths(pkgsysconfdir, 'system/sockets.target.wants/')], - ['systemd-rfkill.socket', 'ENABLE_RFKILL'], - ['systemd-tmpfiles-clean.timer', '', - 'timers.target.wants/'], - ['systemd-udevd-control.socket', '', - 'sockets.target.wants/'], - ['systemd-udevd-kernel.socket', '', - 'sockets.target.wants/'], - ['time-sync.target', ''], - ['timers.target', ''], - ['umount.target', ''], - ['user.slice', ''], - ['var-lib-machines.mount', '', - 'local-fs.target.wants/'], + ['basic.target', ''], + ['bluetooth.target', ''], + ['cryptsetup-pre.target', 'HAVE_LIBCRYPTSETUP'], + ['cryptsetup.target', 'HAVE_LIBCRYPTSETUP', + 'sysinit.target.wants/'], + ['dev-hugepages.mount', '', + 'sysinit.target.wants/'], + ['dev-mqueue.mount', '', + 'sysinit.target.wants/'], + ['emergency.target', ''], + ['exit.target', ''], + ['final.target', ''], + ['getty.target', '', + 'multi-user.target.wants/'], + ['graphical.target', '', + 'runlevel5.target default.target'], + ['halt.target', ''], + ['hibernate.target', 'ENABLE_HIBERNATE'], + ['hybrid-sleep.target', 'ENABLE_HIBERNATE'], + ['initrd-fs.target', ''], + ['initrd-root-device.target', ''], + ['initrd-root-fs.target', ''], + ['initrd-switch-root.target', ''], + ['initrd.target', ''], + ['kexec.target', ''], + ['ldconfig.service', 'ENABLE_LDCONFIG', + 'sysinit.target.wants/'], + ['local-fs-pre.target', ''], + ['local-fs.target', ''], + ['machine.slice', 'ENABLE_MACHINED'], + ['machines.target', 'ENABLE_MACHINED', + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['multi-user.target', '', + 'runlevel2.target runlevel3.target runlevel4.target'], + ['network-online.target', ''], + ['network-pre.target', ''], + ['network.target', ''], + ['nss-lookup.target', ''], + ['nss-user-lookup.target', ''], + ['paths.target', ''], + ['poweroff.target', '', + 'runlevel0.target'], + ['printer.target', ''], + ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT', + 'sysinit.target.wants/'], + ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], + ['reboot.target', '', + 'runlevel6.target ctrl-alt-del.target'], + ['remote-fs-pre.target', ''], + ['remote-fs.target', '', + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['rescue.target', '', + 'runlevel1.target'], + ['rpcbind.target', ''], + ['shutdown.target', ''], + ['sigpwr.target', ''], + ['sleep.target', ''], + ['slices.target', ''], + ['smartcard.target', ''], + ['sockets.target', ''], + ['sound.target', ''], + ['suspend.target', ''], + ['swap.target', ''], + ['sys-fs-fuse-connections.mount', '', + 'sysinit.target.wants/'], + ['sys-kernel-config.mount', '', + 'sysinit.target.wants/'], + ['sys-kernel-debug.mount', '', + 'sysinit.target.wants/'], + ['sysinit.target', ''], + ['syslog.socket', ''], + ['system-update.target', ''], + ['system.slice', ''], + ['systemd-ask-password-console.path', '', + 'sysinit.target.wants/'], + ['systemd-ask-password-wall.path', '', + 'multi-user.target.wants/'], + ['systemd-coredump.socket', 'ENABLE_COREDUMP', + 'sockets.target.wants/'], + ['systemd-initctl.socket', '', + 'sockets.target.wants/'], + ['systemd-journal-gatewayd.socket', ''], + ['systemd-journal-remote.socket', ''], + ['systemd-journald-audit.socket', '', + 'sockets.target.wants/'], + ['systemd-journald-dev-log.socket', '', + 'sockets.target.wants/'], + ['systemd-journald.socket', '', + 'sockets.target.wants/'], + ['systemd-networkd.socket', '', + join_paths(pkgsysconfdir, 'system/sockets.target.wants/')], + ['systemd-rfkill.socket', 'ENABLE_RFKILL'], + ['systemd-tmpfiles-clean.timer', '', + 'timers.target.wants/'], + ['systemd-udevd-control.socket', '', + 'sockets.target.wants/'], + ['systemd-udevd-kernel.socket', '', + 'sockets.target.wants/'], + ['time-sync.target', ''], + ['timers.target', ''], + ['umount.target', ''], + ['user.slice', ''], + ['var-lib-machines.mount', '', + 'local-fs.target.wants/'], ] in_units = [ - ['debug-shell.service', ''], - ['emergency.service', ''], - ['halt-local.service', 'HAVE_SYSV_COMPAT'], - ['initrd-cleanup.service', ''], - ['initrd-parse-etc.service', ''], - ['initrd-switch-root.service', ''], - ['initrd-udevadm-cleanup-db.service', ''], - ['kmod-static-nodes.service', 'HAVE_KMOD ENABLE_TMPFILES', - 'sysinit.target.wants/'], - ['quotaon.service', 'ENABLE_QUOTACHECK'], - ['rc-local.service', 'HAVE_SYSV_COMPAT'], - ['rescue.service', ''], - ['system-update-cleanup.service', ''], - ['systemd-ask-password-console.service', ''], - ['systemd-ask-password-wall.service', ''], - ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], - ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'], - ['systemd-coredump@.service', 'ENABLE_COREDUMP'], - ['systemd-exit.service', ''], - ['systemd-firstboot.service', 'ENABLE_FIRSTBOOT', - 'sysinit.target.wants/'], - ['systemd-fsck-root.service', ''], - ['systemd-fsck@.service', ''], - ['systemd-halt.service', ''], - ['systemd-hibernate-resume@.service', 'ENABLE_HIBERNATE'], - ['systemd-hibernate.service', 'ENABLE_HIBERNATE'], - ['systemd-hybrid-sleep.service', 'ENABLE_HIBERNATE'], - ['systemd-hostnamed.service', 'ENABLE_HOSTNAMED', - 'dbus-org.freedesktop.hostname1.service'], - ['systemd-hwdb-update.service', 'ENABLE_HWDB', - 'sysinit.target.wants/'], - ['systemd-importd.service', 'ENABLE_IMPORTD', - 'dbus-org.freedesktop.import1.service'], - ['systemd-initctl.service', ''], - ['systemd-journal-catalog-update.service', '', - 'sysinit.target.wants/'], - ['systemd-journal-flush.service', '', - 'sysinit.target.wants/'], - ['systemd-journal-gatewayd.service', 'ENABLE_REMOTE HAVE_MICROHTTPD'], - ['systemd-journal-remote.service', 'ENABLE_REMOTE HAVE_MICROHTTPD'], - ['systemd-journal-upload.service', 'ENABLE_REMOTE HAVE_LIBCURL'], - ['systemd-journald.service', '', - 'sysinit.target.wants/'], - ['systemd-kexec.service', ''], - ['systemd-localed.service', 'ENABLE_LOCALED', - 'dbus-org.freedesktop.locale1.service'], - ['systemd-logind.service', 'ENABLE_LOGIND', - 'multi-user.target.wants/ dbus-org.freedesktop.login1.service'], - ['systemd-machine-id-commit.service', '', - 'sysinit.target.wants/'], - ['systemd-machined.service', 'ENABLE_MACHINED', - 'dbus-org.freedesktop.machine1.service'], - ['systemd-modules-load.service', 'HAVE_KMOD', - 'sysinit.target.wants/'], - ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD', - join_paths(pkgsysconfdir, 'system/network-online.target.wants/')], - ['systemd-nspawn@.service', ''], - ['systemd-poweroff.service', ''], - ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], - ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', - 'sysinit.target.wants/'], - ['systemd-reboot.service', ''], - ['systemd-remount-fs.service', '', - 'local-fs.target.wants/'], - ['systemd-rfkill.service', 'ENABLE_RFKILL'], - ['systemd-suspend.service', ''], - ['systemd-sysctl.service', '', - 'sysinit.target.wants/'], - ['systemd-sysusers.service', 'ENABLE_SYSUSERS', - 'sysinit.target.wants/'], - ['systemd-timedated.service', 'ENABLE_TIMEDATED', - 'dbus-org.freedesktop.timedate1.service'], - ['systemd-timesyncd.service', 'ENABLE_TIMESYNCD', - join_paths(pkgsysconfdir, 'system/sysinit.target.wants/')], - ['systemd-tmpfiles-clean.service', 'ENABLE_TMPFILES'], - ['systemd-tmpfiles-setup-dev.service', 'ENABLE_TMPFILES', - 'sysinit.target.wants/'], - ['systemd-tmpfiles-setup.service', 'ENABLE_TMPFILES', - 'sysinit.target.wants/'], - ['systemd-udev-settle.service', ''], - ['systemd-udev-trigger.service', '', - 'sysinit.target.wants/'], - ['systemd-udevd.service', '', - 'sysinit.target.wants/'], - ['systemd-update-done.service', '', - 'sysinit.target.wants/'], - ['systemd-update-utmp-runlevel.service', 'HAVE_UTMP HAVE_SYSV_COMPAT', - 'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'], - ['systemd-update-utmp.service', 'HAVE_UTMP', - 'sysinit.target.wants/'], - ['systemd-user-sessions.service', '', - 'multi-user.target.wants/'], - ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], - ['systemd-volatile-root.service', ''], + ['debug-shell.service', ''], + ['emergency.service', ''], + ['halt-local.service', 'HAVE_SYSV_COMPAT'], + ['initrd-cleanup.service', ''], + ['initrd-parse-etc.service', ''], + ['initrd-switch-root.service', ''], + ['initrd-udevadm-cleanup-db.service', ''], + ['kmod-static-nodes.service', 'HAVE_KMOD ENABLE_TMPFILES', + 'sysinit.target.wants/'], + ['quotaon.service', 'ENABLE_QUOTACHECK'], + ['rc-local.service', 'HAVE_SYSV_COMPAT'], + ['rescue.service', ''], + ['system-update-cleanup.service', ''], + ['systemd-ask-password-console.service', ''], + ['systemd-ask-password-wall.service', ''], + ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], + ['systemd-binfmt.service', 'ENABLE_BINFMT', + 'sysinit.target.wants/'], + ['systemd-coredump@.service', 'ENABLE_COREDUMP'], + ['systemd-exit.service', ''], + ['systemd-firstboot.service', 'ENABLE_FIRSTBOOT', + 'sysinit.target.wants/'], + ['systemd-fsck-root.service', ''], + ['systemd-fsck@.service', ''], + ['systemd-halt.service', ''], + ['systemd-hibernate-resume@.service', 'ENABLE_HIBERNATE'], + ['systemd-hibernate.service', 'ENABLE_HIBERNATE'], + ['systemd-hybrid-sleep.service', 'ENABLE_HIBERNATE'], + ['systemd-hostnamed.service', 'ENABLE_HOSTNAMED', + 'dbus-org.freedesktop.hostname1.service'], + ['systemd-hwdb-update.service', 'ENABLE_HWDB', + 'sysinit.target.wants/'], + ['systemd-importd.service', 'ENABLE_IMPORTD', + 'dbus-org.freedesktop.import1.service'], + ['systemd-initctl.service', ''], + ['systemd-journal-catalog-update.service', '', + 'sysinit.target.wants/'], + ['systemd-journal-flush.service', '', + 'sysinit.target.wants/'], + ['systemd-journal-gatewayd.service', 'ENABLE_REMOTE HAVE_MICROHTTPD'], + ['systemd-journal-remote.service', 'ENABLE_REMOTE HAVE_MICROHTTPD'], + ['systemd-journal-upload.service', 'ENABLE_REMOTE HAVE_LIBCURL'], + ['systemd-journald.service', '', + 'sysinit.target.wants/'], + ['systemd-kexec.service', ''], + ['systemd-localed.service', 'ENABLE_LOCALED', + 'dbus-org.freedesktop.locale1.service'], + ['systemd-logind.service', 'ENABLE_LOGIND', + 'multi-user.target.wants/ dbus-org.freedesktop.login1.service'], + ['systemd-machine-id-commit.service', '', + 'sysinit.target.wants/'], + ['systemd-machined.service', 'ENABLE_MACHINED', + 'dbus-org.freedesktop.machine1.service'], + ['systemd-modules-load.service', 'HAVE_KMOD', + 'sysinit.target.wants/'], + ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD', + join_paths(pkgsysconfdir, 'system/network-online.target.wants/')], + ['systemd-nspawn@.service', ''], + ['systemd-poweroff.service', ''], + ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], + ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', + 'sysinit.target.wants/'], + ['systemd-reboot.service', ''], + ['systemd-remount-fs.service', '', + 'local-fs.target.wants/'], + ['systemd-rfkill.service', 'ENABLE_RFKILL'], + ['systemd-suspend.service', ''], + ['systemd-sysctl.service', '', + 'sysinit.target.wants/'], + ['systemd-sysusers.service', 'ENABLE_SYSUSERS', + 'sysinit.target.wants/'], + ['systemd-timedated.service', 'ENABLE_TIMEDATED', + 'dbus-org.freedesktop.timedate1.service'], + ['systemd-timesyncd.service', 'ENABLE_TIMESYNCD', + join_paths(pkgsysconfdir, 'system/sysinit.target.wants/')], + ['systemd-tmpfiles-clean.service', 'ENABLE_TMPFILES'], + ['systemd-tmpfiles-setup-dev.service', 'ENABLE_TMPFILES', + 'sysinit.target.wants/'], + ['systemd-tmpfiles-setup.service', 'ENABLE_TMPFILES', + 'sysinit.target.wants/'], + ['systemd-udev-settle.service', ''], + ['systemd-udev-trigger.service', '', + 'sysinit.target.wants/'], + ['systemd-udevd.service', '', + 'sysinit.target.wants/'], + ['systemd-update-done.service', '', + 'sysinit.target.wants/'], + ['systemd-update-utmp-runlevel.service', 'HAVE_UTMP HAVE_SYSV_COMPAT', + 'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'], + ['systemd-update-utmp.service', 'HAVE_UTMP', + 'sysinit.target.wants/'], + ['systemd-user-sessions.service', '', + 'multi-user.target.wants/'], + ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], + ['systemd-volatile-root.service', ''], ] m4_units = [ - ['getty@.service', '', - 'autovt@.service ' + - join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')], - ['serial-getty@.service', ''], - ['tmp.mount', '', - 'local-fs.target.wants/'], + ['getty@.service', '', + 'autovt@.service ' + + join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')], + ['serial-getty@.service', ''], + ['tmp.mount', '', + 'local-fs.target.wants/'], ] m4_in_units = [ - ['console-getty.service', ''], - ['container-getty@.service', ''], - ['systemd-networkd.service', 'ENABLE_NETWORKD', - 'dbus-org.freedesktop.network1.service ' + - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], - ['systemd-resolved.service', 'ENABLE_RESOLVED', - 'dbus-org.freedesktop.resolve1.service ' + - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], - ['user@.service', ''], + ['console-getty.service', ''], + ['container-getty@.service', ''], + ['systemd-networkd.service', 'ENABLE_NETWORKD', + 'dbus-org.freedesktop.network1.service ' + + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['systemd-resolved.service', 'ENABLE_RESOLVED', + 'dbus-org.freedesktop.resolve1.service ' + + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['user@.service', ''], ] foreach tuple : m4_in_units - file = tuple[0] + file = tuple[0] - gen = configure_file( - input : file + '.m4.in', - output : file + '.m4', - configuration : substs) + gen = configure_file( + input : file + '.m4.in', + output : file + '.m4', + configuration : substs) - m4_units += [[file, tuple.get(1, ''), tuple.get(2, ''), gen]] + m4_units += [[file, tuple.get(1, ''), tuple.get(2, ''), gen]] endforeach foreach tuple : in_units - file = tuple[0] + file = tuple[0] - # we do this here because install_data does not accept custom_target output - conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + # we do this here because install_data does not accept custom_target output + conds = tuple[1].split(' ') + install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) - gen1 = configure_file( - input : file + '.in', - output : file + '.tmp', - configuration : substs) - gen2 = custom_target( - file, - input : gen1, - output : file, - command : [sed, '/^## /d', '@INPUT@'], - capture : true, - install : install, - install_dir : systemunitdir) + gen1 = configure_file( + input : file + '.in', + output : file + '.tmp', + configuration : substs) + gen2 = custom_target( + file, + input : gen1, + output : file, + command : [sed, '/^## /d', '@INPUT@'], + capture : true, + install : install, + install_dir : systemunitdir) - if install and tuple.length() > 2 - foreach target : tuple[2].split() - meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) - endforeach - endif + if install and tuple.length() > 2 + foreach target : tuple[2].split() + meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) + endforeach + endif endforeach foreach tuple : m4_units - file = tuple[0] - input = tuple.get(3, file + '.m4') + file = tuple[0] + input = tuple.get(3, file + '.m4') - # we do this here because install_data does not accept custom_target output - conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + # we do this here because install_data does not accept custom_target output + conds = tuple[1].split(' ') + install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) - custom_target( - file, - input : input, - output: file, - command : [m4, '-P'] + m4_defines + ['@INPUT@'], - capture : true, - install : install, - install_dir : systemunitdir) + custom_target( + file, + input : input, + output: file, + command : [m4, '-P'] + m4_defines + ['@INPUT@'], + capture : true, + install : install, + install_dir : systemunitdir) - if tuple.length() > 2 and install - foreach target : tuple[2].split() - meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) - endforeach - endif + if tuple.length() > 2 and install + foreach target : tuple[2].split() + meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) + endforeach + endif endforeach foreach tuple : units - file = tuple[0] - input = tuple.get(3, file) + file = tuple[0] + input = tuple.get(3, file) - conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + conds = tuple[1].split(' ') + install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) - if install - install_data(input, - install_dir : systemunitdir) + if install + install_data(input, + install_dir : systemunitdir) - if tuple.length() > 2 - foreach target : tuple[2].split() - meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) - endforeach - endif - endif + if tuple.length() > 2 + foreach target : tuple[2].split() + meson.add_install_script( + 'meson-add-wants.sh', systemunitdir, target, file) + endforeach + endif + endif endforeach ############################################################ @@ -319,11 +318,12 @@ meson.add_install_script(meson_make_symlink, join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) if conf.get('HAVE_SYSV_COMPAT', 0) == 1 - foreach i : [1, 2, 3, 4, 5] - meson.add_install_script('sh', '-c', - mkdir_p - .format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i)))) - endforeach + foreach i : [1, 2, 3, 4, 5] + meson.add_install_script( + 'sh', '-c', + mkdir_p + .format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i)))) + endforeach endif subdir('user') diff --git a/units/user/meson.build b/units/user/meson.build index f9c73a359a..b507144c05 100644 --- a/units/user/meson.build +++ b/units/user/meson.build @@ -1,36 +1,33 @@ -# -*- mode: meson -*- - units = [ - 'basic.target', - 'bluetooth.target', - 'default.target', - 'exit.target', - 'graphical-session-pre.target', - 'graphical-session.target', - 'paths.target', - 'printer.target', - 'shutdown.target', - 'smartcard.target', - 'sockets.target', - 'sound.target', - 'timers.target', - ] + 'basic.target', + 'bluetooth.target', + 'default.target', + 'exit.target', + 'graphical-session-pre.target', + 'graphical-session.target', + 'paths.target', + 'printer.target', + 'shutdown.target', + 'smartcard.target', + 'sockets.target', + 'sound.target', + 'timers.target', +] foreach file : units - install_data(file, - install_dir : userunitdir) + install_data(file, + install_dir : userunitdir) endforeach - in_units = [ - 'systemd-exit.service', - ] + 'systemd-exit.service', +] foreach file : in_units - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - install_data(gen, - install_dir : userunitdir) + gen = configure_file( + input : file + '.in', + output : file, + configuration : substs) + install_data(gen, + install_dir : userunitdir) endforeach |