Skip to content

Commit c56b2f9

Browse files
authored
Merge pull request #10 from arceos-hypervisor/lic
chore: relicense to Apache-2.0 only
2 parents c0b5094 + b842de2 commit c56b2f9

27 files changed

+303
-989
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[package]
22
name = "x86_vlapic"
3-
version = "0.1.0"
3+
version = "0.2.0"
44
edition = "2024"
55
description = "x86 Virtual Local APIC"
66
authors = ["Keyang Hu <[email protected]>", "Mingxian Su <[email protected]>"]
7-
license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" # MulanPubL2 is not included in SPDX
7+
license = "Apache-2.0"
88
categories = ["virtualization"]
99
repository = "https://github.com/arceos-hypervisor/x86_vlapic"
1010
keywords = ["x86", "hypervisor", "arceos"]

LICENSE.Apache2 renamed to LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"Contribution" shall mean any work of authorship, including
4949
the original version of the Work and any modifications or additions
5050
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
51+
submitted to the Licensor for inclusion in the Work by the copyright owner
5252
or by an individual or Legal Entity authorized to submit on behalf of
5353
the copyright owner. For the purposes of this definition, "submitted"
5454
means any form of electronic, verbal, or written communication sent
@@ -198,4 +198,4 @@
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.

LICENSE.GPLv3

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

LICENSE.MulanPSL2

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

0 commit comments

Comments
 (0)