update license to BSD-3-Clause

As per the discussion in: rust-vmm#161 Signed-off-by: Andreea Florescu <[email protected]>
andreeaflorescu · Aug 11, 2022 · 57ef3b4 · 57ef3b4
1 parent 9be4b26
commit 57ef3b4
Show file tree

Hide file tree

Showing 25 changed files with 27 additions and 223 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/rust-vmm/vmm-sys-util"
 readme = "README.md"
 keywords = ["utils"]
 edition = "2018"
-license = "Apache-2.0 AND BSD-3-Clause"
+license = "BSD-3-Clause"
 
 [features]
 with-serde = ["serde", "serde_derive"]

diff --git a/LICENSE-APACHE b/LICENSE-APACHE
diff --git a/README.md b/README.md
@@ -21,5 +21,4 @@ with files, event file descriptors, ioctls and others.
 
 ## License
 
-This code is licensed under [Apache-2.0](LICENSE-APACHE) and
-[BSD-3-Clause](LICENSE-BSD-3-Clause).
+This code is licensed under [BSD-3-Clause](LICENSE-BSD-3-Clause).
diff --git a/src/errno.rs b/src/errno.rs
@@ -4,7 +4,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Structures, helpers, and type definitions for working with
 //! [`errno`](http://man7.org/linux/man-pages/man3/errno.3.html).

diff --git a/src/fam.rs b/src/fam.rs
@@ -2,7 +2,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Trait and wrapper for working with C defined FAM structures.
 //!

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,5 @@
 // Copyright 2019 Intel Corporation. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Collection of modules that provides helpers and utilities used by multiple
 //! [rust-vmm](https://github.com/rust-vmm/community) components.

diff --git a/src/linux/aio.rs b/src/linux/aio.rs
@@ -1,5 +1,5 @@
 // Copyright (C) 2019 Alibaba Cloud Computing. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Safe wrapper over [`Linux AIO`](http://man7.org/linux/man-pages/man7/aio.7.html).
 

diff --git a/src/linux/epoll.rs b/src/linux/epoll.rs
@@ -1,5 +1,5 @@
 // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Safe wrappers over the
 //! [`epoll`](http://man7.org/linux/man-pages/man7/epoll.7.html) API.

diff --git a/src/linux/eventfd.rs b/src/linux/eventfd.rs
@@ -2,7 +2,7 @@
 //
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Structure and wrapper functions for working with
 //! [`eventfd`](http://man7.org/linux/man-pages/man2/eventfd.2.html).

diff --git a/src/linux/fallocate.rs b/src/linux/fallocate.rs
@@ -2,7 +2,7 @@
 //
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Enum and function for dealing with an allocated disk space
 //! by [`fallocate`](http://man7.org/linux/man-pages/man2/fallocate.2.html).

diff --git a/src/linux/ioctl.rs b/src/linux/ioctl.rs
@@ -4,7 +4,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Macros and functions for working with
 //! [`ioctl`](http://man7.org/linux/man-pages/man2/ioctl.2.html).

diff --git a/src/linux/mod.rs b/src/linux/mod.rs
@@ -1,3 +1,6 @@
+// Copyright 2022 rust-vmm Authors or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: BSD-3-Clause
+
 #[macro_use]
 pub mod ioctl;
 pub mod aio;

diff --git a/src/linux/poll.rs b/src/linux/poll.rs
@@ -2,7 +2,7 @@
 //
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Traits and structures for working with
 //! [`epoll`](http://man7.org/linux/man-pages/man7/epoll.7.html)

diff --git a/src/linux/seek_hole.rs b/src/linux/seek_hole.rs
@@ -2,7 +2,7 @@
 //
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Traits and implementations over [lseek64](https://linux.die.net/man/3/lseek64).
 

diff --git a/src/linux/signal.rs b/src/linux/signal.rs
@@ -4,7 +4,7 @@
 //
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Enums, traits and functions for working with
 //! [`signal`](http://man7.org/linux/man-pages/man7/signal.7.html).

diff --git a/src/linux/sock_ctrl_msg.rs b/src/linux/sock_ctrl_msg.rs
@@ -1,6 +1,7 @@
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.
+// SPDX-License-Identifier: BSD-3-Clause
 
 /* Copied from the crosvm Project, commit 186eb8b */
 

diff --git a/src/linux/timerfd.rs b/src/linux/timerfd.rs
@@ -2,7 +2,7 @@
 //
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Structure and functions for working with
 //! [`timerfd`](http://man7.org/linux/man-pages/man2/timerfd_create.2.html).

diff --git a/src/linux/write_zeroes.rs b/src/linux/write_zeroes.rs
@@ -4,7 +4,7 @@
 //
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Traits for replacing a range with a hole and writing zeroes in a file.
 

diff --git a/src/metric.rs b/src/metric.rs
@@ -1,5 +1,5 @@
 // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
+// SPDX-License-Identifier: BSD-3-Clause
 //! The purpose of this module is to provide abstractions for working with
 //! metrics in the context of rust-vmm components where there is a strong need
 //! to have metrics as an optional feature.

diff --git a/src/rand.rs b/src/rand.rs
@@ -1,5 +1,5 @@
 // Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Miscellaneous functions related to getting (pseudo) random numbers and
 //! strings.

diff --git a/src/syscall.rs b/src/syscall.rs
@@ -1,5 +1,5 @@
 // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Wrapper for interpreting syscall exit codes.
 

diff --git a/src/unix/file_traits.rs b/src/unix/file_traits.rs
@@ -2,7 +2,7 @@
 //
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Traits for handling file synchronization and length.
 

diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -1,3 +1,5 @@
+// Copyright 2022 rust-vmm Authors or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: BSD-3-Clause
 pub mod file_traits;
 pub mod tempdir;
 pub mod terminal;
diff --git a/src/unix/tempdir.rs b/src/unix/tempdir.rs
@@ -2,7 +2,7 @@
 //
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Structure for handling temporary directories.
 use std::env::temp_dir;

diff --git a/src/unix/terminal.rs b/src/unix/terminal.rs
@@ -4,7 +4,7 @@
 //
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 //
-// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause)
+// SPDX-License-Identifier: BSD-3-Clause
 
 //! Trait for working with [`termios`](http://man7.org/linux/man-pages/man3/termios.3.html).