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

Disable a few packages in default build, use partial filesystem to avoid incomplete build

Browse source
This commit is contained in:
Jeremy Soller 2017-05-12 20:37:59 -06:00
parent 01d728cbe0
commit aaa96bf329
3 changed files with 44 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
filesystem.toml
View file

@ -8,16 +8,16 @@ sysroot = "build/filesystem"
# Package settings # Package settings
[packages] [packages]
acid = {} #acid = {}
binutils = {} #binutils = {}
contain = {} contain = {}
coreutils = {} coreutils = {}
extrautils = {} extrautils = {}
games = {} #games = {}
init = {} init = {}
installer = {} installer = {}
ion = {} ion = {}
lua = {} #lua = {}
netstack = {} netstack = {}
netutils = {} netutils = {}
orbdata = {} orbdata = {}

9
mk/filesystem.mk
View file

@ -1,11 +1,11 @@
build/filesystem.bin: filesystem.toml build/filesystem.bin: filesystem.toml
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf $@ build/filesystem/ rm -rf $@ $@.partial build/filesystem/
dd if=/dev/zero of=$@ bs=1048576 count=128 dd if=/dev/zero of=$@.partial bs=1048576 count=128
cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs-mkfs $@ cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs-mkfs $@.partial
mkdir -p build/filesystem/ mkdir -p build/filesystem/
cargo build --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs cargo build --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs
cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs -- $@ build/filesystem/ cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs -- $@.partial build/filesystem/
sleep 2 sleep 2
pgrep redoxfs pgrep redoxfs
cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $< cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $<
@ -27,6 +27,7 @@ build/filesystem.bin: filesystem.toml
sync sync
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf build/filesystem/ rm -rf build/filesystem/
mv $@.partial $@
mount: FORCE mount: FORCE
mkdir -p build/filesystem/ mkdir -p build/filesystem/

53
mk/qemu.mk
View file

@ -28,28 +28,45 @@ endif
#,int,pcall #,int,pcall
#-device intel-iommu #-device intel-iommu
qemu: build/harddrive.bin build/extra.qcow2:
$(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw qemu-img create -f qcow2 $@ 256M
qemu_no_build: qemu: build/harddrive.bin build/extra.qcow2
$(QEMU) $(QEMUFLAGS) -drive file=build/harddrive.bin,format=raw $(QEMU) $(QEMUFLAGS) \
-drive file=build/harddrive.bin,format=raw \
-drive file=build/extra.qcow2
qemu_extra: build/harddrive.bin qemu_no_build: build/extra.qcow2
if [ ! -e build/extra.bin ]; then dd if=/dev/zero of=build/extra.bin bs=1048576 count=1024; fi $(QEMU) $(QEMUFLAGS) \
$(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw -drive file=build/extra.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL -drive file=build/harddrive.bin,format=raw \
-drive file=build/extra.qcow2
qemu_extra_no_build: qemu_nvme: build/harddrive.bin build/extra.qcow2
if [ ! -e build/extra.bin ]; then dd if=/dev/zero of=build/extra.bin bs=1048576 count=1024; fi $(QEMU) $(QEMUFLAGS) \
$(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw -drive file=build/extra.bin,format=raw -drive file=build/harddrive.bin,format=raw -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \
-drive file=build/extra.qcow2
qemu_live: build/livedisk.bin qemu_nvme_no_build: build/extra.qcow2
$(QEMU) $(QEMUFLAGS) -device usb-ehci,id=flash_bus -drive id=flash_drive,file=$<,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 $(QEMU) $(QEMUFLAGS) \
-drive file=build/harddrive.bin,format=raw -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \
-drive file=build/extra.qcow2
qemu_live_no_build: qemu_live: build/livedisk.bin build/extra.qcow2
$(QEMU) $(QEMUFLAGS) -device usb-ehci,id=flash_bus -drive id=flash_drive,file=build/livedisk.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 $(QEMU) $(QEMUFLAGS) \
-device usb-ehci,id=flash_bus -drive id=flash_drive,file=build/livedisk.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 \
-drive file=build/extra.qcow2
qemu_iso: build/livedisk.iso qemu_live_no_build: build/extra.qcow2
$(QEMU) $(QEMUFLAGS) -boot d -cdrom $< $(QEMU) $(QEMUFLAGS) \
-device usb-ehci,id=flash_bus -drive id=flash_drive,file=build/livedisk.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 \
-drive file=build/extra.qcow2
qemu_iso_no_build: qemu_iso: build/livedisk.iso build/extra.qcow2
$(QEMU) $(QEMUFLAGS) -boot d -cdrom build/livedisk.iso $(QEMU) $(QEMUFLAGS) \
-boot d -cdrom build/livedisk.iso \
-drive file=build/extra.qcow2
qemu_iso_no_build: build/extra.qcow2
$(QEMU) $(QEMUFLAGS) \
-boot d -cdrom build/livedisk.iso \
-drive file=build/extra.qcow2