build: drop 'os' option and use host_machine.system()

to specify a different host, meson's machine files should be used
instead.

Author: navi-desu

conf.d/meson.build

@@ -51,11 +51,11 @@ conf_data = conf_common
 if get_option('newnet')
   conf_data = conf_data + conf_net
 endif
-if os == 'FreeBSD'
+if os == 'freebsd'
   conf_data = conf_data + conf_FreeBSD
-elif os == 'Linux'
+elif os == 'linux'
   conf_data = conf_data + conf_Linux
-elif os == 'NetBSD'
+elif os == 'netbsd'
   conf_data = conf_data + conf_NetBSD
 endif
 

etc/meson.build

@@ -1,7 +1,7 @@
 etc_conf_data = configuration_data()
-if os == 'FreeBSD'
+if os == 'freebsd'
   etc_conf_data.set('TERM', 'cons25')
-elif os == 'Linux'
+elif os == 'linux'
   etc_conf_data.set('TERM', 'wsvt25')
 endif
 
@@ -25,15 +25,15 @@ etc_bin_NetBSD =  [
 install_data(etc_conf_common,
   install_dir : get_option('sysconfdir'))
 
-  if os == 'FreeBSD'
+  if os == 'freebsd'
   install_data(etc_bin_FreeBSD,
     install_dir : get_option('sysconfdir'),
     install_mode: 'rwxr-xr-x')
   install_data(etc_conf_FreeBSD,
     install_dir : get_option('sysconfdir'))
 endif
 
-if os == 'FreeBSD' or os == 'NetBSD'
+if os == 'freebsd' or os == 'netbsd'
   foreach file : etc_bin_NetBSD
     configure_file(input : file,
       output : '@BASENAME@',

init.d/meson.build

@@ -83,13 +83,13 @@ init_NetBSD =  [
   ]
 
 init_data = init_common
-if os == 'Dragonfly'
+if os == 'dragonfly'
   init_data = init_data + init_BSD
-elif os == 'FreeBSD'
+elif os == 'freebsd'
   init_data = init_data + init_BSD + init_FreeBSD
-elif os == 'Linux'
+elif os == 'linux'
   init_data = init_data + init_Linux
-elif os == 'NetBSD'
+elif os == 'netbsd'
   init_data = init_data + init_BSD + init_NetBSD
   endif
 
@@ -104,7 +104,7 @@ install_symlink('functions.sh',
   pointing_to: rc_shdir / 'functions.sh',
   install_dir: init_d_dir)
 
-if get_option('sysvinit') == true and os == 'Linux'
+if get_option('sysvinit') == true and os == 'linux'
   foreach x : get_option('agetty')
     link_name = 'agetty.' + x
     install_symlink(link_name,

man/meson.build

@@ -19,7 +19,7 @@ man8 = [
   'supervise-daemon.8',
   ]
 
-if os == 'Linux'
+if os == 'linux'
   man8 = man8 + [
     'rc-sstat.8',
     'openrc-init.8',

meson.build

@@ -32,14 +32,8 @@ if local_prefix == ''
   local_prefix = get_option('prefix') / 'usr' / 'local'
 endif
 
-os = get_option('os')
-if os == ''
-  r = run_command(find_program('uname'), '-s', check: true)
-  os = r.stdout().strip()
-  os = '-'.join(os.split('/'))
-endif
-
-if os != 'Linux'
+os = host_machine.system()
+if os != 'linux'
   cap_dep = []
   kvm_dep = cc.find_library('kvm')
 else
@@ -58,11 +52,11 @@ endif
 
 pkg_prefix = get_option('pkg_prefix')
 if pkg_prefix == ''
-  if os == 'Dragonfly' or os == 'FreeBSD'
+  if os == 'dragonfly' or os == 'freebsd'
     pkg_prefix = '/usr/local'
-  elif os == 'GNU' or os == 'Linux'
+  elif os == 'gnu' or os == 'linux'
     pkg_prefix = '/usr'
-  elif os == 'NetBSD'
+  elif os == 'netbsd'
     pkg_prefix = '/usr/pkg'
   endif
 endif
@@ -99,11 +93,11 @@ if get_option('buildtype').startswith('debug')
   c_flags += '-DRC_DEBUG'
 endif
 
-if os == 'Linux'
+if os == 'linux'
   c_flags += '-D_DEFAULT_SOURCE'
-elif os == 'FreeBSD'
+elif os == 'freebsd'
   c_flags += '-D_BSD_SOURCE'
-elif os == 'GNU'
+elif os == 'gnu'
   c_flags += ['-D_DEFAULT_SOURCE', '-DPATH_MAX=4096']
 endif
 

meson_options.txt

@@ -8,10 +8,6 @@ option('local_prefix', type : 'string', value : '/usr/local',
   description : 'default location of user maintained packages')
 option('newnet', type : 'boolean',
   description : 'build and install our networking scripts')
-option('os', type : 'combo',
-  choices :
-    [ '', 'DragonFly', 'FreeBSD', 'GNU', 'Linux', 'NetBSD' ],
-  description : 'Operating System (autodetected if not specified)')
 option('pam', type : 'boolean',
   description : 'enable PAM support')
 option('pam_libdir', type : 'string',

runlevels/meson.build

@@ -6,7 +6,7 @@ sysinit_linux = [
   'devfs',
   'dmesg',
   'sysfs']
-if os == 'Linux'
+if os == 'linux'
   sysinit += sysinit_linux
 endif
 
@@ -53,11 +53,11 @@ if get_option('newnet')
 endif
 if os == 'DragonFly'
   boot += boot_bsd
-elif os == 'FreeBSD'
+elif os == 'freebsd'
   boot += boot_bsd + boot_freebsd
-elif os == 'Linux'
+elif os == 'linux'
   boot += boot_linux
-elif os == 'NetBSD'
+elif os == 'netbsd'
   boot += boot_bsd + boot_netbsd
 endif
 
@@ -71,7 +71,7 @@ shutdown = ['savecache']
 shutdown_linux = [
   'killprocs',
   'mount-ro']
-if os == 'Linux'
+if os == 'linux'
   shutdown += shutdown_linux
 endif
 
@@ -89,7 +89,7 @@ foreach runlevel: runlevels.keys()
       install_dir: runlevel_dir / runlevel,
       pointing_to: init_d_dir / service) 
   endforeach
-  if get_option('sysvinit') == true and os == 'Linux' and runlevel == 'default'
+  if get_option('sysvinit') == true and os == 'linux' and runlevel == 'default'
     foreach tty : get_option('agetty')
       install_symlink('agetty.' + tty,
         install_dir: runlevel_dir / runlevel,

sh/meson.build

@@ -27,7 +27,7 @@ scripts_config = [
   's6-svscanboot.sh.in'
   ]
 
-if os == 'Linux'
+if os == 'linux'
   sh += [
     'rc-cgroup.sh',
     ]
@@ -39,7 +39,7 @@ if os == 'Linux'
     ['init-early.sh.Linux.in', 'init-early.sh'],
     ['init.sh.Linux.in', 'init.sh'],
     ]
-elif os == 'GNU'
+elif os == 'gnu'
   scripts_config_os = [
     ['init.sh.GNU.in', 'init.sh'],
     ]

src/halt/meson.build

@@ -1,4 +1,4 @@
-if os == 'Linux' and get_option('sysvinit')
+if os == 'linux' and get_option('sysvinit')
   configure_file(input : 'halt.in',
     output : '@BASENAME@',
     configuration : script_conf_data,

src/kill_all/meson.build

@@ -1,4 +1,4 @@
-if os == 'Linux'
+if os == 'linux'
   executable('kill_all', 'kill_all.c',
     include_directories: incdir,
     dependencies: [rc, einfo, shared],