Merging upstream version 2.4.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
50f6a45557
commit
c2a4b9519f
35 changed files with 364 additions and 122 deletions
14
meson.build
14
meson.build
|
@ -9,7 +9,7 @@
|
|||
project(
|
||||
'nvme-stas',
|
||||
meson_version: '>= 0.53.0',
|
||||
version: '2.3.1',
|
||||
version: '2.4',
|
||||
license: 'Apache-2.0',
|
||||
default_options: [
|
||||
'buildtype=release',
|
||||
|
@ -39,7 +39,13 @@ if want_man or want_html or want_readthedocs
|
|||
buildtime_modules += ['lxml']
|
||||
endif
|
||||
|
||||
python3 = import('python').find_installation('python3', modules:buildtime_modules)
|
||||
# On older systems we had to invoke Python 3 as "python3". On newer systems,
|
||||
# Python 2 has been completely deprecated and Python 3 is simply named "python".
|
||||
pymod = import('python')
|
||||
python3 = pymod.find_installation('python3', modules:buildtime_modules, required:false)
|
||||
if not python3.found()
|
||||
python3 = pymod.find_installation('python', modules:buildtime_modules)
|
||||
endif
|
||||
python_version = python3.language_version()
|
||||
python_version_req = '>=3.6'
|
||||
if not python_version.version_compare(python_version_req)
|
||||
|
@ -51,7 +57,7 @@ endif
|
|||
missing_runtime_mods = false
|
||||
py_modules_reqd = [
|
||||
['libnvme', 'Install python3-libnvme (deb/rpm)'],
|
||||
['dasbus', 'Install python3-dasbus (deb/rpm) OR pip3 install dasbus'],
|
||||
['dasbus', 'Install python3-dasbus (deb/rpm) OR pip install dasbus'],
|
||||
['pyudev', 'Install python3-pyudev (deb/rpm)'],
|
||||
['systemd', 'Install python3-systemd (deb/rpm)'],
|
||||
['gi', 'Install python3-gi (deb) OR python3-gobject (rpm)'],
|
||||
|
@ -165,7 +171,7 @@ summary_dict = {
|
|||
'dbus_conf_dir ': dbus_conf_dir,
|
||||
'sd_unit_dir ': sd_unit_dir,
|
||||
'build location ': meson.current_build_dir(),
|
||||
'libnvme for tests ': libnvme_location,
|
||||
'libnvme location ': libnvme_location,
|
||||
}
|
||||
summary(summary_dict, section: 'Directories')
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue