diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-06-12 03:15:19 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-07-28 20:34:03 +0200 |
| commit | b0d3095fd6cc1791a38f57a1982116b4475244ba (patch) | |
| tree | f415bd813a7e07599c969fdd4965390bfdf38cd6 /meson_options.txt | |
| parent | Merge pull request #28551 from mrc0mmand/unit-cleanup-set (diff) | |
| download | systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.tar.xz systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.zip | |
Drop split-usr and unmerged-usr support
As previously announced, execute order 66:
https://lists.freedesktop.org/archives/systemd-devel/2022-September/048352.html
The meson options split-usr, rootlibdir and rootprefix become no-ops
that print a warning if they are set to anything other than the
default values. We can remove them in a future release.
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meson_options.txt b/meson_options.txt index 1909323850..8d845f0441 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -9,14 +9,14 @@ option('shared-lib-tag', type : 'string', 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'], - description : '''/bin, /sbin aren't symlinks into /usr''') +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', - description : '''[/usr]/lib/x86_64-linux-gnu or such''') -option('rootprefix', type : 'string', - description : '''override the root prefix [default '/' if split-usr and '/usr' otherwise]''') +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-systemctl-shared', type: 'boolean', @@ -69,7 +69,7 @@ option('loadkeys-path', type : 'string', description : 'path to loadkeys') option('setfont-path', type : 'string', description : 'path to setfont') option('nologin-path', type : 'string', description : 'path to nologin') -option('debug-shell', type : 'string', value : '/bin/sh', +option('debug-shell', type : 'string', value : '/usr/bin/sh', description : 'path to debug shell binary') option('debug-tty', type : 'string', value : '/dev/tty9', description : 'specify the tty device for debug shell') @@ -228,7 +228,7 @@ option('time-epoch', type : 'integer', value : 0, description : 'time epoch for time clients') option('clock-valid-range-usec-max', type : 'integer', value : 473364000000000, # 15 years description : 'maximum value in microseconds for the difference between RTC and epoch, exceeding which is considered an RTC error ["0" disables]') -option('default-user-shell', type : 'string', value : '/bin/bash', +option('default-user-shell', type : 'string', value : '/usr/bin/bash', description : 'default interactive shell') option('system-alloc-uid-min', type : 'integer', value : 0, |