meson: rework -Dstandalone-binaries= option

The option is generalized from a simple boolean switch that enables
a fixed list to a list-of-patterns.
The old value works, but is deprecated: -Dstandalone-binaries=true is translated
to -Dstandalone-binaries=repart,report,tmpfiles,sysusers,shutdown.

We could already build all normal executables as .standalone, but the
installation only supported a small fixes subset. This wasn't flexible
enough:
- packagers might want to provide additional standalone binaries then the
  small subset that was already enabled
- but at the same time, whenever new binaries were added to this subset,
  downstream packaging had to be adjusted in sync, at least in the case of
  Fedora, because otherwise we'd get a complaint about unexpected .standalone
  binaries in the temporary install root.
With the new option, downstreams can just specify the binaries that they
want to be installed in the .standalone variant.

As usual with this type of change, the build dir must be reprovisioned.

diff --git a/meson.build b/meson.build
index 3567392541ded8ec0844468ccfbc8c641d4db2d1..e3d0b3c5a23dd5393c5cb956e666896c14f46271 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -99,7 +99,10 @@ endif
 conf.set10('HAVE_SPLIT_BIN', split_bin,
            description : 'bin and sbin directories are separate')
 
-have_standalone_binaries = get_option('standalone-binaries')
+standalone_binaries = get_option('standalone-binaries').split(',')
+if standalone_binaries == ['']
+        standalone_binaries = []
+endif
 
 conf.set10('CREATE_LOG_DIRS', get_option('create-log-dirs'))
 
@@ -2027,13 +2030,15 @@ endif
 
 # The 'install' field is extended to also control whether the automatically
 # added variant, which is statically linked with libsystemd-shared, is installed:
-#   'yes'    : Mapped to true. The static variant will not be installed.
-#   'no'     : Mapped to false. The static variant will not be installed either.
-#   'both'   : Mapped to true. The static variant will also be installed.
+#   'yes'    : Mapped to true.
+#   'no'     : Mapped to false.
 #   'static' : Mapped to false, and its target name is suffixed with '.shared'.
 #              The static variant will be installed instead using the original name
 #              (without the '.standalone' suffix).
 # Currently, test and fuzzer executables only support 'yes' or 'no'.
