diff options
| author | Brent Stapleton <brent.stapleton@ettus.com> | 2019-03-07 13:45:22 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-03-08 00:43:07 +0100 |
| commit | 431deb855b2eb5ce1c66370c73c8dabe38629f25 (patch) | |
| tree | f4997250ecd2a202b32b081863f1bacb8895a9d4 /host/lib | |
| parent | f258d72e2558e471c6345b286cf12dfd0d7a206a (diff) | |
| download | uhd-431deb855b2eb5ce1c66370c73c8dabe38629f25.tar.gz uhd-431deb855b2eb5ce1c66370c73c8dabe38629f25.tar.bz2 uhd-431deb855b2eb5ce1c66370c73c8dabe38629f25.zip | |
uhd: mpm: update all license header w/ "-or-later"
Updating all SPDX license identifiers to include "-or-later"
Diffstat (limited to 'host/lib')
32 files changed, 32 insertions, 32 deletions
diff --git a/host/lib/cal/CMakeLists.txt b/host/lib/cal/CMakeLists.txt index a66f16aa7..48f5ffd0c 100644 --- a/host/lib/cal/CMakeLists.txt +++ b/host/lib/cal/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2016 Ettus Research # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt index 5034e2850..f9128fe16 100644 --- a/host/lib/convert/CMakeLists.txt +++ b/host/lib/convert/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2011-2013 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/convert/convert_neon.S b/host/lib/convert/convert_neon.S index 54bd9a16f..391eafde1 100644 --- a/host/lib/convert/convert_neon.S +++ b/host/lib/convert/convert_neon.S @@ -2,7 +2,7 @@ // Copyright 2014 Ettus Research LLC // Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // .arch armv7-a diff --git a/host/lib/deps/CMakeLists.txt b/host/lib/deps/CMakeLists.txt index e533152df..e3dc76ee4 100644 --- a/host/lib/deps/CMakeLists.txt +++ b/host/lib/deps/CMakeLists.txt @@ -1,7 +1,7 @@ # # Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # if(ENABLE_MPMD) diff --git a/host/lib/experts/CMakeLists.txt b/host/lib/experts/CMakeLists.txt index 393c999f1..e3fa78ab5 100644 --- a/host/lib/experts/CMakeLists.txt +++ b/host/lib/experts/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2016 Ettus Research # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/ic_reg_maps/gen_lmx2592_regs.py b/host/lib/ic_reg_maps/gen_lmx2592_regs.py index 8689c487d..afd3b0596 100755 --- a/host/lib/ic_reg_maps/gen_lmx2592_regs.py +++ b/host/lib/ic_reg_maps/gen_lmx2592_regs.py @@ -2,7 +2,7 @@ # # Copyright 2017 Ettus Research, A National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/include/uhdlib/usrp/common/lmx2592.hpp b/host/lib/include/uhdlib/usrp/common/lmx2592.hpp index 181b81269..a754fa63d 100644 --- a/host/lib/include/uhdlib/usrp/common/lmx2592.hpp +++ b/host/lib/include/uhdlib/usrp/common/lmx2592.hpp @@ -1,7 +1,7 @@ // // Copyright 2018 Ettus Research, A National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_LMX2592_HPP diff --git a/host/lib/rfnoc/CMakeLists.txt b/host/lib/rfnoc/CMakeLists.txt index 067963565..af58e8953 100644 --- a/host/lib/rfnoc/CMakeLists.txt +++ b/host/lib/rfnoc/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2014-2015,2017 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/rfnoc/nocscript/CMakeLists.txt b/host/lib/rfnoc/nocscript/CMakeLists.txt index 8fb7215ad..2eeb984bf 100644 --- a/host/lib/rfnoc/nocscript/CMakeLists.txt +++ b/host/lib/rfnoc/nocscript/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # include_directories(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index 7794f0760..df94f42be 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2010-2013,2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/transport/nirio/CMakeLists.txt b/host/lib/transport/nirio/CMakeLists.txt index af456c595..bfdcb2c41 100644 --- a/host/lib/transport/nirio/CMakeLists.txt +++ b/host/lib/transport/nirio/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2013-2014 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/transport/nirio/lvbitx/CMakeLists.txt b/host/lib/transport/nirio/lvbitx/CMakeLists.txt index 8fb5bd079..a68bef6fe 100644 --- a/host/lib/transport/nirio/lvbitx/CMakeLists.txt +++ b/host/lib/transport/nirio/lvbitx/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2013,2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # macro(LIBUHD_LVBITX_GEN_SOURCE_AND_BITSTREAM lvbitx binfile) diff --git a/host/lib/transport/nirio/rpc/CMakeLists.txt b/host/lib/transport/nirio/rpc/CMakeLists.txt index bde242ca3..9420b90dc 100644 --- a/host/lib/transport/nirio/rpc/CMakeLists.txt +++ b/host/lib/transport/nirio/rpc/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2013 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/transport/uhd-dpdk/CMakeLists.txt b/host/lib/transport/uhd-dpdk/CMakeLists.txt index 0beb1eed5..653c09f39 100644 --- a/host/lib/transport/uhd-dpdk/CMakeLists.txt +++ b/host/lib/transport/uhd-dpdk/CMakeLists.txt @@ -1,7 +1,7 @@ # # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/types/CMakeLists.txt b/host/lib/types/CMakeLists.txt index 938015dca..3265c654f 100644 --- a/host/lib/types/CMakeLists.txt +++ b/host/lib/types/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2011-2013,2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt index 9998c1a4a..7f457d66a 100644 --- a/host/lib/usrp/CMakeLists.txt +++ b/host/lib/usrp/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2010-2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/b100/CMakeLists.txt b/host/lib/usrp/b100/CMakeLists.txt index 6f6050c34..5ca7bd34e 100644 --- a/host/lib/usrp/b100/CMakeLists.txt +++ b/host/lib/usrp/b100/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2011-2013,2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/b200/CMakeLists.txt b/host/lib/usrp/b200/CMakeLists.txt index 78dfe884d..9ac732c02 100644 --- a/host/lib/usrp/b200/CMakeLists.txt +++ b/host/lib/usrp/b200/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2012-2013,2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/common/CMakeLists.txt b/host/lib/usrp/common/CMakeLists.txt index 673aa7e78..df0b550bf 100644 --- a/host/lib/usrp/common/CMakeLists.txt +++ b/host/lib/usrp/common/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2011-2013,2016 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/cores/CMakeLists.txt b/host/lib/usrp/cores/CMakeLists.txt index 6d3d988f0..461ef0552 100644 --- a/host/lib/usrp/cores/CMakeLists.txt +++ b/host/lib/usrp/cores/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2011-2013 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/dboard/eiscat/CMakeLists.txt b/host/lib/usrp/dboard/eiscat/CMakeLists.txt index 650116ec1..076d26916 100644 --- a/host/lib/usrp/dboard/eiscat/CMakeLists.txt +++ b/host/lib/usrp/dboard/eiscat/CMakeLists.txt @@ -1,7 +1,7 @@ # # Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is conditionally included if ENABLE_MPMD and ENABLE_EISCAT are diff --git a/host/lib/usrp/dboard/magnesium/CMakeLists.txt b/host/lib/usrp/dboard/magnesium/CMakeLists.txt index 9f78ce242..1029bfacd 100644 --- a/host/lib/usrp/dboard/magnesium/CMakeLists.txt +++ b/host/lib/usrp/dboard/magnesium/CMakeLists.txt @@ -1,7 +1,7 @@ # # Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is conditionally included if ENABLE_MPMD and ENABLE_N300 are diff --git a/host/lib/usrp/device3/CMakeLists.txt b/host/lib/usrp/device3/CMakeLists.txt index 110fa873b..979225c2c 100644 --- a/host/lib/usrp/device3/CMakeLists.txt +++ b/host/lib/usrp/device3/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2014 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/e300/CMakeLists.txt b/host/lib/usrp/e300/CMakeLists.txt index 9d29d5b74..9821fe34a 100644 --- a/host/lib/usrp/e300/CMakeLists.txt +++ b/host/lib/usrp/e300/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2013-2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/mpmd/CMakeLists.txt b/host/lib/usrp/mpmd/CMakeLists.txt index 67e08fc91..221329c63 100644 --- a/host/lib/usrp/mpmd/CMakeLists.txt +++ b/host/lib/usrp/mpmd/CMakeLists.txt @@ -1,7 +1,7 @@ # # Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # if(ENABLE_MPMD) diff --git a/host/lib/usrp/n230/CMakeLists.txt b/host/lib/usrp/n230/CMakeLists.txt index 6acb332b8..5bc9c815f 100644 --- a/host/lib/usrp/n230/CMakeLists.txt +++ b/host/lib/usrp/n230/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2013 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/usrp1/CMakeLists.txt b/host/lib/usrp/usrp1/CMakeLists.txt index 95b6abb22..f7c8cbed0 100644 --- a/host/lib/usrp/usrp1/CMakeLists.txt +++ b/host/lib/usrp/usrp1/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2010-2011,2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/usrp2/CMakeLists.txt b/host/lib/usrp/usrp2/CMakeLists.txt index ab9115eca..e5a731b90 100644 --- a/host/lib/usrp/usrp2/CMakeLists.txt +++ b/host/lib/usrp/usrp2/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2011-2012,2014-2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp/x300/CMakeLists.txt b/host/lib/usrp/x300/CMakeLists.txt index ba1a8678c..37fadf4d7 100644 --- a/host/lib/usrp/x300/CMakeLists.txt +++ b/host/lib/usrp/x300/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2013,2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp_clock/CMakeLists.txt b/host/lib/usrp_clock/CMakeLists.txt index ec6bc1ddc..a7176f993 100644 --- a/host/lib/usrp_clock/CMakeLists.txt +++ b/host/lib/usrp_clock/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2011-2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/usrp_clock/octoclock/CMakeLists.txt b/host/lib/usrp_clock/octoclock/CMakeLists.txt index e42a66141..ec06cca96 100644 --- a/host/lib/usrp_clock/octoclock/CMakeLists.txt +++ b/host/lib/usrp_clock/octoclock/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2013-2015 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt index 1ecf6b9fe..b4dd72c94 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2010-2011 Ettus Research LLC # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # ######################################################################## |