Skip to content

Commit

Permalink
git subrepo pull (merge) lib/dfdutils
Browse files Browse the repository at this point in the history
Fixes for reuse issue.

subrepo:
  subdir:   "lib/dfdutils"
  merged:   "898748b2"
upstream:
  origin:   "https://github.com/KhronosGroup/dfdutils.git"
  branch:   "master"
  commit:   "0e028d74"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/MarkCallow/git-subrepo.git"
  commit:   "c1f1132"
  • Loading branch information
MarkCallow committed Apr 25, 2022
1 parent c5abc16 commit 7c24a98
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 30 deletions.
4 changes: 2 additions & 2 deletions lib/dfdutils/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion lib/dfdutils/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -54,6 +55,7 @@ script:
- |
case "${TRAVIS_OS_NAME:-linux}" in
linux)
reuse lint &&
make
;;
osx)
Expand Down
10 changes: 2 additions & 8 deletions lib/dfdutils/LICENSE.adoc
Original file line number Diff line number Diff line change
@@ -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
19 changes: 0 additions & 19 deletions lib/dfdutils/LICENSES/MIT.txt

This file was deleted.

3 changes: 3 additions & 0 deletions lib/dfdutils/dfdutils.doxy
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down

0 comments on commit 7c24a98

Please sign in to comment.