+#
+# For executables matched by the install-standalone list, a .standalone variant
+# will be installed if install is true.
 executable_template = {
         'include_directories' : includes,
         'link_with' : [libshared],
@@ -2349,24 +2354,20 @@ foreach dict : executables
         name_static = name + '.standalone'
         install = dict.get('install')
         build_by_default = dict.get('build_by_default')
-        if install == 'yes'
-                install_shared = true
-                install_static = false
-                build_by_default_shared = build_by_default
-                build_by_default_static = false
-        elif install == 'no'
-                install_shared = false
-                install_static = false
-                build_by_default_shared = build_by_default
-                build_by_default_static = false
-        elif install == 'both'
-                if is_test or is_fuzz
-                        error('Install mode "@0@" is not supported for test or fuzzer target "@1@"'.format(install, name))
-                endif
-                install_shared = true
-                install_static = true
+        install_standalone = false
+        if not (is_test or is_fuzz)
+                foreach pattern : standalone_binaries
+                        if name.contains(pattern)
+                                install_standalone = true
+                        endif
+                endforeach
+        endif
+
+        if install in ['yes', 'no']
+                install_shared = install == 'yes'
+                install_static = install_shared and install_standalone
                 build_by_default_shared = build_by_default
-                build_by_default_static = build_by_default
+                build_by_default_static = build_by_default and install_standalone
         elif install == 'static'
                 if is_test or is_fuzz
                         error('Install mode "@0@" is not supported for test or fuzzer target "@1@"'.format(install, name))
@@ -3165,7 +3166,6 @@ foreach tuple : [
         ['link-portabled-shared',  get_option('link-portabled-shared')],
         ['first-boot-full-preset'],
         ['fexecve'],
-        ['standalone-binaries',    get_option('standalone-binaries')],
         ['coverage',               get_option('b_coverage')],
 ]
 

diff --git a/meson_options.txt b/meson_options.txt
index 6a1c870b047864a5ab6b568f9ffcf31f413ff820..97eec7d08e3472f17776851b07b8fbd62e870f48 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -40,8 +40,9 @@ option('static-libsystemd', type : 'combo',
 option('static-libudev', type : 'combo',
        choices : ['false', 'true', 'pic', 'no-pic'],
        description : 'install a static library for libudev')
-option('standalone-binaries', type : 'boolean', value : false,
-       description : 'also build standalone versions of supported binaries')
+option('standalone-binaries', type : 'string',
+       deprecated : { 'true' : 'repart,report,shutdown,sysusers,tmpfiles', 'false' : '' },
+       description : 'comma-separated list of patterns specifying binaries to install as .standalone')
 option('build-static', type : 'boolean', value : false,
        description : 'build static versions of supported binaries')
 

diff --git a/src/repart/meson.build b/src/repart/meson.build
index 1cff471087c5caf8c02487b4cd0547a7316bd155..364b34c6e910f100864ab7ba1e38003448786680 100644 (file)
--- a/src/repart/meson.build
+++ b/src/repart/meson.build
@@ -21,7 +21,6 @@ executables += [
                         libopenssl_cflags,
                         tpm2_cflags,
                 ],
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
 ]
 

diff --git a/src/report/meson.build b/src/report/meson.build
index 3eaf20a397b2f237ac75dbc94b218c2743a487ba..76182a4131bb7197c2ffc06d8350615c36cf4022 100644 (file)
--- a/src/report/meson.build
+++ b/src/report/meson.build
@@ -13,7 +13,6 @@ executables += [
                 'dependencies' : [
                         libcurl_cflags,
                 ],
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
         libexec_template + {
                 'name' : 'systemd-report-basic',
@@ -22,7 +21,6 @@ executables += [
                         'report-basic.c',
                         'report-basic-server.c',
                 ),
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
         libexec_template + {
                 'name' : 'systemd-report-cgroup',
@@ -30,7 +28,6 @@ executables += [
                         'report-cgroup.c',
                         'report-cgroup-server.c',
                 ),
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
         libexec_template + {
                 'name' : 'systemd-report-files',
@@ -38,7 +35,6 @@ executables += [
                         'report-files.c',
                         'report-files-server.c',
                 ),
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
         libexec_template + {
                 'name' : 'systemd-report-sign-plain',
@@ -47,13 +43,11 @@ executables += [
                 ),
                 'dependencies' : libopenssl_cflags,
                 'conditions' : ['HAVE_OPENSSL'],
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
         libexec_template + {
                 'name' : 'systemd-report-sign-tsm',
                 'export' : files(
                         'report-sign-tsm.c',
                 ),
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
 ]

diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
index e9f4abeaa9be7b15ce7a5183d4605fb085d4a3ef..1545db92e5910168cd08ca2712298daa8d580900 100644 (file)
--- a/src/shutdown/meson.build
+++ b/src/shutdown/meson.build
@@ -19,7 +19,6 @@ executables += [
                         'shutdown.c',
                 ) + shutdown_detach_sources,
                 'dependencies' : libmount_cflags,
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
         test_template + {
                 'sources' : files('test-umount.c') +

diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build
index 4fc99bfb24ff4c819d0a9cc538f4f9aed70d5d14..a8eff21bdcdaca9ae2d3d418e126a50b07fb09c9 100644 (file)
--- a/src/sysusers/meson.build
+++ b/src/sysusers/meson.build
@@ -10,6 +10,5 @@ executables += [
                 'public' : true,
                 'export' : files('sysusers.c'),
                 'dependencies' : libaudit_cflags,
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
 ]

diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
index 8c18190e12e4092d90479dfe8ebd0e816495c344..c6f22f56ff7dae4be8702900be541c5865c5413d 100644 (file)
--- a/src/tmpfiles/meson.build
+++ b/src/tmpfiles/meson.build
@@ -16,7 +16,6 @@ executables += [
                         libacl_cflags,
                         libselinux_cflags,
                 ],
-                'install' : have_standalone_binaries ? 'both' : 'yes',
         },
         test_template + {
                 'sources' : files('test-offline-passwd.c') +

diff --git a/test/meson.build b/test/meson.build
index 9fd1b55d6137e9936e325820c82eb42ec6e74d29..df1a1671c05928bb14e9f6a3261a8f25768c4b67 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -16,7 +16,7 @@ if conf.get('ENABLE_SYSUSERS') == 1
                      env : test_env,
                      suite : 'sysusers')
 
-                if have_standalone_binaries
+                if 'systemd-sysusers.standalone' in executables_by_name
                         exe = executables_by_name.get('systemd-sysusers.standalone')
                         test('test-sysusers.standalone',
                              test_sysusers_sh,
@@ -85,7 +85,7 @@ if want_tests != 'false' and conf.get('ENABLE_TMPFILES') == 1
              depends : exe,
              suite : 'tmpfiles')
 
-        if have_standalone_binaries
+        if 'systemd-tmpfiles.standalone' in executables_by_name
                 exe = executables_by_name.get('systemd-tmpfiles.standalone')
                 test('test-systemd-tmpfiles.standalone',
                      test_systemd_tmpfiles_py,