diff --git a/lib/dfdutils/.gitrepo b/lib/dfdutils/.gitrepo index fb5f30f0f2..3836ec6f48 100644 --- a/lib/dfdutils/.gitrepo +++ b/lib/dfdutils/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/KhronosGroup/dfdutils.git branch = master - commit = 54f7520bdf8bae87f5703ea11c3e37faa1d990a0 - parent = 045d5c1d4239af562b55cc82b3bab95643062607 + commit = 0e028d747f21142848ec6893ecccfb5c642df784 + parent = c5abc1611de1b175fc23e3e1497b5c72987e8a67 method = merge cmdver = 0.4.3 diff --git a/lib/dfdutils/.travis.yml b/lib/dfdutils/.travis.yml index ef1c5aa74b..262bf7d2b5 100644 --- a/lib/dfdutils/.travis.yml +++ b/lib/dfdutils/.travis.yml @@ -37,7 +37,8 @@ install: linux) # No need to install git-lfs. It is part of Travis's Ubuntu environment. sudo apt-get -qq update && - sudo apt-get -qq install doxygen + sudo apt-get -qq install doxygen && + pip3 install reuse ;; osx) brew install doxygen @@ -54,6 +55,7 @@ script: - | case "${TRAVIS_OS_NAME:-linux}" in linux) + reuse lint && make ;; osx) diff --git a/lib/dfdutils/LICENSE.adoc b/lib/dfdutils/LICENSE.adoc index fa17887c54..f206249940 100644 --- a/lib/dfdutils/LICENSE.adoc +++ b/lib/dfdutils/LICENSE.adoc @@ -1,16 +1,10 @@ = LICENSE file for the KhronosGroup/dfdutils project -Files in this repository fall under one of these licenses: +Files in this repository fall under this license: * SPDX license identifier: "`Apache-2.0`" ** Apache License 2.0 - ** Most files in the repository - * SPDX license identifier: "`MIT`" - ** MIT License - ** For files copied from other MIT-licensed projects - -Full license text of these licenses is available at: +Full license text is available at: * Apache-2.0: https://opensource.org/licenses/Apache-2.0 - * MIT: https://opensource.org/licenses/MIT diff --git a/lib/dfdutils/LICENSES/MIT.txt b/lib/dfdutils/LICENSES/MIT.txt deleted file mode 100644 index 204b93da48..0000000000 --- a/lib/dfdutils/LICENSES/MIT.txt +++ /dev/null @@ -1,19 +0,0 @@ -MIT License Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/lib/dfdutils/dfdutils.doxy b/lib/dfdutils/dfdutils.doxy index 72b1ada00f..27b43b0077 100644 --- a/lib/dfdutils/dfdutils.doxy +++ b/lib/dfdutils/dfdutils.doxy @@ -1,5 +1,8 @@ # Doxyfile 1.9.3 +# Copyright 2019-2020 The Khronos Group Inc +# SPDX-License-Identifier: Apache-2.0 + # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. #