Skip to content

Commit 0933f5b

Browse files
committed
doc: fix license to follow SPDX format
Signed-off-by: Tomasz Gromadzki <[email protected]>
1 parent 9ef3c3e commit 0933f5b

File tree

10 files changed

+435
-27
lines changed

10 files changed

+435
-27
lines changed

CODING_STYLE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ Otherwise, just use `unsigned`, `long`, etc.
4848
- Make sure you have the right to submit your contribution under the BSD license,
4949
especially if it is based upon previous work.
5050
See [CONTRIBUTING.md](https://github.com/pmem/pmdk/blob/master/CONTRIBUTING.md) for details.
51-
- A copy of the [BSD-style License](https://github.com/pmem/pmdk/blob/master/LICENSE)
52-
must be placed at the beginning of each source file, script or man page
51+
- Place a [SPDX short-form identifier](https://spdx.dev/learn/handling-license-info/) for
52+
the BSD-3-Clause license at the beginning of each new source file, script or man page.
5353
(Obviously, it does not apply to README's, Visual Studio projects and \*.match files.)
5454
- When adding a new file to the repo, or when making a contribution to an existing
5555
file, feel free to put your copyright string on top of it.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ or just begin a dialog about the Persistent Memory Development Kit:
1515

1616
**NOTE: If you do decide to implement code changes and contribute them,
1717
please make sure you agree your contribution can be made available
18-
under the [BSD-style License used for the Persistent Memory Development Kit](https://github.com/pmem/pmdk/blob/master/LICENSE).**
18+
under the [BSD-style License used for the Persistent Memory Development Kit](LICENSE.txt).**
1919

2020
**NOTE: Submitting your changes also means that you certify the following:**
2121

LICENSE renamed to LICENSE.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
SPDX-License-Identifier: BSD-3-Clause
2-
Copyright 2014-2020, Intel Corporation
1+
Copyright 2014-2024, Intel Corporation
32

43
Redistribution and use in source and binary forms, with or without
54
modification, are permitted provided that the following conditions
@@ -34,6 +33,8 @@ with the following exceptions:
3433

3534
* src/core/valgrind/valgrind.h, src/core/valgrind/memcheck.h,
3635
src/core/valgrind/helgrind.h, src/core/valgrind/drd.h are covered by
37-
another similar BSD license variant, contained in those files.
36+
BSD-style licenses, contained in these files.
3837

39-
* utils/cstyle (used only during development) licensed under CDDL.
38+
* utils/cstyle (used only during development) are covered by the
39+
Common Development and Distribution License, described in the CDDL HEADER
40+
contained in that file.

LICENSE/BSD-3-Clause

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
BSD 3-Clause "New" or "Revised" License
2+
3+
Copyright 2014-2024, Intel Corporation
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
* Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above copyright
13+
notice, this list of conditions and the following disclaimer in
14+
the documentation and/or other materials provided with the
15+
distribution.
16+
17+
* Neither the name of the copyright holder nor the names of its
18+
contributors may be used to endorse or promote products derived
19+
from this software without specific prior written permission.
20+
21+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
24+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
25+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
28+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
29+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
31+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE/OPENSOLARIS.LICENSE

Lines changed: 377 additions & 0 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Utilities available in this repository:
4444

4545
Currently, these libraries and utilities only work on 64-bit Linux.
4646

47-
See our [LICENSE](LICENSE) file for information on how these libraries are licensed.
47+
See our [LICENSE](LICENSE.txt) file for information on how these libraries are licensed.
4848

4949
## Getting Started
5050

doc/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
*.txt
22
*.html
33
*.gz
4-
LICENSE
54
web_linux/

utils/build-dpkg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ Description: tool to parse and replay pmemcheck logs
388388
whether files are in a consistent state.
389389
EOF
390390

391-
cp LICENSE debian/copyright
391+
cp LICENSE.txt debian/copyright
392392

393393
if [ -n "$NDCTL_ENABLE" ]; then
394394
pass_ndctl_enable="NDCTL_ENABLE=$NDCTL_ENABLE"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh -e
22
# SPDX-License-Identifier: BSD-3-Clause
3-
# Copyright 2016-2023, Intel Corporation
3+
# Copyright 2016-2024, Intel Corporation
44

55
# file-exceptions.sh - filter out files not checked for copyright and license
66

7-
grep -v -E -e '/queue.h$' -e 'src/core/valgrind/' -e '/testconfig\...$'
7+
grep -v -E -e '/queue.h$' -e 'src/core/valgrind/' -e '/testconfig\...$' -e 'LICENSE/'

utils/pmdk.spec.in

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ to pmem is provided.
8989
%dir %{_datadir}/pmdk
9090
%{_libdir}/libpmem2.so.*
9191
%{_datadir}/pmdk/pmdk.magic
92-
%license LICENSE
92+
%license LICENSE.txt
9393
%doc ChangeLog CONTRIBUTING.md README.md
9494

9595

@@ -115,7 +115,7 @@ convenient.
115115
%{_includedir}/libpmem2/*.h
116116
%{_mandir}/man7/libpmem2.7.gz
117117
%{_mandir}/man3/pmem2_*.3.gz
118-
%license LICENSE
118+
%license LICENSE.txt
119119
%doc ChangeLog CONTRIBUTING.md README.md
120120

121121

@@ -138,7 +138,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
138138
%dir %{_libdir}/pmdk_debug
139139
%{_libdir}/pmdk_debug/libpmem2.so
140140
%{_libdir}/pmdk_debug/libpmem2.so.*
141-
%license LICENSE
141+
%license LICENSE.txt
142142
%doc ChangeLog CONTRIBUTING.md README.md
143143

144144

@@ -155,7 +155,7 @@ to pmem is provided.
155155
%dir %{_datadir}/pmdk
156156
%{_libdir}/libpmem.so.*
157157
%{_datadir}/pmdk/pmdk.magic
158-
%license LICENSE
158+
%license LICENSE.txt
159159
%doc ChangeLog CONTRIBUTING.md README.md
160160

161161

@@ -180,7 +180,7 @@ convenient.
180180
%{_includedir}/libpmem.h
181181
%{_mandir}/man7/libpmem.7.gz
182182
%{_mandir}/man3/pmem_*.3.gz
183-
%license LICENSE
183+
%license LICENSE.txt
184184
%doc ChangeLog CONTRIBUTING.md README.md
185185

186186

@@ -203,7 +203,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
203203
%dir %{_libdir}/pmdk_debug
204204
%{_libdir}/pmdk_debug/libpmem.so
205205
%{_libdir}/pmdk_debug/libpmem.so.*
206-
%license LICENSE
206+
%license LICENSE.txt
207207
%doc ChangeLog CONTRIBUTING.md README.md
208208

209209

@@ -220,7 +220,7 @@ persistent memory programming.
220220
%files -n libpmemobj__PKG_NAME_SUFFIX__
221221
%defattr(-,root,root,-)
222222
%{_libdir}/libpmemobj.so.*
223-
%license LICENSE
223+
%license LICENSE.txt
224224
%doc ChangeLog CONTRIBUTING.md README.md
225225

226226

@@ -250,7 +250,7 @@ probably want to start with this library.
250250
%{_mandir}/man3/direct_*.3.gz
251251
%{_mandir}/man3/d_r*.3.gz
252252
%{_mandir}/man3/tx_*.3.gz
253-
%license LICENSE
253+
%license LICENSE.txt
254254
%doc ChangeLog CONTRIBUTING.md README.md
255255

256256

@@ -274,7 +274,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
274274
%dir %{_libdir}/pmdk_debug
275275
%{_libdir}/pmdk_debug/libpmemobj.so
276276
%{_libdir}/pmdk_debug/libpmemobj.so.*
277-
%license LICENSE
277+
%license LICENSE.txt
278278
%doc ChangeLog CONTRIBUTING.md README.md
279279

280280

@@ -290,7 +290,7 @@ pools created by libpmemobj library.
290290
%files -n libpmempool__PKG_NAME_SUFFIX__
291291
%defattr(-,root,root,-)
292292
%{_libdir}/libpmempool.so.*
293-
%license LICENSE
293+
%license LICENSE.txt
294294
%doc ChangeLog CONTRIBUTING.md README.md
295295

296296

@@ -312,7 +312,7 @@ pools created by libpmemobj library.
312312
%{_mandir}/man7/libpmempool.7.gz
313313
%{_mandir}/man5/poolset.5.gz
314314
%{_mandir}/man3/pmempool_*.3.gz
315-
%license LICENSE
315+
%license LICENSE.txt
316316
%doc ChangeLog CONTRIBUTING.md README.md
317317

318318

@@ -335,7 +335,7 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
335335
%dir %{_libdir}/pmdk_debug
336336
%{_libdir}/pmdk_debug/libpmempool.so
337337
%{_libdir}/pmdk_debug/libpmempool.so.*
338-
%license LICENSE
338+
%license LICENSE.txt
339339
%doc ChangeLog CONTRIBUTING.md README.md
340340

341341
%package -n pmempool
@@ -357,7 +357,7 @@ and users of the applications based on PMDK libraries.
357357
%{_mandir}/man1/pmempool.1.gz
358358
%{_mandir}/man1/pmempool-*.1.gz
359359
%config(noreplace) %{_sysconfdir}/bash_completion.d/pmempool
360-
%license LICENSE
360+
%license LICENSE.txt
361361
%doc ChangeLog CONTRIBUTING.md README.md
362362

363363
%package -n pmreorder
@@ -374,7 +374,7 @@ provided in the command line options to check whether files are in a consistent
374374
%{_bindir}/pmreorder
375375
%{_datadir}/pmreorder/*.py
376376
%{_mandir}/man1/pmreorder.1.gz
377-
%license LICENSE
377+
%license LICENSE.txt
378378
%doc ChangeLog CONTRIBUTING.md README.md
379379

380380

@@ -395,7 +395,7 @@ a device.
395395
%files -n daxio
396396
%{_bindir}/daxio
397397
%{_mandir}/man1/daxio.1.gz
398-
%license LICENSE
398+
%license LICENSE.txt
399399
%doc ChangeLog CONTRIBUTING.md README.md
400400

401401
# end of "if _with_ndctl"

0 commit comments

Comments
 (0)