From ee4bfa21f62dbf4d8f2be27d3c763c3c16743bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 17 Nov 2017 13:07:46 +0100 Subject: [PATCH 1/2] 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. --- meson.build | 8 +------- meson_options.txt | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/meson.build b/meson.build index e935a09374..2215458480 100644 --- a/meson.build +++ b/meson.build @@ -37,13 +37,8 @@ endif ##################################################################### -rootprefixdir = get_option('rootprefix') conf.set10('HAVE_SPLIT_USR', get_option('split-usr')) -if get_option('split-usr') - rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/' -else - rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/usr' -endif +rootprefixdir = get_option('split-usr') ? '/' : '/usr' sysvinit_path = get_option('sysvinit-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('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('ROOTPREFIX', rootprefixdir) conf.set_quoted('RANDOM_SEED_DIR', randomseeddir) conf.set_quoted('RANDOM_SEED', join_paths(randomseeddir, 'random-seed')) conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH', join_paths(rootlibexecdir, 'systemd-cryptsetup')) diff --git a/meson_options.txt b/meson_options.txt index 037c298887..f2de59addf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,8 +4,6 @@ option('split-usr', type : 'boolean', value : false, description : '''assume that /bin, /sbin aren't symlinks into /usr''') option('rootlibdir', type : 'string', description : '''[/usr]/lib/x86_64-linux-gnu or such''') -option('rootprefix', type : 'string', - description : '''override the root prefix''') option('link-udev-shared', type : 'boolean', description : 'link systemd-udev and its helpers to libsystemd-shared.so') From 0c6e2702b68d328d86a9e5195975e0831aadc090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 17 Nov 2017 13:22:13 +0100 Subject: [PATCH 2/2] meson: use absolute path for rpmmacrosdir This only matter for the status display at the end of configure step. Now it looks like: RPM macros dir: /usr/lib/rpm/macros.d --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2215458480..c3be7c19c9 100644 --- a/meson.build +++ b/meson.build @@ -77,7 +77,7 @@ polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d') polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d') varlogdir = join_paths(localstatedir, 'log') 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') # Our own paths