From: Chris Hofstaedtler Date: Sun, 18 Dec 2022 18:42:04 +0000 (+0000) Subject: meson: install uuidd.rc with -Dsysvinit=enabled X-Git-Tag: v2.39-rc1~360^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e67b421a64003346d5d6f227ebdcbc935e2a144;p=thirdparty%2Futil-linux.git meson: install uuidd.rc with -Dsysvinit=enabled Signed-off-by: Chris Hofstaedtler --- diff --git a/meson.build b/meson.build index 365a149c34..9a5b280bed 100644 --- a/meson.build +++ b/meson.build @@ -23,6 +23,7 @@ docdir = join_paths(prefixdir, get_option('datadir'), 'doc', 'util-linux') mandir = join_paths(prefixdir, get_option('mandir')) runstatedir = '/run' execprefixdir = prefixdir +sysconfdir = join_paths(prefixdir, get_option('sysconfdir')) usrbin_exec_dir = join_paths(execprefixdir, bindir) usrsbin_exec_dir = join_paths(execprefixdir, sbindir) bash_completion = dependency('bash-completion', required : get_option('build-bash-completion')) @@ -57,6 +58,7 @@ conf.set_quoted('LIBBLKID_DATE', libblkid_date) conf.set('bindir', bindir) conf.set('sbindir', sbindir) conf.set('runstatedir', runstatedir) +conf.set('sysconfdir', sysconfdir) conf.set('usrsbin_execdir', usrsbin_exec_dir) conf.set('docdir', docdir) conf.set_quoted('_PATH_SYSCONFSTATICDIR', sysconfstaticdir) @@ -751,6 +753,9 @@ if systemd.found() systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemdsystemunitdir') endif +sysvinit = get_option('sysvinit').enabled() +sysvinitrcdir = sysconfdir + '/init.d' + chfn_chsh_password = get_option('chfn-chsh-password') or lib_user.found() conf.set('CHFN_CHSH_PASSWORD', chfn_chsh_password ? 1 : false) diff --git a/meson_options.txt b/meson_options.txt index 339948b913..0632c891df 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,6 +20,8 @@ option('smack', type : 'feature', value : 'disabled') option('magic', type : 'feature') option('econf', type : 'feature') option('systemd', type : 'feature') +option('sysvinit', type : 'feature', value : 'disabled', + description : 'build and install sysvinit startup scripts') option('btrfs', type : 'feature') option('widechar', type : 'feature', description : 'compile with wide character support') diff --git a/misc-utils/meson.build b/misc-utils/meson.build index d7dfe7372c..b600970497 100644 --- a/misc-utils/meson.build +++ b/misc-utils/meson.build @@ -92,6 +92,16 @@ if build_uuidd and systemd.found() uuidd_socket, install_dir : systemdsystemunitdir) endif +if build_uuidd and sysvinit + uuidd_rc = configure_file( + input : 'uuidd.rc.in', + output : 'uuidd.rc', + configuration : conf) + install_data( + uuidd_rc, + install_mode : 'rwxr-xr-x', + install_dir : sysvinitrcdir) +endif blkid_sources = files( 'blkid.c',