Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/config.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"targets": [
"aarch64-unknown-none-softfloat",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none",
"riscv64gc-unknown-none-elf"
"x86_64-unknown-linux-gnu"
],
"rust_components": [
"rust-src",
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = [
keywords = ["axvisor", "config", "toml"]
repository = "https://github.com/arceos-hypervisor/axvmconfig"
description = "A simple VM configuration tool for ArceOS-Hypervisor."
license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" # MulanPubL2 is not included in SPDX
license = "Apache-2.0"

[features]
default = ["std"]
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.Apache2 → LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
submitted to the Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
Expand Down Expand Up @@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
674 changes: 0 additions & 674 deletions LICENSE.GPLv3

This file was deleted.

127 changes: 0 additions & 127 deletions LICENSE.MulanPSL2

This file was deleted.

Loading