Merge branch 'OpenRC:master' into parallel-unmount

OpenRC · Mar 26, 2024 · bbd0e00 · bbd0e00
2 parents 12ae930 + 12e1e88
commit bbd0e00
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/meson.build b/meson.build
@@ -83,16 +83,9 @@ else
   pkg_prefix = option_pkg_prefix
 endif
 
-if get_option('split-usr') == 'auto'
-  split_usr = run_command('test', '-L', '/bin', check: false).returncode() != 0
-else
-  split_usr = get_option('split-usr') == 'true'
-endif
-
 rootprefix = get_option('rootprefix')
-rootprefix_default = fs.is_symlink('/bin') ? '/usr' : '/'
 if rootprefix == ''
-rootprefix = rootprefix_default
+rootprefix = '/'
 endif
 
 bindir = rootprefix / get_option('bindir')

diff --git a/meson_options.txt b/meson_options.txt
@@ -26,9 +26,6 @@ option('selinux', type : 'feature', value : 'auto',
   description : 'enable SELinux support')
 option('shell', type : 'string', value : '/bin/sh',
   description : 'Default posix compatible shell')
-option('split-usr', type : 'combo',
-  choices : ['auto', 'true', 'false'],
-  description : '''/bin, /sbin aren't symlinks into /usr''')
 option('sysvinit', type : 'boolean', value : false,
   description : 'enable SysVinit compatibility (linux only)')
 option('termcap', type : 'combo',