Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clearify license text, add workround to use raw-cpuid #166

Merged
merged 3 commits into from Feb 3, 2021
Merged

clearify license text, add workround to use raw-cpuid #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55704c6
clearify license text, add workround to use raw-cpuid
stlankes Feb 2, 2021
35f4234
using the repo from the maintainer
stlankes Feb 2, 2021
05326d3
using the latest official version of the x86 crate
stlankes Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 4 additions & 36 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -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"]
Expand Down Expand Up @@ -44,7 +44,7 @@ smp = []
fsgsbase = []

[dev-dependencies]
x86 = { version = "0.35.*", default-features = false }
x86 = { version = "0.36.*", default-features = false }
float-cmp = "0.8.0"

[dependencies.scopeguard]
Expand Down Expand Up @@ -80,7 +80,7 @@ default-features = false
version = "0.6.*"

[target.'cfg(target_arch = "x86_64")'.dependencies.x86]
version = "0.35.*"
version = "0.36.*"
default-features = false

# The development profile, used for `cargo build`.
Expand Down