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

More fixes

main
rm-dr 2024-12-16 21:06:22 -08:00
parent 3207a2c7ee
commit d42db82558
17 changed files with 97 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitmodules vendored
View File

@ -3,25 +3,25 @@
url = https://gitlab.redox-os.org/redox-os/bootstrap.git
[submodule "components/sources/drivers"]
path = components/sources/drivers
url = https://gitlab.redox-os.org/redox-os/drivers.git
url = https://gitlab.redox-os.org/redox-os/drivers
[submodule "components/sources/init"]
path = components/sources/init
url = https://gitlab.redox-os.org/redox-os/init.git
url = https://gitlab.redox-os.org/redox-os/init
[submodule "components/sources/logd"]
path = components/sources/logd
url = https://gitlab.redox-os.org/redox-os/logd.git
url = https://gitlab.redox-os.org/redox-os/logd
[submodule "components/sources/ramfs"]
path = components/sources/ramfs
url = https://gitlab.redox-os.org/redox-os/ramfs.git
url = https://gitlab.redox-os.org/redox-os/ramfs
[submodule "components/sources/randd"]
path = components/sources/randd
url = https://gitlab.redox-os.org/redox-os/randd.git
url = https://gitlab.redox-os.org/redox-os/randd
[submodule "components/sources/redoxfs"]
path = components/sources/redoxfs
url = https://gitlab.redox-os.org/redox-os/redoxfs.git
url = https://gitlab.redox-os.org/redox-os/redoxfs
[submodule "components/sources/zerod"]
path = components/sources/zerod
url = https://gitlab.redox-os.org/redox-os/zerod.git
url = https://gitlab.redox-os.org/redox-os/zerod
[submodule "tools/initfs"]
path = tools/initfs
url = https://gitlab.redox-os.org/redox-os/redox-initfs.git

18
components/Makefile
View File

@ -19,20 +19,22 @@ export TARGET=x86_64-unknown-redox
all: \
$(BUILD)/bin/init $(BUILD)/bin/logd \
$(BUILD)/bin/ramfs $(BUILD)/bin/randd \
$(BUILD)/bin/redoxfs $(BUILD)/bin/zerod \
$(BUILD)/bin/redoxfs $(BUILD)/bin/zerod $(BUILD)/bin/nulld \
$(BUILD)/boot/bootstrap \
$(BUILD)/bin/acpid $(BUILD)/bin/fbcond \
$(BUILD)/bin/inputd $(BUILD)/bin/lived \
$(BUILD)/bin/nvmed $(BUILD)/bin/pcid \
$(BUILD)/lib/drivers/nvmed $(BUILD)/bin/pcid \
$(BUILD)/bin/vesad \
$(BUILD)/bin/ahcid $(BUILD)/bin/ided \
$(BUILD)/lib/drivers/ahcid $(BUILD)/lib/drivers/ided \
$(BUILD)/bin/ps2d \
$(BUILD)/bin/virtio-blkd $(BUILD)/bin/virtio-gpud \
$(BUILD)/etc/pcid/initfs.toml
$(BUILD)/lib/drivers/virtio-blkd $(BUILD)/lib/drivers/virtio-gpud \
$(BUILD)/etc/pcid/initfs.toml \
$(BUILD)/etc/init.rc
include make/simple
include make/bootstrap
include make/drivers
include make/zerod
$(BUILD)/etc/init.rc: ./init.rc
@mkdir -p $(BUILD)/etc
cp -v "init.rc" "$@"

24
components/init.rc Normal file
View File

@ -0,0 +1,24 @@
export PATH /bin
export RUST_BACKTRACE 1
nulld
zerod
randd
inputd
vesad G G G
unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
#TODO: unset FRAMEBUFFER1 and beyond?
fbcond 1 2
logd /scheme/debug /scheme/fbcon/1
stdio /scheme/log
ramfs logging
ps2d us
acpid
pcid /etc/pcid/initfs.toml
lived
unset DISK_LIVE_ADDR DISK_LIVE_SIZE
redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
unset REDOXFS_UUID REDOXFS_BLOCK REDOXFS_PASSWORD_ADDR REDOXFS_PASSWORD_SIZE
set-default-scheme file
cd /
export PATH /usr/bin
run.d /usr/lib/init.d /etc/init.d

73
components/make/drivers
View File

