Merge pull request systemd#28620 from yuwata/meson-use-template-part5

DaanDeMeyer · web-flow · commit 54c332606655 · 2023-08-01T18:10:52.000+02:00
meson: use template to declare executables (part 5)
diff --git a/meson.build b/meson.build
diff --git a/src/ask-password/meson.build b/src/ask-password/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-ask-password',
+                'public' : true,
+                'sources' : files('ask-password.c'),
+        },
+]
diff --git a/src/busctl/meson.build b/src/busctl/meson.build
@@ -5,6 +5,14 @@ busctl_sources = files(
         'busctl.c',
 )
 
+executables += [
+        executable_template + {
+                'name' : 'busctl',
+                'public' : true,
+                'sources' : busctl_sources,
+        },
+]
+
 tests += [
         {
                 'sources' : files(
diff --git a/src/cgls/meson.build b/src/cgls/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-cgls',
+                'public' : true,
+                'sources' : files('cgls.c'),
+        },
+]
diff --git a/src/cgtop/meson.build b/src/cgtop/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-cgtop',
+                'public' : true,
+                'sources' : files('cgtop.c'),
+        },
+]
diff --git a/src/hwdb/meson.build b/src/hwdb/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-hwdb',
+                'public' : true,
+                'conditions' : ['ENABLE_HWDB'],
+                'sources' : files('hwdb.c'),
+                'link_with' : udev_link_with,
+                'install_rpath' : udev_rpath,
+        },
+]
diff --git a/src/initctl/meson.build b/src/initctl/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-initctl',
+                'conditions' : ['HAVE_SYSV_COMPAT'],
+                'sources' : files('initctl.c'),
+        },
+]
diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
@@ -2,6 +2,15 @@
 
 want_kernel_install = conf.get('ENABLE_KERNEL_INSTALL') == 1
 
+executables += [
+        executable_template + {
+                'name' : 'kernel-install',
+                'public' : true,
+                'conditions' : ['ENABLE_KERNEL_INSTALL'],
+                'sources' : files('kernel-install.c'),
+        },
+]
+
 ukify_install = custom_target(
         '60-ukify.install',
         input : '60-ukify.install.in',
@@ -22,10 +31,9 @@ loaderentry_install = custom_target(
 
 uki_copy_install = files('90-uki-copy.install')
 
-kernel_install_files = [
-        files('50-depmod.install'),
-        uki_copy_install,
-]
+kernel_install_files = uki_copy_install + files(
+        '50-depmod.install',
+)
 
 if want_kernel_install
         install_data(kernel_install_files,
@@ -39,6 +47,6 @@ if want_kernel_install
                 meson.add_install_script('sh', '-c',
                                          mkdir_p.format(sysconfdir / 'kernel/install.d'))
         endif
-
-        test_kernel_install_sh = find_program('test-kernel-install.sh')
 endif
+
+test_kernel_install_sh = find_program('test-kernel-install.sh')
diff --git a/src/modules-load/meson.build b/src/modules-load/meson.build
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-modules-load',
+                'conditions' : ['HAVE_KMOD'],
+                'sources' : files('modules-load.c'),
+                'dependencies' : libkmod,
+        },
+]
+
+if conf.get('HAVE_KMOD') == 1
+        meson.add_install_script('sh', '-c',
+                                 mkdir_p.format(modulesloaddir))
+        if install_sysconfdir
+                meson.add_install_script('sh', '-c',
+                                         mkdir_p.format(sysconfdir / 'modules-load.d'))
+        endif
+endif
diff --git a/src/mount/meson.build b/src/mount/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-mount',
+                'public' : true,
+                'sources' : files('mount-tool.c'),
+                'dependencies' : libmount,
+        },
+]
+
+meson.add_install_script(meson_make_symlink,
+                         'systemd-mount', bindir / 'systemd-umount')
diff --git a/src/network/meson.build b/src/network/meson.build
@@ -150,6 +150,45 @@ libnetworkd_core = static_library(
         link_with : networkd_link_with,
         build_by_default : false)
 
+executables += [
+        libexec_template + {
+                'name' : 'systemd-networkd',
+                'dbus' : true,
+                'conditions' : ['ENABLE_NETWORKD'],
+                'sources' : systemd_networkd_sources,
+                'include_directories' : network_includes,
+                'link_with' : [
+                        libnetworkd_core,
+                        libsystemd_network,
+                        networkd_link_with,
+                ],
+                'dependencies' : threads,
+        },
+        libexec_template + {
+                'name' : 'systemd-networkd-wait-online',
+                'public' : true,
+                'conditions' : ['ENABLE_NETWORKD'],
+                'sources' : systemd_networkd_wait_online_sources,
+                'link_with' : networkd_link_with,
+        },
+        executable_template + {
+                'name' : 'networkctl',
+                'public' : true,
+                'conditions' : ['ENABLE_NETWORKD'],
+                'sources' : networkctl_sources,
+                'include_directories' : libsystemd_network_includes,
+                'link_with' : [
+                        libsystemd_network,
+                        networkd_link_with,
+                ],
+        },
+        libexec_template + {
+                'name' : 'systemd-network-generator',
+                'sources' : network_generator_sources,
+                'link_with' : networkd_link_with,
+        },
+]
+
 if conf.get('ENABLE_NETWORKD') == 1
         install_data('org.freedesktop.network1.conf',
                      install_dir : dbuspolicydir)
diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
@@ -35,7 +35,23 @@ libnspawn_core = static_library(
                         userspace],
         build_by_default : false)
 
-systemd_nspawn_sources = files('nspawn.c')
+nspawn_libs = [
+        libnspawn_core,
+        libshared,
+]
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-nspawn',
+                'public' : true,
+                'sources' : files('nspawn.c'),
+                'link_with' : nspawn_libs,
+                'dependencies' : [
+                        libblkid,
+                        libseccomp,
+                ],
+        },
+]
 
 ############################################################
 
diff --git a/src/quotacheck/meson.build b/src/quotacheck/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-quotacheck',
+                'conditions' : ['ENABLE_QUOTACHECK'],
+                'sources' : files('quotacheck.c'),
+        },
+]
diff --git a/src/reply-password/meson.build b/src/reply-password/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-reply-password',
+                'sources' : files('reply-password.c'),
+        },
+]
diff --git a/src/run/meson.build b/src/run/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-run',
+                'public' : true,
+                'sources' : files('run.c'),
+        },
+]
diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
@@ -9,6 +9,27 @@ systemd_shutdown_sources = files(
         'umount.c',
 )
 
+executables += [
+        libexec_template + {
+                'name' : 'systemd-shutdown',
+                'sources' : systemd_shutdown_sources,
+                'dependencies' : libmount,
+        },
+        libexec_template + {
+                'name' : 'systemd-shutdown.standalone',
+                'sources' : systemd_shutdown_sources,
+                'c_args' : '-DSTANDALONE',
+                'link_with' : [
+                        libbasic,
+                        libshared_static,
+                        libsystemd_static,
+                ],
+                'dependencies' : libmount,
+                'build_by_default' : have_standalone_binaries,
+                'install' : have_standalone_binaries,
+        },
+]
+
 tests += [
         {
                 'sources' : files(
diff --git a/src/socket-proxy/meson.build b/src/socket-proxy/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-socket-proxyd',
+                'public' : true,
+                'sources' : files('socket-proxyd.c'),
+                'dependencies' : threads,
+        },
+]
diff --git a/src/stdio-bridge/meson.build b/src/stdio-bridge/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-stdio-bridge',
+                'public' : true,
+                'sources' : files('stdio-bridge.c'),
+        },
+]
diff --git a/src/sulogin-shell/meson.build b/src/sulogin-shell/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-sulogin-shell',
+                'sources' : files('sulogin-shell.c'),
+        },
+]
diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-sysusers',
+                'public' : true,
+                'conditions' : ['ENABLE_SYSUSERS'],
+                'sources' : files('sysusers.c'),
+        },
+        executable_template + {
+                'name' : 'systemd-sysusers.standalone',
+                'public' : have_standalone_binaries,
+                'conditions' : ['ENABLE_SYSUSERS'],
+                'sources' : files('sysusers.c'),
+                'c_args' : '-DSTANDALONE',
+                'link_with' : [
+                        libbasic,
+                        libbasic_gcrypt,
+                        libshared_static,
+                        libsystemd_static,
+                ],
+                'build_by_default' : have_standalone_binaries,
+                'install' : have_standalone_binaries,
+        },
+]
diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
@@ -5,6 +5,32 @@ systemd_tmpfiles_sources = files(
         'offline-passwd.c',
 )
 
+executables += [
+        executable_template + {
+                'name' : 'systemd-tmpfiles',
+                'public' : true,
+                'conditions' : ['ENABLE_TMPFILES'],
+                'sources' : systemd_tmpfiles_sources,
+                'dependencies' : libacl,
+        },
+        executable_template + {
+                'name' : 'systemd-tmpfiles.standalone',
+                'public' : have_standalone_binaries,
+                'conditions' : ['ENABLE_TMPFILES'],
+                'sources' : systemd_tmpfiles_sources,
+                'c_args' : '-DSTANDALONE',
+                'link_with' : [
+                        libbasic,
+                        libbasic_gcrypt,
+                        libshared_static,
+                        libsystemd_static,
+                ],
+                'dependencies' : libacl,
+                'build_by_default' : have_standalone_binaries,
+                'install' : have_standalone_binaries,
+        },
+]
+
 tests += [
         {
                 'sources' : files(
diff --git a/src/tty-ask-password-agent/meson.build b/src/tty-ask-password-agent/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-tty-ask-password-agent',
+                'public' : true,
+                'sources' : files('tty-ask-password-agent.c'),
+        },
+]
diff --git a/src/udev/meson.build b/src/udev/meson.build
diff --git a/src/update-done/meson.build b/src/update-done/meson.build
diff --git a/src/update-utmp/meson.build b/src/update-utmp/meson.build

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,14 @@ busctl_sources = files(`
`5`	`5`	`'busctl.c',`
`6`	`6`	`)`
`7`	`7`
	`8`	`+executables += [`
	`9`	`+ executable_template + {`
	`10`	`+ 'name' : 'busctl',`
	`11`	`+ 'public' : true,`
	`12`	`+ 'sources' : busctl_sources,`
	`13`	`+ },`
	`14`	`+]`
	`15`	`+`
`8`	`16`	`tests += [`
`9`	`17`	`{`
`10`	`18`	`'sources' : files(`