meson: drop rootprefix option
rootprefixdir is now always set to /usr or /, based on the split-usr setting. Anything else does not work anyway. C.f. #7375.
This commit is contained in:
parent
05d69e0294
commit
ee4bfa21f6
|
@ -37,13 +37,8 @@ endif
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
rootprefixdir = get_option('rootprefix')
|
|
||||||
conf.set10('HAVE_SPLIT_USR', get_option('split-usr'))
|
conf.set10('HAVE_SPLIT_USR', get_option('split-usr'))
|
||||||
if get_option('split-usr')
|
rootprefixdir = get_option('split-usr') ? '/' : '/usr'
|
||||||
rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/'
|
|
||||||
else
|
|
||||||
rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/usr'
|
|
||||||
endif
|
|
||||||
|
|
||||||
sysvinit_path = get_option('sysvinit-path')
|
sysvinit_path = get_option('sysvinit-path')
|
||||||
sysvrcnd_path = get_option('sysvrcnd-path')
|
sysvrcnd_path = get_option('sysvrcnd-path')
|
||||||
|
@ -164,7 +159,6 @@ conf.set_quoted('SYSTEMD_SLEEP_BINARY_PATH', join_paths(rootlib
|
||||||
conf.set_quoted('SYSTEMCTL_BINARY_PATH', join_paths(rootbindir, 'systemctl'))
|
conf.set_quoted('SYSTEMCTL_BINARY_PATH', join_paths(rootbindir, 'systemctl'))
|
||||||
conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
|
conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
|
||||||
conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH', join_paths(bindir, 'systemd-stdio-bridge'))
|
conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH', join_paths(bindir, 'systemd-stdio-bridge'))
|
||||||
conf.set_quoted('ROOTPREFIX', rootprefixdir)
|
|
||||||
conf.set_quoted('RANDOM_SEED_DIR', randomseeddir)
|
conf.set_quoted('RANDOM_SEED_DIR', randomseeddir)
|
||||||
conf.set_quoted('RANDOM_SEED', join_paths(randomseeddir, 'random-seed'))
|
conf.set_quoted('RANDOM_SEED', join_paths(randomseeddir, 'random-seed'))
|
||||||
conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH', join_paths(rootlibexecdir, 'systemd-cryptsetup'))
|
conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH', join_paths(rootlibexecdir, 'systemd-cryptsetup'))
|
||||||
|
|
|
@ -4,8 +4,6 @@ option('split-usr', type : 'boolean', value : false,
|
||||||
description : '''assume that /bin, /sbin aren't symlinks into /usr''')
|
description : '''assume that /bin, /sbin aren't symlinks into /usr''')
|
||||||
option('rootlibdir', type : 'string',
|
option('rootlibdir', type : 'string',
|
||||||
description : '''[/usr]/lib/x86_64-linux-gnu or such''')
|
description : '''[/usr]/lib/x86_64-linux-gnu or such''')
|
||||||
option('rootprefix', type : 'string',
|
|
||||||
description : '''override the root prefix''')
|
|
||||||
option('link-udev-shared', type : 'boolean',
|
option('link-udev-shared', type : 'boolean',
|
||||||
description : 'link systemd-udev and its helpers to libsystemd-shared.so')
|
description : 'link systemd-udev and its helpers to libsystemd-shared.so')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue