From 20482f57a33daae9a27b80a777a1cbb7eacefde1 Mon Sep 17 00:00:00 2001
From: Able <abl3theabove@gmail.com>
Date: Sat, 9 Apr 2022 22:04:16 -0500
Subject: [PATCH] The issue was trivial, Axel had std deps I didn't check

---
 ableos/Cargo.lock                 | 16 ++++++++++++----
 ableos/Cargo.toml                 |  4 ++--
 ableos/src/wasm_jumploader/mod.rs |  4 +++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ableos/Cargo.lock b/ableos/Cargo.lock
index cce0e9d..e6982c7 100644
--- a/ableos/Cargo.lock
+++ b/ableos/Cargo.lock
@@ -112,12 +112,12 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 [[package]]
 name = "axel"
 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 = [
- "hashbrown 0.12.0",
+ "hashbrown 0.7.2",
  "log",
  "logos",
- "versioning",
+ "versioning 0.1.2 (git+https://git.ablecorp.us/able/aos_userland)",
 ]
 
 [[package]]
@@ -308,7 +308,7 @@ version = "0.1.2"
 dependencies = [
  "lazy_static",
  "log",
- "versioning",
+ "versioning 0.1.2 (git+https://git.ablecorp.us/able/versioning)",
 ]
 
 [[package]]
@@ -811,6 +811,14 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "versioning"
+version = "0.1.2"
+source = "git+https://git.ablecorp.us/able/aos_userland#a96bc8b896fdee392e8f26125298da6b4b21dd9a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "versioning"
 version = "0.1.2"
diff --git a/ableos/Cargo.toml b/ableos/Cargo.toml
index 8696132..5759869 100644
--- a/ableos/Cargo.toml
+++ b/ableos/Cargo.toml
@@ -57,7 +57,7 @@ rhai = "1.5"
 libwasm = {git="https://git.ablecorp.us:443/able/libwasm.git"}
 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"
 
 [dependencies.serde]
-version = "*"
+version = "1.0.136"
 default-features = false
 features = ["derive", "alloc"]
 
diff --git a/ableos/src/wasm_jumploader/mod.rs b/ableos/src/wasm_jumploader/mod.rs
index df62e46..6ce23e2 100644
--- a/ableos/src/wasm_jumploader/mod.rs
+++ b/ableos/src/wasm_jumploader/mod.rs
@@ -76,7 +76,9 @@ pub fn interp() {
             }
 
             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 {