Skip to content

Commit 1b4e516

Browse files
Merge pull request #460 from dridi/spdx
license: Move to SPDX expressions
2 parents 1fda503 + f0320a3 commit 1b4e516

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ set (KCOV_INSTALL_DOCDIR "share/doc/kcov" CACHE STRING "Install destination for
7979
set (KCOV_INSTALL_MANDIR "share/man" CACHE STRING "Install destination for man documentation")
8080
mark_as_advanced (KCOV_INSTALL_BINDIR KCOV_INSTALL_DOCDIR KCOV_INSTALL_MANDIR)
8181

82-
install (FILES ChangeLog COPYING COPYING.externals
82+
install (FILES ChangeLog COPYING COPYING.spdx
8383
DESTINATION "${KCOV_INSTALL_DOCDIR}")
8484

8585
# ====================================

COPYING.externals

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

COPYING.spdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
kcov: GPL-2.0-only
2+
handlebars.js: MIT
3+
tablesorter (mottie): GPL-2.0-only OR MIT
4+
jquery: MIT

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ LABEL org.label-schema.vendor="Kcov" \
132132
org.opencontainers.image.documentation="https://github.com/SimonKagstrom/kcov#readme" \
133133
org.opencontainers.image.source="https://github.com/SimonKagstrom/kcov" \
134134
org.opencontainers.image.vendor="Kcov" \
135-
org.opencontainers.image.licenses="GPL-2.0" \
135+
org.opencontainers.image.licenses="GPL-2.0-only AND MIT AND (GPL-2.0-only OR MIT)" \
136136
org.opencontainers.image.created=${BUILD_DATE} \
137137
org.opencontainers.image.version=${RELEASE_VERSION} \
138138
org.opencontainers.image.revision=${VCS_REF}

0 commit comments

Comments
 (0)