Mark/Redox-From-Scratch
Mark/Redox-From-Scratch
1
0
Fork 0
Code Issues Releases Activity

Compare commits

base: Mark:fbb975674f8877da66a2f0e489b7bce1e120de0f
Branches Tags
Mark:main
..
compare: Mark:0f42691db80f12dbb607b0de0bc12e76eba14110
Branches Tags
Mark:main

No commits in common. "fbb975674f8877da66a2f0e489b7bce1e120de0f" and "0f42691db80f12dbb607b0de0bc12e76eba14110" have entirely different histories.
fbb975674f ... 0f42691db8

4 changed files with 4 additions and 15 deletions
Show Stats Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -25,6 +25,3 @@
[submodule "tools/initfs"]
path = tools/initfs
url = https://gitlab.redox-os.org/redox-os/redox-initfs.git
[submodule "kernel"]
path = kernel
url = https://gitlab.redox-os.org/redox-os/kernel.git

4
Makefile
View File

@ -1,10 +1,6 @@
BUILD_DIR=./build
export QEMU?=qemu-system-x86_64
TOOLCHAIN = $(CURDIR)/tools/bin/x86_64-unknown-redox/toolchain
export PATH := $(TOOLCHAIN)/bin:$(PATH)
export CARGO := $(TOOLCHAIN)/bin/cargo
# Default rule
.PHONY: default
default: bios

1
kernel

@ -1 +0,0 @@
Subproject commit d4797bbf50aa294bce404b30570f0ab6d45753ed

11
make/filesystem
View File

@ -3,15 +3,12 @@ $(BUILD_DIR)/filesystem/boot/initfs: $(shell find ./components -type f -not -pat
rm -f $@
make -C tools
make -C components
./tools/bin/redox-initfs-ar \
./components/build \
./components/build/boot/bootstrap \
--output $@
./tools/bin/redox-initfs-ar --output $@ ./components/build
$(BUILD_DIR)/filesystem/boot/kernel: $(shell find ./kernel -type f -not -path "*/target/*")
$(BUILD_DIR)/filesystem/boot/kernel:
@mkdir -p $(BUILD_DIR)/filesystem/boot
cd ./kernel && make
cp -v kernel/kernel "$@"
rm -f $@
fallocate -l 1MiB $(BUILD_DIR)/filesystem/boot/kernel
$(BUILD_DIR)/filesystem.img: $(BUILD_DIR)/filesystem/boot/kernel $(BUILD_DIR)/filesystem/boot/initfs