diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-26 05:25:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-26 05:34:52 +0000 |
| commit | 9ecff41dd11e920286f9be670a0ec3a668371d1d (patch) | |
| tree | 89c73ab6742847ca5f12056e6c0dd4ec6bbe79d0 /libnvme | |
| parent | Adding debian version 1.0-1. (diff) | |
| download | libnvme-9ecff41dd11e920286f9be670a0ec3a668371d1d.tar.xz libnvme-9ecff41dd11e920286f9be670a0ec3a668371d1d.zip | |
Merging upstream version 1.1~rc0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libnvme')
| -rw-r--r-- | libnvme/__init__.py | 9 | ||||
| -rw-r--r-- | libnvme/meson.build | 6 | ||||
| -rw-r--r-- | libnvme/nvme.i | 2 | ||||
| -rwxr-xr-x | libnvme/tests/create-ctrl-obj.py | 1 |
4 files changed, 15 insertions, 3 deletions
diff --git a/libnvme/__init__.py b/libnvme/__init__.py index e69de29..b2fe8dd 100644 --- a/libnvme/__init__.py +++ b/libnvme/__init__.py @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# This file is part of libnvme. +# Copyright (c) 2022 Dell Inc. +# +# Authors: Martin Belanger <Martin.Belanger@dell.com> + +__version__ = @PROJECT_VERSION@ +__git_version__ = @GIT_VERSION@ diff --git a/libnvme/meson.build b/libnvme/meson.build index c95444e..e9589fc 100644 --- a/libnvme/meson.build +++ b/libnvme/meson.build @@ -29,9 +29,9 @@ if have_python_support pynvme_clib = python3.extension_module( '_nvme', pymod_swig[1], - dependencies : py3_dep, + dependencies : [libnvme_dep, py3_dep], include_directories: [incdir, internal_incdir], - link_with: [libnvme, libccan], + link_with: [libccan], install: true, subdir: 'libnvme', ) @@ -46,7 +46,7 @@ if have_python_support configure_file( input: '__init__.py', output: '__init__.py', - copy: true, + configuration: conf, install_dir: python3.get_install_dir(pure: false, subdir: 'libnvme'), ) diff --git a/libnvme/nvme.i b/libnvme/nvme.i index ec680be..a295068 100644 --- a/libnvme/nvme.i +++ b/libnvme/nvme.i @@ -269,6 +269,8 @@ static void PyDict_SetItemStringDecRef(PyObject *p, const char *key, PyObject *v PyDict_SetItemStringDecRef(entry, "cntlid", val); val = PyLong_FromLong(e->asqsz); PyDict_SetItemStringDecRef(entry, "asqsz", val); + val = PyLong_FromLong(e->eflags); + PyDict_SetItemStringDecRef(entry, "eflags", val); PyList_SetItem(obj, i, entry); /* steals ref. to entry */ } $result = obj; diff --git a/libnvme/tests/create-ctrl-obj.py b/libnvme/tests/create-ctrl-obj.py index 51915cc..f7b5f41 100755 --- a/libnvme/tests/create-ctrl-obj.py +++ b/libnvme/tests/create-ctrl-obj.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: LGPL-2.1-or-later import sys import pprint from libnvme import nvme |