about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRen Kararou <[email protected]>2023-11-13 21:49:21 -0600
committerRen Kararou <[email protected]>2023-11-13 21:49:21 -0600
commit5ef49f8dcd87a23a4f8b12eec24ce25f3ab9e2bd (patch)
treedc5b328b44f58ed4ced5fe0507c052b9df2f76c0
parentb65d0617bca7bf85970854c728c37d935421ea14 (diff)
downloadk2spice-5ef49f8dcd87a23a4f8b12eec24ce25f3ab9e2bd.tar.gz
k2spice-5ef49f8dcd87a23a4f8b12eec24ce25f3ab9e2bd.tar.bz2
k2spice-5ef49f8dcd87a23a4f8b12eec24ce25f3ab9e2bd.zip
remove stretchgoal and update resolver
-rw-r--r--Cargo.toml4
-rw-r--r--README.md15
-rw-r--r--usr/src/kei/Cargo.toml12
-rw-r--r--usr/src/kei/src/main.rs4
4 files changed, 3 insertions, 32 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 490f945..bb63fd3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-
+resolver = "2"
 members = [
     # userspace commands
     "usr/src/mei/true",
@@ -7,6 +7,4 @@ members = [
     "usr/src/mei/yes",
     "usr/src/mei/echo",
     "usr/src/mei/printf",
-    # system
-    "usr/src/kei",
 ]
diff --git a/README.md b/README.md
index 9f2f07a..ce66ec4 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,12 @@
 # k2spice
 ## A CLA-approved opinionated userland
 
-This project started because I dislike GNU enough to do something about it.  All of the userland tools provided can be run on any system that rust compiles to.  An expanded scope showed me that I wanted very much to build lean system software to run on singleboard computers and microcontrollers, too.
+This project started because I dislike GNU enough to do something about it.  All of the userland tools provided can be run on any system that rust compiles to.
 
 ## Goals
 
 The first and primary goal is to build a statically-linkable, fully portable binary userland distribution not dissimilar to busybox.
 
-The secondary goal is to build lean mean system software to drop on microcontrollers, specifically, the Raspberry Pi Pico.
-
 ## Project Layout
 
 All source is stored in `usr/src/`.  This is to comply with the CDDL license.  Inside of `usr/src/` are the files:
@@ -18,14 +16,5 @@ All source is stored in `usr/src/`.  This is to comply with the CDDL license.  I
 
 Cargo.toml is the cargo file in which workspaces are defined.  OPENSOLARIS.LICENSE is the required CDDL license file.
 
-Additionally, there are some directories:
-
- * mei
- * kei
-
-The `mei` directory contains the source code for all userspace commands.  The `kei` directory contains the kernel source code.
-
-## Additional Notes
-
-Despite the Raspberry Pi foundation being on the no-no list, I have two Pico leftover from a project before the foundation went to shit.  This is a small time project for my own enjoyment.  If you don't wanna run it on a Pico, port it to a different platform!
+The `mei` directory contains the source code for all userspace commands.
 
diff --git a/usr/src/kei/Cargo.toml b/usr/src/kei/Cargo.toml
deleted file mode 100644
index 1d24f77..0000000
--- a/usr/src/kei/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "kei"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[[bin]]
-name = "kei"
-path = "src/main.rs"
-
-[dependencies]
diff --git a/usr/src/kei/src/main.rs b/usr/src/kei/src/main.rs
deleted file mode 100644
index b193299..0000000
--- a/usr/src/kei/src/main.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-fn main() {
-    // we're probably gonna have to go nostd on
-    // this and I'm mildly worried about that.
-}