clearify license text, add workround to use raw-cpuid

The workaround should solve issue hermit-os#164 and is only necessry until gz/rust-x86#71 is accepted.
simonschoening · Feb 2, 2021 · e3507ab · e3507ab
1 parent ca2a4ad
commit e3507ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ authors = [
 	"Colin Finck <colin.finck@rwth-aachen.de>"
 ]
 build = "build.rs"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 readme = "README.md"
 keywords = ["unikernel", "libos"]
 categories = ["os"]
@@ -83,6 +83,9 @@ version = "0.6.*"
 version = "0.35.*"
 default-features = false
 
+[patch.crates-io]
+x86 = { git = "https://github.com/stlankes/rust-x86", branch = "master" }
+
 # The development profile, used for `cargo build`.
 [profile.dev]
 opt-level = 1      # controls the `--opt-level` the compiler builds with