vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Bring in some coreutils

Browse source
This commit is contained in:
Jeremy Soller 2016-09-22 19:38:09 -06:00
parent 5721582f81
commit 9ce5628fa4
6 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -13,3 +13,6 @@
[submodule "openlibm"] [submodule "openlibm"]
path = openlibm path = openlibm
url = https://github.com/JuliaLang/openlibm.git url = https://github.com/JuliaLang/openlibm.git
[submodule "programs/coreutils"]
path = programs/coreutils
url = https://github.com/redox-os/coreutils.git

15
Makefile
View file

@ -145,12 +145,26 @@ initfs/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
strip $@ strip $@
rm $@.d rm $@.d
initfs/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir -p initfs/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@
rm $@.d
initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
mkdir -p initfs/bin mkdir -p initfs/bin
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
strip $@ strip $@
rm $@.d rm $@.d
coreutils: \
initfs/bin/cat \
initfs/bin/echo \
initfs/bin/env \
initfs/bin/ls \
initfs/bin/printenv \
initfs/bin/pwd
$(BUILD)/initfs.rs: \ $(BUILD)/initfs.rs: \
initfs/bin/pcid \ initfs/bin/pcid \
initfs/bin/ps2d \ initfs/bin/ps2d \
@ -158,6 +172,7 @@ $(BUILD)/initfs.rs: \
initfs/bin/init \ initfs/bin/init \
initfs/bin/ion \ initfs/bin/ion \
initfs/bin/login \ initfs/bin/login \
coreutils \
initfs/bin/example initfs/bin/example
echo 'use collections::BTreeMap;' > $@ echo 'use collections::BTreeMap;' > $@
echo 'pub fn gen() -> BTreeMap<&'"'"'static [u8], &'"'"'static [u8]> {' >> $@ echo 'pub fn gen() -> BTreeMap<&'"'"'static [u8], &'"'"'static [u8]> {' >> $@

2
kernel/lib.rs
View file

@ -129,7 +129,7 @@ pub fn cpu_id() -> usize {
} }
pub extern fn userspace_init() { pub extern fn userspace_init() {
assert_eq!(syscall::chdir(b"initfs:"), Ok(0)); assert_eq!(syscall::chdir(b"initfs:bin/"), Ok(0));
assert_eq!(syscall::open(b"debug:", 0), Ok(0)); assert_eq!(syscall::open(b"debug:", 0), Ok(0));
assert_eq!(syscall::open(b"debug:", 0), Ok(1)); assert_eq!(syscall::open(b"debug:", 0), Ok(1));

5
kernel/scheme/env.rs
View file

@ -22,8 +22,9 @@ impl EnvScheme {
pub fn new() -> EnvScheme { pub fn new() -> EnvScheme {
let mut files: BTreeMap<&'static [u8], &'static [u8]> = BTreeMap::new(); let mut files: BTreeMap<&'static [u8], &'static [u8]> = BTreeMap::new();
files.insert(b"HOME", b"initfs:"); files.insert(b"HOME", b"initfs:bin/");
files.insert(b"PWD", b"initfs:"); files.insert(b"PWD", b"initfs:bin/");
files.insert(b"PATH", b"initfs:bin/");
files.insert(b"COLUMNS", b"80"); files.insert(b"COLUMNS", b"80");
files.insert(b"LINES", b"30"); files.insert(b"LINES", b"30");

1
programs/coreutils Submodule

@ -0,0 +1 @@
Subproject commit 648a0d119aaed8f4cf8c856e05e47da421c4074a

2
programs/ion

@ -1 +1 @@
Subproject commit 4d87d44273ce1a408e833c7bc44312ad30c779ee Subproject commit cbb3c3003f654d09cd3b3cf1a179469bb1b558b3