public
/
toolchain
5
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

cache loading of toolchain.tar

This commit is contained in:
Lance Vick 2023-02-15 13:57:45 -08:00
parent 7a2917d37a
commit 8c2e4b6ad1
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -3,7 +3,7 @@ ARCH := $(or $(ARCH),x86_64)
TARGET := $(or $(TARGET),$(ARCH)) TARGET := $(or $(TARGET),$(ARCH))
PLATFORM := $(or $(PLATFORM),linux) PLATFORM := $(or $(PLATFORM),linux)
NAME := $(shell basename $(shell git rev-parse --show-toplevel | tr A-Z a-z )) NAME := $(shell basename $(shell git rev-parse --show-toplevel | tr A-Z a-z ))
IMAGE := local/$(NAME):latest IMAGE := local/$(NAME)
USER := $(shell id -u):$(shell id -g) USER := $(shell id -u):$(shell id -g)
CPUS := $(shell docker run -it debian nproc) CPUS := $(shell docker run -it debian nproc)
GIT_REF := $(shell git log -1 --format=%H) GIT_REF := $(shell git log -1 --format=%H)
@ -53,6 +53,7 @@ toolchain: \
$(BIN_DIR) \ $(BIN_DIR) \
$(OUT_DIR) \ $(OUT_DIR) \
$(CACHE_DIR_ROOT)/toolchain.tar \ $(CACHE_DIR_ROOT)/toolchain.tar \
$(CACHE_DIR_ROOT)/toolchain.state \
$(CACHE_DIR_ROOT)/toolchain.env $(CACHE_DIR_ROOT)/toolchain.env
# Launch a shell inside the toolchain container # Launch a shell inside the toolchain container
@ -125,6 +126,11 @@ $(CACHE_DIR_ROOT)/toolchain.tar: \
. .
docker save "$(IMAGE)" -o "$@" docker save "$(IMAGE)" -o "$@"
$(CACHE_DIR_ROOT)/toolchain.state: \
$(CACHE_DIR_ROOT)/toolchain.tar
docker load -i $(CACHE_DIR_ROOT)/toolchain.tar
docker images --no-trunc --quiet $(IMAGE) > $@
$(DIST_DIR)/release.env: \ $(DIST_DIR)/release.env: \
$(DIST_DIR) \ $(DIST_DIR) \
$(OUT_DIR)/release.env $(OUT_DIR)/release.env
@ -193,7 +199,6 @@ define fetch_pgp_key
endef endef
define toolchain define toolchain
docker load -i $(CACHE_DIR_ROOT)/toolchain.tar
docker run \ docker run \
--rm \ --rm \
--tty \ --tty \
@ -205,6 +210,6 @@ define toolchain
--workdir /home/build \ --workdir /home/build \
--env-file=$(CONFIG_DIR)/global.env \ --env-file=$(CONFIG_DIR)/global.env \
--env-file=$(CACHE_DIR_ROOT)/toolchain.env \ --env-file=$(CACHE_DIR_ROOT)/toolchain.env \
$(IMAGE) \ $(shell cat cache/toolchain.state) \
bash -c $(2) bash -c $(2)
endef endef