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

Build repository outside of installer

Browse source
This commit is contained in:
Jeremy Soller 2022-09-12 07:51:13 -06:00
parent 25f4950761
commit 939b650125
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
6 changed files with 39 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Makefile
View file

@ -6,12 +6,11 @@ include mk/depends.mk
all: build/harddrive.img
coreboot: build/coreboot.elf
live: build/livedisk.iso
rebuild:
touch $(FILESYSTEM_CONFIG)
-$(FUMOUNT) build/filesystem/ || true
rm -rf build
$(MAKE) all
clean:
@ -32,24 +31,15 @@ pull:
git submodule sync --recursive
git submodule update --recursive --init
update:
cd cookbook && ./update.sh \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../$(FILESYSTEM_CONFIG))"
cargo update --manifest-path cookbook/pkgutils/Cargo.toml
cargo update --manifest-path installer/Cargo.toml
cargo update --manifest-path redoxfs/Cargo.toml
cargo update --manifest-path relibc/Cargo.toml
fetch: build/fetch.tag
fetch:
cargo build --manifest-path cookbook/Cargo.toml --release
cd cookbook && ./fetch.sh \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../$(FILESYSTEM_CONFIG))"
repo: build/repo.tag
# Cross compiler recipes
include mk/prefix.mk
# Bootloader recipes
include mk/bootloader.mk
# Repository maintenance
include mk/repo.mk
# Disk images
include mk/disk.mk
@ -62,7 +52,7 @@ include mk/virtualbox.mk
# CI image target
IMG_TAG?=$(shell git describe --tags)
ci-img: FORCE
$(MAKE) INSTALLER_FLAGS= \
$(MAKE) REPO_BINARY=1 \
build/harddrive.img.gz \
build/livedisk.iso.gz
rm -rf build/img
@ -73,9 +63,10 @@ ci-img: FORCE
# CI packaging target
ci-pkg: prefix FORCE
cargo build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
export PATH="$(PREFIX_PATH):$$PATH" && \
PACKAGES="$$(cargo run --manifest-path installer/Cargo.toml -- --list-packages -c ci.toml)" && \
PACKAGES="$$($(INSTALLER) --list-packages -c ci.toml)" && \
cd cookbook && \
./fetch.sh "$${PACKAGES}" && \
./repo.sh "$${PACKAGES}"
@ -107,11 +98,6 @@ FORCE:
%.gz: %
gzip -k -f $<
# Create a listing for any binary
%.list: %
export PATH="$(PREFIX_PATH):$$PATH" && \
$(OBJDUMP) -C -M intel -D $< > $@
# Wireshark
wireshark: FORCE
wireshark build/network.pcap