@ -1,12 +1,16 @@
# These are special
$(BUILD)/etc/pcid/initfs.toml: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/etc/pcid
cp sources/drivers/initfs.toml $@
$(BUILD)/bin/acpid: $(shell find ./sources/drivers -type f -not -path "*/target/*")
# These go in bin
$(BUILD)/bin/pcid: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p acpid
cp sources/drivers/target/x86_64-unknown-redox/release/acpid $@
$(CARGO) build --release --target x86_64-unknown-redox -p pcid
cp sources/drivers/target/x86_64-unknown-redox/release/pcid $@
$(BUILD)/bin/fbcond: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
@ -20,41 +24,17 @@ $(BUILD)/bin/inputd: $(shell find ./sources/drivers -type f -not -path "*/target
$(CARGO) build --release --target x86_64-unknown-redox -p inputd
cp sources/drivers/target/x86_64-unknown-redox/release/inputd $@
$(BUILD)/bin/lived: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p lived
cp sources/drivers/target/x86_64-unknown-redox/release/lived $@
$(BUILD)/bin/nvmed: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p nvmed
cp sources/drivers/target/x86_64-unknown-redox/release/nvmed $@
$(BUILD)/bin/pcid: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p pcid
cp sources/drivers/target/x86_64-unknown-redox/release/pcid $@
$(BUILD)/bin/vesad: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p vesad
cp sources/drivers/target/x86_64-unknown-redox/release/vesad $@
$(BUILD)/bin/ahcid: $(shell find ./sources/drivers -type f -not -path "*/target/*")
$(BUILD)/bin/lived: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p ahcid
cp sources/drivers/target/x86_64-unknown-redox/release/ahcid $@
$(BUILD)/bin/ided: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p ided
cp sources/drivers/target/x86_64-unknown-redox/release/ided $@
$(CARGO) build --release --target x86_64-unknown-redox -p lived
cp sources/drivers/target/x86_64-unknown-redox/release/lived $@
$(BUILD)/bin/ps2d: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
@ -62,14 +42,41 @@ $(BUILD)/bin/ps2d: $(shell find ./sources/drivers -type f -not -path "*/target/*
$(CARGO) build --release --target x86_64-unknown-redox -p ps2d
cp sources/drivers/target/x86_64-unknown-redox/release/ps2d $@
$(BUILD)/bin/virtio-blkd: $(shell find ./sources/drivers -type f -not -path "*/target/*")
$(BUILD)/bin/acpid: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p acpid
cp sources/drivers/target/x86_64-unknown-redox/release/acpid $@
# These go in lib
$(BUILD)/lib/drivers/nvmed: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/lib/drivers
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p nvmed
cp sources/drivers/target/x86_64-unknown-redox/release/nvmed $@
$(BUILD)/lib/drivers/ahcid: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/lib/drivers
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p ahcid
cp sources/drivers/target/x86_64-unknown-redox/release/ahcid $@
$(BUILD)/lib/drivers/ided: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/lib/drivers
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p ided
cp sources/drivers/target/x86_64-unknown-redox/release/ided $@
$(BUILD)/lib/drivers/virtio-blkd: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/lib/drivers
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p virtio-blkd
cp sources/drivers/target/x86_64-unknown-redox/release/virtio-blkd $@
$(BUILD)/bin/virtio-gpud: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
$(BUILD)/lib/drivers/virtio-gpud: $(shell find ./sources/drivers -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/lib/drivers
cd sources/drivers && \
$(CARGO) build --release --target x86_64-unknown-redox -p virtio-gpud
cp sources/drivers/target/x86_64-unknown-redox/release/virtio-gpud $@

6
components/make/simple
View File

@ -33,3 +33,9 @@ $(BUILD)/bin/zerod: $(shell find ./sources/zerod -type f -not -path "*/target/*"
cd sources/zerod && \
$(CARGO) build --release --target x86_64-unknown-redox --bin zerod
cp sources/zerod/target/x86_64-unknown-redox/release/zerod $@
$(BUILD)/bin/nulld: $(shell find ./sources/zerod -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/zerod && \
$(CARGO) build --release --target x86_64-unknown-redox --bin zerod
cp sources/zerod/target/x86_64-unknown-redox/release/zerod $@

29
components/make/zerod
View File

@ -1,29 +0,0 @@
$(BUILD)/bin/init: $(shell find ./sources/init -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/init && \
$(CARGO) build --release --target x86_64-unknown-redox
cp sources/init/target/x86_64-unknown-redox/release/init $@
$(BUILD)/bin/logd: $(shell find ./sources/logd -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/logd && \
$(CARGO) build --release --target x86_64-unknown-redox
cp sources/logd/target/x86_64-unknown-redox/release/logd $@
$(BUILD)/bin/ramfs: $(shell find ./sources/ramfs -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/ramfs && \
$(CARGO) build --release --target x86_64-unknown-redox
cp sources/ramfs/target/x86_64-unknown-redox/release/ramfs $@
$(BUILD)/bin/randd: $(shell find ./sources/randd -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/randd && \
$(CARGO) build --release --target x86_64-unknown-redox
cp sources/randd/target/x86_64-unknown-redox/release/randd $@
$(BUILD)/bin/redoxfs: $(shell find ./sources/redoxfs -type f -not -path "*/target/*")
@mkdir -p $(BUILD)/bin
cd sources/redoxfs && \
$(CARGO) build --release --target x86_64-unknown-redox
cp sources/redoxfs/target/x86_64-unknown-redox/release/redoxfs $@

1
components/sources/bootstrap Submodule

@ -0,0 +1 @@
Subproject commit 3891c09081b2cb678a8ac28994a0ee4398ed79e1

1
components/sources/drivers Submodule

@ -0,0 +1 @@
Subproject commit 5cf8bfda72b526d32eac6d8f094c4f37b1a7e555

1
components/sources/init Submodule

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

1
components/sources/logd Submodule

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

1
components/sources/ramfs Submodule

@ -0,0 +1 @@
Subproject commit 10e38e1571c82a73c98efb0edd32b45a9ff2fb7e

1
components/sources/randd Submodule

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

1
components/sources/redoxfs Submodule

@ -0,0 +1 @@
Subproject commit 90fbcab52e861a3c9d2187f70d6a50d518ef9d97

1
components/sources/zerod Submodule

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

3
tools/.gitignore vendored
View File

@ -1 +1,2 @@
bin
bin/redox-initfs-ar
bin/redox-initfs-dump

BIN
tools/bin/redox-initfs-ar
View File

Binary file not shown.

BIN
tools/bin/redox-initfs-dump
View File

Binary file not shown.