Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SPDX License setup #6112

Merged
merged 1 commit into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CODING_STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Otherwise, just use `unsigned`, `long`, etc.
- Make sure you have the right to submit your contribution under the BSD license,
especially if it is based upon previous work.
See [CONTRIBUTING.md](https://github.com/pmem/pmdk/blob/master/CONTRIBUTING.md) for details.
- A copy of the [BSD-style License](https://github.com/pmem/pmdk/blob/master/LICENSE)
must be placed at the beginning of each source file, script or man page
- Place a [SPDX short-form identifier](https://spdx.dev/learn/handling-license-info/) for
the BSD-3-Clause license at the beginning of each new source file, script or man page.
(Obviously, it does not apply to README's, Visual Studio projects and \*.match files.)
- When adding a new file to the repo, or when making a contribution to an existing
file, feel free to put your copyright string on top of it.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ or just begin a dialog about the Persistent Memory Development Kit:

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

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

Expand Down
9 changes: 5 additions & 4 deletions LICENSE → LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
SPDX-License-Identifier: BSD-3-Clause
Copyright 2014-2020, Intel Corporation
Copyright 2014-2024, Intel Corporation

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

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

* utils/cstyle (used only during development) licensed under CDDL.
* utils/cstyle (used only during development) are covered by the
Common Development and Distribution License, described in the CDDL HEADER
contained in that file.
31 changes: 31 additions & 0 deletions LICENSE/BSD-3-Clause
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
BSD 3-Clause "New" or "Revised" License

Copyright 2014-2024, Intel Corporation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
377 changes: 377 additions & 0 deletions LICENSE/OPENSOLARIS.LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Utilities available in this repository:

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

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

## Getting Started

Expand Down
1 change: 0 additions & 1 deletion doc/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*.txt
*.html
*.gz
LICENSE
web_linux/
2 changes: 1 addition & 1 deletion utils/build-dpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ Description: tool to parse and replay pmemcheck logs
whether files are in a consistent state.
EOF

cp LICENSE debian/copyright
cp LICENSE.txt debian/copyright

if [ -n "$NDCTL_ENABLE" ]; then
pass_ndctl_enable="NDCTL_ENABLE=$NDCTL_ENABLE"
Expand Down
4 changes: 2 additions & 2 deletions utils/check_license/file-exceptions.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh -e
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2016-2023, Intel Corporation
# Copyright 2016-2024, Intel Corporation

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

grep -v -E -e '/queue.h$' -e 'src/core/valgrind/' -e '/testconfig\...$'
grep -v -E -e '/queue.h$' -e 'src/core/valgrind/' -e '/testconfig\...$' -e 'LICENSE/'
30 changes: 15 additions & 15 deletions utils/pmdk.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ to pmem is provided.
%dir %{_datadir}/pmdk
%{_libdir}/libpmem2.so.*
%{_datadir}/pmdk/pmdk.magic
%license LICENSE
%license LICENSE.txt
%doc ChangeLog CONTRIBUTING.md README.md


Expand All @@ -115,7 +115,7 @@ convenient.
%{_includedir}/libpmem2/*.h
%{_mandir}/man7/libpmem2.7.gz
%{_mandir}/man3/pmem2_*.3.gz
%license LICENSE
%license LICENSE.txt
%doc ChangeLog CONTRIBUTING.md README.md


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


Expand All @@ -155,7 +155,7 @@ to pmem is provided.
%dir %{_datadir}/pmdk
%{_libdir}/libpmem.so.*
%{_datadir}/pmdk/pmdk.magic
%license LICENSE
%license LICENSE.txt
%doc ChangeLog CONTRIBUTING.md README.md


Expand All @@ -180,7 +180,7 @@ convenient.
%{_includedir}/libpmem.h
%{_mandir}/man7/libpmem.7.gz
%{_mandir}/man3/pmem_*.3.gz
%license LICENSE
%license LICENSE.txt
%doc ChangeLog CONTRIBUTING.md README.md


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


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


Expand Down Expand Up @@ -250,7 +250,7 @@ probably want to start with this library.
%{_mandir}/man3/direct_*.3.gz
%{_mandir}/man3/d_r*.3.gz
%{_mandir}/man3/tx_*.3.gz
%license LICENSE
%license LICENSE.txt
%doc ChangeLog CONTRIBUTING.md README.md


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


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


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


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

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

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


Expand All @@ -395,7 +395,7 @@ a device.
%files -n daxio
%{_bindir}/daxio
%{_mandir}/man1/daxio.1.gz
%license LICENSE
%license LICENSE.txt
%doc ChangeLog CONTRIBUTING.md README.md

# end of "if _with_ndctl"
Expand Down
Loading