Merge pull request #7376 from keszybz/simplify-root-options
Simplify root configuration options
This commit is contained in:
commit
0e74bad141
10
meson.build
10
meson.build
|
@ -54,13 +54,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')
|
||||||
|
@ -99,7 +94,7 @@ polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d')
|
||||||
polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d')
|
polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d')
|
||||||
varlogdir = join_paths(localstatedir, 'log')
|
varlogdir = join_paths(localstatedir, 'log')
|
||||||
xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d')
|
xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d')
|
||||||
rpmmacrosdir = get_option('rpmmacrosdir')
|
rpmmacrosdir = join_paths(prefixdir, get_option('rpmmacrosdir'))
|
||||||
modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
|
modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
|
||||||
|
|
||||||
# Our own paths
|
# Our own paths
|
||||||
|
@ -181,7 +176,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'))
|
||||||
|
|
|
@ -20,8 +20,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 New Issue