Skip to content

Commit 34475e2

Browse files
authored
Merge pull request #361 from igaw/clarify-license
Clarify license and add missing SPDX identifiers
2 parents d4c9e10 + d1ef396 commit 34475e2

14 files changed

Lines changed: 16 additions & 57 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ archived here:
2929
# License
3030

3131
Except where otherwise stated, all software contained within this repo
32-
is currently licensed LGPL, see COPYING for more information.
32+
is currently licensed LGPL-2.1-or-later, see COPYING for more
33+
information.
3334

3435
Keith Busch 2020-02-06
3536

doc/list-man-pages.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
# SPDX-License-Identifier: LGPL-2.1-or-later
23

34
file=$1
45

doc/update-docs.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/sh
2+
# SPDX-License-Identifier: LGPL-2.1-or-later
23

34
DESTDIR=$(pwd)
45

examples/discover-loop.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/python3
2+
# SPDX-License-Identifier: Apache-2.0
23
'''
34
Example script for nvme discovery
45

libnvme/tests/create-ctrl-obj.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python3
2+
# SPDX-License-Identifier: LGPL-2.1-or-later
23
import sys
34
import pprint
45
from libnvme import nvme

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(
99
'libnvme', ['c', 'cpp'],
1010
meson_version: '>= 0.47.0',
1111
version: '1.0',
12-
license: 'LGPLv2+',
12+
license: 'LGPL-2.1-or-later',
1313
default_options: [
1414
'c_std=gnu99',
1515
'warning_level=1',

meson_options.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# -*- mode: meson -*-
2+
# SPDX-License-Identifier: LGPL-2.1-or-later
23
option('version-tag', type : 'string', description : 'override the git version string')
34
option('pkgconfiglibdir', type : 'string', value : '', description : 'directory for standard pkg-config files')
45
option('htmldir', type : 'string', value : '', description : 'directory for HTML documentation')

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: LGPL-2.1-or-later
12
[build-system]
23
requires = ["mesonpep517", "wheel", "meson==0.61.2", "ninja"] # PEP 508 specifications.
34
build-backend = "mesonpep517.buildapi"

src/libnvme.map

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: LGPL-2.1-or-later
2+
13
LIBNVME_1_1 {
24
global:
35
nvme_get_version;

src/licenses/BSD-MIT

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)