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

Merge branch '4lDO2/redox-external-initfs'

Browse source
This commit is contained in:
Jeremy Soller 2022-04-11 15:16:30 -06:00
parent 78801dabdd 10c92cef61
commit faaed356a3
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
7 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -34,3 +34,6 @@
path = bootloader-coreboot path = bootloader-coreboot
url = https://gitlab.redox-os.org/redox-os/bootloader-coreboot.git url = https://gitlab.redox-os.org/redox-os/bootloader-coreboot.git
branch = master branch = master
[submodule "redox-initfs"]
path = redox-initfs
url = https://gitlab.redox-os.org/redox-os/redox-initfs.git

2
bootloader

@ -1 +1 @@
Subproject commit 2f86d3a70e406a5b19fb2686da82b0bc2c81db35 Subproject commit ec14ff801c89954196a9d86e4d13176eeb84ab9e

2
kernel

@ -1 +1 @@
Subproject commit dc9e6eaf0c7cf23e67f0c8fe72d363be1dd3ebef Subproject commit 8f06672153c17fc6b7f9ed5d57a220164360b7e2

7
mk/filesystem.mk
View file

@ -1,4 +1,4 @@
build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/kernel build/initfs.img
cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path cookbook/Cargo.toml --release
cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release
cargo build --manifest-path redoxfs/Cargo.toml --release cargo build --manifest-path redoxfs/Cargo.toml --release
@ -13,14 +13,15 @@ build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix
redoxfs/target/release/redoxfs $@.partial build/filesystem/ redoxfs/target/release/redoxfs $@.partial build/filesystem/
sleep 2 sleep 2
pgrep redoxfs pgrep redoxfs
cp -v $< build/filesystem/filesystem.toml cp -v filesystem.toml build/filesystem/filesystem.toml
cp -v build/bootloader.bin build/filesystem/bootloader cp -v build/bootloader.bin build/filesystem/bootloader
cp -v build/kernel build/filesystem/kernel cp -v build/kernel build/filesystem/kernel
mkdir -v build/filesystem/pkg mkdir -v build/filesystem/pkg
cp -v cookbook/build/id_ed25519.pub.toml build/filesystem/pkg/id_ed25519.pub.toml cp -v cookbook/build/id_ed25519.pub.toml build/filesystem/pkg/id_ed25519.pub.toml
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include #TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib #TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
$(INSTALLER) -c $< build/filesystem/ $(INSTALLER) -c filesystem.toml build/filesystem/
cp build/initfs.img build/filesystem/initfs
sync sync
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf build/filesystem/ rm -rf build/filesystem/

5
mk/initfs.mk
View file

@ -14,10 +14,9 @@ INITFS_RM_BINS=\
vboxd \ vboxd \
xhcid xhcid
build/initfs.tag: initfs.toml prefix build/initfs.img: initfs.toml prefix
cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path cookbook/Cargo.toml --release
cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release
rm -f build/libkernel.a
rm -rf build/initfs rm -rf build/initfs
mkdir -p build/initfs mkdir -p build/initfs
$(INSTALLER) -c $< build/initfs/ $(INSTALLER) -c $< build/initfs/
@ -26,4 +25,4 @@ build/initfs.tag: initfs.toml prefix
for bin in $(INITFS_RM_BINS); do \ for bin in $(INITFS_RM_BINS); do \
rm -f build/initfs/bin/$$bin; \ rm -f build/initfs/bin/$$bin; \
done done
touch $@ cargo run --manifest-path redox-initfs/tools/Cargo.toml --bin redox-initfs-ar -- build/initfs -o $@

3
mk/kernel.mk
View file

@ -1,6 +1,5 @@
build/libkernel.a: kernel/Cargo.lock kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* kernel/src/*/*/*/* build/initfs.tag build/libkernel.a: kernel/Cargo.lock kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* kernel/src/*/*/*/*
export PATH="$(PREFIX_PATH):$$PATH" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
export INITFS_FOLDER=$(ROOT)/build/initfs && \
cd kernel && \ cd kernel && \
cargo rustc --lib --target=$(ROOT)/kernel/targets/$(KTARGET).json --release -- -C soft-float -C debuginfo=2 -C lto --emit link=../$@ cargo rustc --lib --target=$(ROOT)/kernel/targets/$(KTARGET).json --release -- -C soft-float -C debuginfo=2 -C lto --emit link=../$@

1
redox-initfs Submodule

@ -0,0 +1 @@
Subproject commit 89b8fb8984cf96c418880b7dcd9ce3d6afc3f71c