From 6df94dde59f9565d1359bfaf81b2de882b4d48c6 Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Sat, 26 Mar 2022 20:47:49 +0100 Subject: [PATCH 1/5] Do not rebuild kernel when initfs changes --- mk/filesystem.mk | 3 ++- mk/initfs.mk | 5 ++--- mk/kernel.mk | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 5fab8d3..d2d2667 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -1,4 +1,4 @@ -build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix +build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix build/initfs.img cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path redoxfs/Cargo.toml --release @@ -21,6 +21,7 @@ build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix #TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include #TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib $(INSTALLER) -c $< build/filesystem/ + cp build/initfs.img build/filesystem/initfs sync -$(FUMOUNT) build/filesystem/ || true rm -rf build/filesystem/ diff --git a/mk/initfs.mk b/mk/initfs.mk index 3186a07..88ec65c 100644 --- a/mk/initfs.mk +++ b/mk/initfs.mk @@ -14,10 +14,9 @@ INITFS_RM_BINS=\ vboxd \ 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 installer/Cargo.toml --release - rm -f build/libkernel.a rm -rf build/initfs mkdir -p build/initfs $(INSTALLER) -c $< build/initfs/ @@ -26,4 +25,4 @@ build/initfs.tag: initfs.toml prefix for bin in $(INITFS_RM_BINS); do \ rm -f build/initfs/bin/$$bin; \ done - touch $@ + cargo run --manifest-path redox-initfs/tools/Cargo.toml --bin redox-initfs-ar -- build/initfs -o $@ diff --git a/mk/kernel.mk b/mk/kernel.mk index b3045e8..68ce69f 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -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 INITFS_FOLDER=$(ROOT)/build/initfs && \ cd kernel && \ cargo rustc --lib --target=$(ROOT)/kernel/targets/$(KTARGET).json --release -- -C soft-float -C debuginfo=2 -C lto --emit link=../$@ From 78551a15cded107483793f93ab91564b59cc7c75 Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Sun, 27 Mar 2022 19:03:33 +0200 Subject: [PATCH 2/5] Update bootloader and kernel. --- bootloader | 2 +- kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootloader b/bootloader index 2f86d3a..59a373b 160000 --- a/bootloader +++ b/bootloader @@ -1 +1 @@ -Subproject commit 2f86d3a70e406a5b19fb2686da82b0bc2c81db35 +Subproject commit 59a373b438b803e49adba3f7efd9b985d60e3415 diff --git a/kernel b/kernel index 87b3bef..3d21fc6 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 87b3bef06c13847a971aefd811a46dffa89adf46 +Subproject commit 3d21fc6bba7e07e9551a2416d9c2a366eb86ed44 From 3fd86aad4f6bd4b459a9cb950c6b59e49d9829de Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Tue, 29 Mar 2022 21:16:40 +0200 Subject: [PATCH 3/5] Add redox-initfs submodule --- .gitmodules | 3 +++ redox-initfs | 1 + 2 files changed, 4 insertions(+) create mode 160000 redox-initfs diff --git a/.gitmodules b/.gitmodules index aae6a32..af52bbf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ path = bootloader-coreboot url = https://gitlab.redox-os.org/redox-os/bootloader-coreboot.git branch = master +[submodule "redox-initfs"] + path = redox-initfs + url = https://gitlab.redox-os.org/redox-os/redox-initfs.git diff --git a/redox-initfs b/redox-initfs new file mode 160000 index 0000000..89b8fb8 --- /dev/null +++ b/redox-initfs @@ -0,0 +1 @@ +Subproject commit 89b8fb8984cf96c418880b7dcd9ce3d6afc3f71c From 34d9d49ae617b40e5455daa30098134628e020e2 Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Mon, 11 Apr 2022 22:54:05 +0200 Subject: [PATCH 4/5] Make prefix before other dependencies. --- mk/filesystem.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/filesystem.mk b/mk/filesystem.mk index d2d2667..1af4a93 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -1,4 +1,4 @@ -build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix build/initfs.img +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 installer/Cargo.toml --release cargo build --manifest-path redoxfs/Cargo.toml --release @@ -13,14 +13,14 @@ build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix b redoxfs/target/release/redoxfs $@.partial build/filesystem/ sleep 2 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/kernel build/filesystem/kernel mkdir -v build/filesystem/pkg 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)/lib build/filesystem/lib - $(INSTALLER) -c $< build/filesystem/ + $(INSTALLER) -c filesystem.toml build/filesystem/ cp build/initfs.img build/filesystem/initfs sync -$(FUMOUNT) build/filesystem/ || true From 10c92cef6171cecd77d66c3dd1e048fa6e197e1e Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Mon, 11 Apr 2022 23:14:54 +0200 Subject: [PATCH 5/5] Update submodules --- bootloader | 2 +- kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootloader b/bootloader index 59a373b..ec14ff8 160000 --- a/bootloader +++ b/bootloader @@ -1 +1 @@ -Subproject commit 59a373b438b803e49adba3f7efd9b985d60e3415 +Subproject commit ec14ff801c89954196a9d86e4d13176eeb84ab9e diff --git a/kernel b/kernel index 3d21fc6..8f06672 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 3d21fc6bba7e07e9551a2416d9c2a366eb86ed44 +Subproject commit 8f06672153c17fc6b7f9ed5d57a220164360b7e2