Browse Source

Fix empty lines in masked blocks

Sven Eden 3 years ago
parent
commit
2166c48d92
  1. 2
      shell-completion/bash/meson.build
  2. 2
      shell-completion/zsh/meson.build
  3. 2
      src/basic/meson.build
  4. 26
      src/core/meson.build
  5. 2
      src/libelogind/meson.build
  6. 2
      src/login/meson.build
  7. 2
      src/shared/meson.build
  8. 168
      src/test/meson.build
  9. 6
      tools/check-includes.pl

2
shell-completion/bash/meson.build

@ -18,7 +18,7 @@ if bashcompletiondir != 'no'
# input : 'systemctl.in',
# output : 'systemctl',
# configuration : substs)
#
#
# items = [['busctl', ''],
# ['journalctl', ''],
# ['systemd-analyze', ''],

2
shell-completion/zsh/meson.build

@ -13,7 +13,7 @@ if zshcompletiondir != 'no'
# input : '_systemctl.in',
# output : '_systemctl',
# configuration : substs)
#
#
# items = [['_busctl', ''],
# ['_journalctl', ''],
# ['_systemd-analyze', ''],

2
src/basic/meson.build

@ -385,7 +385,7 @@ generate_gperfs = find_program('generate-gperfs.py')
# 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',

26
src/core/meson.build

