meson: drop split-usr, rootlibdir, and rootprefix from meson_options.txt

These options were deprecated by b0d3095fd6cc1791a38f57a1982116b4475244ba (v255).
Let's remove them completely.

diff --git a/NEWS b/NEWS
index 804c33e3394dba9ae8b7a715209dfdb915130d41..7bdd3e0dbdedea1331a99b7ac51ad16a541ac050 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,9 @@ CHANGES WITH 258 in spe:
 
         * Support for the SystemdOptions EFI variable has been removed.
 
+        * The 'split-usr', 'rootlibdir', and 'rootprefix' meson options, which
+          were deprecated in v255, have been removed.
+
         Announcements of Future Feature Removals:
 
         * The D-Bus method org.freedesktop.systemd1.StartAuxiliaryScope() is

diff --git a/meson_options.txt b/meson_options.txt
index c71d3bf0533bc104d39f3bbd96d74df1e9341aa0..ee30d721bc7f702c5e1fae224237fe62fda0ef1b 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -11,14 +11,8 @@ option('vcs-tag', type : 'boolean', value : true,
 option('mode', type : 'combo', choices : ['developer', 'release'],
        description : 'autoenable features suitable for systemd development/release builds')
 
-option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'], deprecated: true,
-       description : 'This option is deprecated and will be removed in a future release')
 option('split-bin', type : 'combo', choices : ['auto', 'true', 'false'],
        description : 'sbin is not a symlink to bin')
-option('rootlibdir', type : 'string', deprecated: true,
-       description : 'This option is deprecated and will be removed in a future release')
-option('rootprefix', type : 'string', deprecated: true,
-       description : 'This option is deprecated and will be removed in a future release')
 option('link-udev-shared', type : 'boolean',
        description : 'link systemd-udevd and its helpers to libsystemd-shared.so')
 option('link-executor-shared', type : 'boolean',