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

Update rust, update submodules, switch to new redoxfs

Browse source
This commit is contained in:
Jeremy Soller 2016-12-13 18:06:07 -07:00
parent 807889e167
commit 2272c1b154
5 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Makefile
View file

@ -13,10 +13,10 @@ KCARGOFLAGS=--target $(KTARGET).json --release -- -C soft-float
TARGET=$(ARCH)-unknown-redox TARGET=$(ARCH)-unknown-redox
BUILD=build/userspace BUILD=build/userspace
RUSTC=./rustc.sh RUSTC=./rustc.sh
RUSTCFLAGS=--target $(TARGET).json -C opt-level=2 -C debuginfo=0 RUSTCFLAGS=--target $(TARGET) -C opt-level=2 -C debuginfo=0
RUSTDOC=./rustdoc.sh RUSTDOC=./rustdoc.sh
CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
CARGOFLAGS=--target $(TARGET).json --release -- CARGOFLAGS=--target $(TARGET) --release --
# Default targets # Default targets
.PHONY: all live iso clean doc ref test update qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE .PHONY: all live iso clean doc ref test update qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE
@ -310,10 +310,10 @@ $(KBUILD)/librand.rlib: rust/src/librand/lib.rs $(KBUILD)/libcore.rlib
$(KBUILD)/liballoc.rlib: rust/src/liballoc/lib.rs $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib: rust/src/liballoc/lib.rs $(KBUILD)/libcore.rlib
$(KRUSTC) $(KRUSTCFLAGS) -o $@ $< $(KRUSTC) $(KRUSTCFLAGS) -o $@ $<
$(KBUILD)/librustc_unicode.rlib: rust/src/librustc_unicode/lib.rs $(KBUILD)/libcore.rlib $(KBUILD)/libstd_unicode.rlib: rust/src/libstd_unicode/lib.rs $(KBUILD)/libcore.rlib
$(KRUSTC) $(KRUSTCFLAGS) -o $@ $< $(KRUSTC) $(KRUSTCFLAGS) -o $@ $<
$(KBUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/librustc_unicode.rlib $(KBUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libstd_unicode.rlib
$(KRUSTC) $(KRUSTCFLAGS) -o $@ $< $(KRUSTC) $(KRUSTCFLAGS) -o $@ $<
$(KBUILD)/libkernel.a: kernel/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs $(KBUILD)/libkernel.a: kernel/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs
@ -336,13 +336,13 @@ $(BUILD)/libcore.rlib: rust/src/libcore/lib.rs
$(BUILD)/liballoc.rlib: rust/src/liballoc/lib.rs $(BUILD)/libcore.rlib $(BUILD)/liballoc.rlib: rust/src/liballoc/lib.rs $(BUILD)/libcore.rlib
$(RUSTC) $(RUSTCFLAGS) -o $@ $< $(RUSTC) $(RUSTCFLAGS) -o $@ $<
$(BUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(BUILD)/libcore.rlib $(BUILD)/liballoc.rlib $(BUILD)/librustc_unicode.rlib $(BUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(BUILD)/libcore.rlib $(BUILD)/liballoc.rlib $(BUILD)/libstd_unicode.rlib
$(RUSTC) $(RUSTCFLAGS) -o $@ $< $(RUSTC) $(RUSTCFLAGS) -o $@ $<
$(BUILD)/librand.rlib: rust/src/librand/lib.rs $(BUILD)/libcore.rlib $(BUILD)/librand.rlib: rust/src/librand/lib.rs $(BUILD)/libcore.rlib
$(RUSTC) $(RUSTCFLAGS) -o $@ $< $(RUSTC) $(RUSTCFLAGS) -o $@ $<
$(BUILD)/librustc_unicode.rlib: rust/src/librustc_unicode/lib.rs $(BUILD)/libcore.rlib $(BUILD)/libstd_unicode.rlib: rust/src/libstd_unicode/lib.rs $(BUILD)/libcore.rlib
$(RUSTC) $(RUSTCFLAGS) -o $@ $< $(RUSTC) $(RUSTCFLAGS) -o $@ $<
libstd/openlibm/libopenlibm.a: libstd/openlibm/libopenlibm.a:
@ -352,7 +352,7 @@ $(BUILD)/libopenlibm.a: libstd/openlibm/libopenlibm.a
mkdir -p $(BUILD) mkdir -p $(BUILD)
cp $< $@ cp $< $@
$(BUILD)/libstd.rlib: libstd/Cargo.toml rust/src/libstd/** $(BUILD)/libcore.rlib $(BUILD)/liballoc.rlib $(BUILD)/librustc_unicode.rlib $(BUILD)/libcollections.rlib $(BUILD)/librand.rlib $(BUILD)/libopenlibm.a $(BUILD)/libstd.rlib: libstd/Cargo.toml rust/src/libstd/** $(BUILD)/libcore.rlib $(BUILD)/liballoc.rlib $(BUILD)/libstd_unicode.rlib $(BUILD)/libcollections.rlib $(BUILD)/librand.rlib $(BUILD)/libopenlibm.a
$(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -o $@ $(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -o $@
cp libstd/target/$(TARGET)/release/deps/*.rlib $(BUILD) cp libstd/target/$(TARGET)/release/deps/*.rlib $(BUILD)
@ -563,12 +563,13 @@ build/filesystem.bin: \
filesystem/bin/tar filesystem/bin/tar
-$(FUMOUNT) build/filesystem/ -$(FUMOUNT) build/filesystem/
rm -rf $@ build/filesystem/ rm -rf $@ build/filesystem/
echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 128 dd if=/dev/zero of=$@ bs=1M count=128
cargo run --manifest-path schemes/redoxfs/Cargo.toml --release --bin redoxfs-mkfs $@
mkdir -p build/filesystem/ mkdir -p build/filesystem/
cargo build --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse --release cargo build --manifest-path schemes/redoxfs/Cargo.toml --release --bin redoxfs
schemes/redoxfs/target/release/redoxfs-fuse $@ build/filesystem/ & schemes/redoxfs/target/release/redoxfs $@ build/filesystem/
sleep 2 sleep 2
pgrep redoxfs-fuse pgrep redoxfs
cp -RL filesystem/* build/filesystem/ cp -RL filesystem/* build/filesystem/
chown -R 0:0 build/filesystem chown -R 0:0 build/filesystem
chown -R 1000:1000 build/filesystem/home/user chown -R 1000:1000 build/filesystem/home/user
@ -591,10 +592,10 @@ build/filesystem.bin: \
mount: FORCE mount: FORCE
mkdir -p build/filesystem/ mkdir -p build/filesystem/
cargo build --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse --release cargo build --manifest-path schemes/redoxfs/Cargo.toml --release --bin redoxfs
schemes/redoxfs/target/release/redoxfs-fuse build/harddrive.bin build/filesystem/ & schemes/redoxfs/target/release/redoxfs build/harddrive.bin build/filesystem/
sleep 2 sleep 2
pgrep redoxfs-fuse pgrep redoxfs
unmount: FORCE unmount: FORCE
sync sync

2
initfs/etc/init.rc
View file

@ -3,7 +3,7 @@ vesad T T T G
stdio display:1 stdio display:1
ps2d ps2d
pcid /etc/pcid.toml pcid /etc/pcid.toml
redoxfs disk:0 redoxfs disk:0 file
cd file: cd file:
export PATH file:/bin export PATH file:/bin
run /etc/init.rc run /etc/init.rc

2
programs/orbutils

@ -1 +1 @@
Subproject commit 47d4d2238d15b255ff7b9f9c43842cdf166f5e09 Subproject commit 50c09c453d51665175b8cc35e234336dd85099f0

2
rust

@ -1 +1 @@
Subproject commit daaa23187624543189e58fda5e5893c76252ff0a Subproject commit 98432be1e5b8500354f939cfd6e6c811d42f4f25

2
schemes/redoxfs

@ -1 +1 @@
Subproject commit f1073d0c4836ea76efe3bf3de2e0d9dc68d62354 Subproject commit d0c698a03109e5af31c0e40d874912c86be28f2f