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

Add INSTALLER variable

Browse source
This commit is contained in:
Jeremy Soller 2020-05-22 19:56:04 -06:00
parent 92b9c3892f
commit 1e269d9fab
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mk/config.mk
View file

@ -46,6 +46,10 @@ KBUILD=build/kernel
## Userspace variables
export TARGET=$(ARCH)-unknown-redox
BUILD=build/userspace
INSTALLER=\
export REDOXER_TOOLCHAIN="$(ROOT)/$(PREFIX_INSTALL)" && \
export PATH="$(PREFIX_PATH):$$PATH" && \
installer/target/release/redox_installer $(INSTALLER_FLAGS)
## Bootloader variables
EFI_TARGET=$(ARCH)-efi-pe

6
mk/filesystem.mk
View file

@ -1,6 +1,6 @@
build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix
cargo build --manifest-path redoxfs/Cargo.toml --release
cargo build --manifest-path installer/Cargo.toml --release
cargo build --manifest-path redoxfs/Cargo.toml --release
-$(FUMOUNT) build/filesystem/ || true
rm -rf $@ $@.partial build/filesystem/
dd if=/dev/zero of=$@.partial bs=1048576 count="$(FILESYSTEM_SIZE)"
@ -14,9 +14,7 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix
cp build/kernel build/filesystem/kernel
cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
export REDOXER_TOOLCHAIN="$(ROOT)/$(PREFIX_INSTALL)" && \
export PATH="$(PREFIX_PATH):$$PATH" && \
installer/target/release/redox_installer $(INSTALLER_FLAGS) -c $< build/filesystem/
$(INSTALLER) -c $< build/filesystem/
sync
-$(FUMOUNT) build/filesystem/ || true
rm -rf build/filesystem/

12
mk/initfs.mk
View file

@ -1,23 +1,23 @@
build/initfs.tag: initfs.toml prefix
cargo build --manifest-path installer/Cargo.toml --release
rm -f build/libkernel.a
rm -rf build/initfs
mkdir -p build/initfs
export PATH="$(PREFIX_PATH):$$PATH" && \
cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs/
$(INSTALLER) -c $< build/initfs/
touch $@
build/initfs_coreboot.tag: initfs_coreboot.toml prefix
cargo build --manifest-path installer/Cargo.toml --release
rm -f build/libkernel_coreboot.a
rm -rf build/initfs_coreboot
mkdir -p build/initfs_coreboot
export PATH="$(PREFIX_PATH):$$PATH" && \
cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs_coreboot/
$(INSTALLER) -c $< build/initfs_coreboot/
touch $@
build/initfs_live.tag: initfs_live.toml prefix
cargo build --manifest-path installer/Cargo.toml --release
rm -f build/libkernel_live.a
rm -rf build/initfs_live
mkdir -p build/initfs_live
export PATH="$(PREFIX_PATH):$$PATH" && \
cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs_live/
$(INSTALLER) -c $< build/initfs_live/
touch $@