mlokis/ableos-framebuffer
1
0
Fork 0
forked from koniifer/ableos
Code Pull requests Activity

The issue was trivial, Axel had std deps I didn't check

Browse source
This commit is contained in:
Able 2022-04-09 22:04:16 -05:00
parent 72457cc34e
commit 20482f57a3
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ableos/Cargo.lock generated
View file

@ -112,12 +112,12 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]] [[package]]
name = "axel" name = "axel"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.ablecorp.us/able/axel.git#2bd44d47d94158a85505581abbe526085ee62fb8" source = "git+https://git.ablecorp.us/able/aos_userland#a96bc8b896fdee392e8f26125298da6b4b21dd9a"
dependencies = [ dependencies = [
"hashbrown 0.12.0", "hashbrown 0.7.2",
"log", "log",
"logos", "logos",
"versioning", "versioning 0.1.2 (git+https://git.ablecorp.us/able/aos_userland)",
] ]
[[package]] [[package]]
@ -308,7 +308,7 @@ version = "0.1.2"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"log", "log",
"versioning", "versioning 0.1.2 (git+https://git.ablecorp.us/able/versioning)",
] ]
[[package]] [[package]]
@ -811,6 +811,14 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "versioning"
version = "0.1.2"
source = "git+https://git.ablecorp.us/able/aos_userland#a96bc8b896fdee392e8f26125298da6b4b21dd9a"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "versioning" name = "versioning"
version = "0.1.2" version = "0.1.2"

4
ableos/Cargo.toml
View file

@ -57,7 +57,7 @@ rhai = "1.5"
libwasm = {git="https://git.ablecorp.us:443/able/libwasm.git"} libwasm = {git="https://git.ablecorp.us:443/able/libwasm.git"}
acpi = "4.1.0" acpi = "4.1.0"
axel = { git = "https://git.ablecorp.us:443/able/axel.git" } axel = { git = "https://git.ablecorp.us/able/aos_userland" }
@ -75,7 +75,7 @@ default-features = false
path = "../kernel" path = "../kernel"
[dependencies.serde] [dependencies.serde]
version = "*" version = "1.0.136"
default-features = false default-features = false
features = ["derive", "alloc"] features = ["derive", "alloc"]

4
ableos/src/wasm_jumploader/mod.rs
View file

@ -76,7 +76,9 @@ pub fn interp() {
} }
if has_start && has_driver_entry { if has_start && has_driver_entry {
info!("Dual Program and Driver"); error!(
"A program should not have both a start function and a driver entry function. It Will be treated as a program."
);
} }
if has_start { if has_start {