Skip to content

Commit

Permalink
license: Move to SPDX expressions
Browse files Browse the repository at this point in the history
This clarifies which flavor of GPLv2 is being used, in particular for
the kcov code itself since it's never mentioned whether it is "or later"
or strictly this version.
  • Loading branch information
dridi committed Aug 19, 2024
1 parent 1fda503 commit f0320a3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ set (KCOV_INSTALL_DOCDIR "share/doc/kcov" CACHE STRING "Install destination for
set (KCOV_INSTALL_MANDIR "share/man" CACHE STRING "Install destination for man documentation")
mark_as_advanced (KCOV_INSTALL_BINDIR KCOV_INSTALL_DOCDIR KCOV_INSTALL_MANDIR)

install (FILES ChangeLog COPYING COPYING.externals
install (FILES ChangeLog COPYING COPYING.spdx
DESTINATION "${KCOV_INSTALL_DOCDIR}")

# ====================================
Expand Down
3 changes: 0 additions & 3 deletions COPYING.externals

This file was deleted.

4 changes: 4 additions & 0 deletions COPYING.spdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kcov: GPL-2.0-only
handlebars.js: MIT
tablesorter (mottie): GPL-2.0-only OR MIT
jquery: MIT
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ LABEL org.label-schema.vendor="Kcov" \
org.opencontainers.image.documentation="https://github.com/SimonKagstrom/kcov#readme" \
org.opencontainers.image.source="https://github.com/SimonKagstrom/kcov" \
org.opencontainers.image.vendor="Kcov" \
org.opencontainers.image.licenses="GPL-2.0" \
org.opencontainers.image.licenses="GPL-2.0-only AND MIT AND (GPL-2.0-only OR MIT)" \
org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.version=${RELEASE_VERSION} \
org.opencontainers.image.revision=${VCS_REF}
Expand Down

0 comments on commit f0320a3

Please sign in to comment.