diff options
| author | Thiago Abdo | 2019-10-25 14:06:58 +0200 |
|---|---|---|
| committer | Thiago Abdo | 2019-10-25 14:06:58 +0200 |
| commit | 1ae143c11fbca04fa69aaa5ed4cb684f9c48348d (patch) | |
| tree | 912a657539a47d94426127ebdb5321fd6a4857c2 | |
| parent | Make it possible to generate boot files from a specific image target (diff) | |
| download | packer-templates-1ae143c11fbca04fa69aaa5ed4cb684f9c48348d.tar.gz packer-templates-1ae143c11fbca04fa69aaa5ed4cb684f9c48348d.tar.xz packer-templates-1ae143c11fbca04fa69aaa5ed4cb684f9c48348d.zip | |
Fix base_image for using existing provisioned images
Signed-off-by: Thiago Abdo <tjabdo@inf.ufpr.br>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -151,7 +151,7 @@ $(PROVTARGETS): $(foreach flav, $(FLAVORS), %/$(flav)): %/base $(PROVTARGETS) $(REPROVTARGETS): $(eval FLAVOR := $(basename $(@F))) $(eval VERSION := $(if $(suffix $(@)), $(subst .,,$(suffix $(@))), 0)) - $(eval BASE_IMAGE := $(if $(wildcard $(@D)/build/rootfs-image),\ + $(eval BASE_IMAGE := $(if $(wildcard $(@)/build/rootfs-image),\ $(@)/build/rootfs-image,\ $(@D)/base/rootfs-image)) $(eval BUILD_DIR := $(@D)/$(FLAVOR).$(TIMESTAMP)) |