meson: create dirs and touch /usr

This is the equivalent of $(INSTALL_DIRS) and install-touch-usr-hook.
I did not bother to create the directories into which we install files,
since they will be created anyway.

v2:
- remove bashism
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-09 23:55:05 -04:00
parent 2d9f0c6878
commit 94e75a5409
9 changed files with 57 additions and 0 deletions

View File

@ -22,4 +22,7 @@ hwdb_files = files('''
if conf.get('ENABLE_HWDB', 0) == 1
install_data(hwdb_files,
install_dir : udevhwdbdir)
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/udev/hwdb.d'))
endif

View File

@ -385,6 +385,8 @@ stat = find_program('stat')
git = find_program('git', required : false)
etags = find_program('etags', required : false)
mkdir_p = 'mkdir -p $DESTDIR/@0@'
# if -Dxxx-path option is found, use that. Otherwise, check in $PATH,
# /usr/sbin, /sbin, and fall back to the default from middle column.
progs = [['telinit', '/lib/sysvinit/telinit'],
@ -1530,6 +1532,11 @@ if conf.get('ENABLE_BINFMT', 0) == 1
link_with : [libshared],
install : true,
install_dir : rootlibexecdir)
meson.add_install_script('sh', '-c',
mkdir_p.format(binfmtdir))
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/binfmt.d'))
endif
if conf.get('ENABLE_VCONSOLE', 0) == 1
@ -1821,6 +1828,11 @@ if conf.get('HAVE_KMOD', 0) == 1
dependencies : [libkmod],
install : true,
install_dir : rootlibexecdir)
meson.add_install_script('sh', '-c',
mkdir_p.format(modulesloaddir))
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/modules-load.d'))
endif
executable('systemd-nspawn',
@ -1941,6 +1953,9 @@ install_data('README',
'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION',
install_dir : docdir)
meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir))
############################################################
if git.found() and etags.found()

View File

@ -6,4 +6,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
'80-container-vz.network',
'99-default.link',
install_dir : networkdir)
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/systemd/network'))
endif

View File

@ -220,3 +220,17 @@ custom_target(
install_data('system.conf',
'user.conf',
install_dir : pkgsysconfdir)
meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
meson.add_install_script('sh', '-c',
mkdir_p.format(pkgsysconfdir + '/system/multi-user.target.wants'))
meson.add_install_script('sh', '-c',
mkdir_p.format(pkgsysconfdir + '/system/getty.target.wants'))
meson.add_install_script('sh', '-c',
mkdir_p.format(pkgsysconfdir + '/user'))
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/xdg/systemd'))

View File

@ -8,3 +8,6 @@ install_data('50-depmod.install',
'90-loaderentry.install',
install_mode : 'rwxr-xr-x',
install_dir : kernelinstalldir)
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/kernel/install.d'))

View File

@ -163,3 +163,6 @@ udev_pc = configure_file(
configuration : substs)
install_data(udev_pc,
install_dir : pkgconfigdatadir)
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/udev/rules.d'))

View File

@ -18,3 +18,6 @@ foreach file : in_files
install_data(gen,
install_dir : sysctldir)
endforeach
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/sysctl.d'))

View File

@ -37,3 +37,8 @@ foreach file : m4_files
install : enable_tmpfiles,
install_dir : tmpfilesdir)
endforeach
if enable_tmpfiles
meson.add_install_script('sh', '-c',
mkdir_p.format(sysconfdir + '/tmpfiles.d'))
endif

View File

@ -307,4 +307,12 @@ foreach tuple : m4_in_units
endif
endforeach
if conf.get('HAVE_SYSV_COMPAT', 0) == 1
foreach i : [1, 2, 3, 4, 5]
meson.add_install_script('sh', '-c',
mkdir_p
.format(systemunitdir + '/runlevel@0@.target.wants'.format(i)))
endforeach
endif
subdir('user')