@ -137,13 +137,13 @@ libcore_la_sources = files('''
# output: 'load-fragment-gperf.gperf',
# command : [meson_apply_m4, config_h, '@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@'])
#
#
# awkscript = 'load-fragment-gperf-nulstr.awk'
# load_fragment_gperf_nulstr_c = custom_target(
# 'load-fragment-gperf-nulstr.c',
@ -151,7 +151,7 @@ libcore_la_sources = files('''
# output : 'load-fragment-gperf-nulstr.c',
# command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
# capture : true)
#
#
# libcore = static_library(
# 'core',
# libcore_la_sources,
@ -167,9 +167,9 @@ libcore_la_sources = files('''
# libapparmor,
# libselinux,
# libmount])
#
#
# systemd_sources = files('main.c')
#
#
# systemd_shutdown_sources = files('''
# shutdown.c
# umount.c
@ -179,16 +179,16 @@ libcore_la_sources = files('''
# killall.c
# killall.h
# '''.split())
#
#
# in_files = [['macros.systemd', rpmmacrosdir],
# ['triggers.systemd', ''],
# ['systemd.pc', pkgconfigdatadir],
# ['system.conf', pkgsysconfdir]]
#
#
# foreach item : in_files
# file = item[0]
# dir = item[1]
#
#
# # If 'no', disable generation completely.
# # If '', generate, but do not install.
# if dir != 'no'
@ -202,22 +202,22 @@ libcore_la_sources = files('''
# endif
# endif
# endforeach
#
#
# install_data('org.freedesktop.systemd1.conf',
# install_dir : dbuspolicydir)
# install_data('org.freedesktop.systemd1.service',
# install_dir : dbussystemservicedir)
#
#
# policy = configure_file(
# input : 'org.freedesktop.systemd1.policy.in',
# output : 'org.freedesktop.systemd1.policy',
# configuration : substs)
# install_data(policy,
# install_dir : polkitpolicydir)
#
#
# install_data('user.conf',
# install_dir : pkgsysconfdir)
#
#
#endif // 0
meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
@ -228,7 +228,7 @@ meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@/.keep_dir'.format(system
#if 0 /// UNNEEDED by elogind
# meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
# meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
#
#
# meson.add_install_script('sh', '-c',
# mkdir_p.format(join_paths(pkgsysconfdir, 'system/multi-user.target.wants')))
# meson.add_install_script('sh', '-c',

2
src/libelogind/meson.build

@ -80,7 +80,7 @@ sd_login_c = files('sd-login/sd-login.c')
# sd-resolve/sd-resolve.c
# sd-utf8/sd-utf8.c
# '''.split()) + id128_sources + sd_daemon_c + sd_event_c + sd_login_c
#
#
#else
libelogind_sources = files('''
sd-bus/bus-common-errors.c

2
src/login/meson.build

@ -1,6 +1,6 @@
# SPDX-License-Identifier: LGPL-2.1+
#if 0 /// rename to elogind
#
#
# systemd_logind_sources = files('''
# logind.c
# logind.h

2
src/shared/meson.build

@ -146,7 +146,7 @@ endif
# if conf.get('HAVE_SECCOMP') == 1
# shared_sources += files('seccomp-util.c')
# endif
#
#
# if conf.get('HAVE_LIBIPTC') == 1
# shared_sources += files('firewall-util.c')
# endif

168
src/test/meson.build

@ -54,7 +54,7 @@ tests += [
# [['src/test/test-device-nodes.c'],
# [],
# []],
#
#
# [['src/test/test-engine.c',
# 'src/test/test-helper.c'],
# [libcore,
@ -66,12 +66,12 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
#
#
# [['src/test/test-chown-rec.c'],
# [libcore,
# libshared],
# []],
#
#
# [['src/test/test-job-type.c'],
# [libcore,
# libshared],
@ -81,7 +81,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
#
#
# [['src/test/test-ns.c'],
# [libcore,
# libshared],
@ -92,7 +92,7 @@ tests += [
# libmount,
# libblkid],
# '', 'manual'],
#
#
# [['src/test/test-loopback.c'],
# [libcore,
# libshared],
@ -102,7 +102,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
#
#
# [['src/test/test-hostname.c'],
# [libcore,
# libshared],
@ -113,18 +113,18 @@ tests += [
# libmount,
# libblkid],
# '', 'unsafe'],
#
#
# [['src/test/test-dns-domain.c'],
# [libcore,
# libshared,
# libsystemd_network],
# []],
#
#
# [['src/test/test-boot-timestamps.c'],
# [],
# [],
# 'ENABLE_EFI'],
#
#
# [['src/test/test-unit-name.c',
# 'src/test/test-helper.c'],
# [libcore,
@ -135,7 +135,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
#
#
# [['src/test/test-unit-file.c',
# 'src/test/test-helper.c'],
# [libcore,
@ -156,7 +156,7 @@ tests += [
# [['src/test/test-capability.c'],
# [],
# [libcap]],
#
#
# [['src/test/test-async.c'],
# [],
# [],
@ -175,15 +175,15 @@ tests += [
# [['src/test/test-sigbus.c'],
# [],
# []],
#
#
# [['src/test/test-condition.c'],
# [],
# []],
#
#
# [['src/test/test-fdset.c'],
# [],
# []],
#
#
# [['src/test/test-fstab-util.c'],
# [],
# []],
@ -257,7 +257,7 @@ tests += [
# [['src/test/test-web-util.c'],
# [],
# []],
#
#
# [['src/test/test-cpu-set-util.c'],
# [],
# []],
@ -313,36 +313,36 @@ tests += [
# [['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-in-addr-util.c'],
# [],
# []],
#
#
# [['src/test/test-barrier.c'],
# [],
# []],
#
#
# [['src/test/test-tmpfiles.c'],
# [],
# []],
#
#
# [['src/test/test-namespace.c'],
# [libcore,
# libshared],
@ -358,26 +358,26 @@ tests += [
# [['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],
@ -407,7 +407,7 @@ tests += [
# libseccomp,
# libselinux,
# libblkid]],
#
#
# [['src/test/test-watch-pid.c',
# 'src/test/test-helper.c'],
# [libcore,
@ -439,7 +439,7 @@ tests += [
# [['src/test/test-bitmap.c'],
# [],
# []],
#
#
# [['src/test/test-xml.c'],
# [],
# []],
@ -485,15 +485,15 @@ tests += [
# [['src/test/test-fileio.c'],
# [],
# []],
#
#
# [['src/test/test-time-util.c'],
# [],
# []],
#
#
# [['src/test/test-clock.c'],
# [],
# []],
#
#
# [['src/test/test-architecture.c'],
# [],
# []],
@ -513,13 +513,13 @@ tests += [
# [],
# [],
# '', 'manual'],
#
#
#
#
# [['src/test/test-firewall-util.c'],
# [libshared],
# [],
# 'HAVE_LIBIPTC'],
#
#
# [['src/test/test-netlink-manual.c'],
# [],
# [libkmod],
@ -534,15 +534,15 @@ tests += [
# [['src/test/test-date.c'],
# [],
# []],
#
#
# [['src/test/test-sleep.c'],
# [],
# []],
#
#
# [['src/test/test-replace-var.c'],
# [],
# []],
#
#
# [['src/test/test-calendarspec.c'],
# [],
# []],
@ -575,19 +575,19 @@ tests += [
# 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'],
# [],
# []],
@ -608,7 +608,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
#
#
# [['src/test/test-execute.c',
# 'src/test/test-helper.c'],
# [libcore,
@ -630,17 +630,17 @@ tests += [
# [['src/test/test-strxcpyx.c'],
# [],
# []],
#
#
# [['src/test/test-install.c'],
# [libcore,
# libshared],
# [],
# '', 'manual'],
#
#
# [['src/test/test-watchdog.c'],
# [],
# []],
#
#
# [['src/test/test-sched-prio.c',
# 'src/test/test-helper.c'],
# [libcore,
@ -666,20 +666,20 @@ tests += [
# generated_gperf_headers],
# [],
# []],
#
#
# [['src/test/test-arphrd-list.c',
# generated_gperf_headers],
# [],
# []],
#
#
# [['src/test/test-journal-importer.c'],
# [],
# []],
#
#
# [['src/test/test-libudev.c'],
# [libshared],
# []],
#
#
# [['src/test/test-udev.c'],
# [libudev_core,
# libudev_static,
@ -706,12 +706,12 @@ tests += [
# [],
# [],
# 'HAVE_GCRYPT'],
#
#
# [['src/test/test-nss.c'],
# [],
# [libdl],
# '', 'manual'],
#
#
# [['src/test/test-umount.c',
# 'src/core/mount-setup.c',
# 'src/core/mount-setup.h',
@ -738,14 +738,14 @@ tests += [
# [threads,
# libxz,
# liblz4]],
#
#
# [['src/journal/test-journal-send.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
#
#
# [['src/journal/test-journal-syslog.c'],
# [libjournal_core,
# libshared],
@ -753,14 +753,14 @@ tests += [
# libxz,
# liblz4,
# libselinux]],
#
#
# [['src/journal/test-journal-match.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
#
#
# [['src/journal/test-journal-enum.c'],
# [libjournal_core,
# libshared],
@ -768,56 +768,56 @@ tests += [
# libxz,
# liblz4],
# '', 'timeout=360'],
#
#
# [['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-config.c'],
# [libjournal_core,
# libshared],
# [libxz,
# liblz4,
# libselinux]],
#
#
# [['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],
@ -825,20 +825,20 @@ tests += [
# 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],
@ -868,11 +868,11 @@ tests += [
# [['src/libsystemd/sd-bus/test-bus-watch-bind.c'],
# [],
# [threads], '', 'timeout=120'],
#
#
# [['src/libsystemd/sd-bus/test-bus-chat.c'],
# [],
# [threads]],
#
#
# [['src/libsystemd/sd-bus/test-bus-cleanup.c'],
# [],
# [threads,
@ -910,7 +910,7 @@ tests += [
# [libglib,
# libgobject,
# libgio]],
#
#
# [['src/libsystemd/sd-bus/test-bus-creds.c'],
# [],
# []],
@ -939,11 +939,11 @@ tests += [
# [['src/libsystemd/sd-netlink/test-netlink.c'],
# [],
# []],
#
#
# [['src/libsystemd/sd-netlink/test-local-addresses.c'],
# [],
# []],
#
#
# [['src/libsystemd/sd-resolve/test-resolve.c'],
# [],
# [threads]],
@ -960,7 +960,7 @@ tests += [
# libudev],
# [threads]],
# ]
#
#
# if cxx.found()
# tests += [
# [['src/libsystemd/sd-bus/test-bus-vtable-cc.cc'],
@ -982,13 +982,13 @@ tests += [
# [libshared,
# libsystemd_network],
# []],
#
#
# [['src/libsystemd-network/test-sd-dhcp-lease.c',
# 'src/libsystemd-network/dhcp-lease-internal.h'],
# [libshared,
# libsystemd_network],
# []],
#
#
# [['src/libsystemd-network/test-dhcp-client.c',
# 'src/libsystemd-network/dhcp-protocol.h',
# 'src/libsystemd-network/dhcp-internal.h',
@ -996,33 +996,33 @@ tests += [
# [libshared,
# libsystemd_network],
# []],
#
#
# [['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',
@ -1032,14 +1032,14 @@ tests += [
# [libshared,
# libsystemd_network],
# []],
#
#
# [['src/libsystemd-network/test-ndisc-ra.c',
# 'src/libsystemd-network/icmp6-util.h',
# 'src/systemd/sd-ndisc.h'],
# [libshared,
# libsystemd_network],
# []],
#
#
# [['src/libsystemd-network/test-dhcp6-client.c',
# 'src/libsystemd-network/dhcp-identifier.h',
# 'src/libsystemd-network/dhcp-identifier.c',
@ -1048,7 +1048,7 @@ tests += [
# [libshared,
# libsystemd_network],
# []],
#
#
# [['src/libsystemd-network/test-lldp.c'],
# [libshared,
# libsystemd_network],

6
tools/check-includes.pl

@ -6,9 +6,9 @@
#if 0 // 5 errors and 2 warnings are inaccaptable for elogind - See PerlCritic.
# foreach $file (@ARGV) {
# open(FILE, $file) or die "Cannot open $file: $!.\n";
#
#
# my %includedfiles = ();
#
#
# while (<FILE>) {
# if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
# ++$includedfiles{$1};
@ -19,7 +19,7 @@
# print "$file: $filename is included more than once.\n";
# }
# }
#
#
# close(FILE);
# }
#else

Loading…
Cancel
Save