Skip to content

GitLab

Commit b338a468 authored by Antoine Kaufmann's avatar Antoine Kaufmann
Browse files

images: fix typo COMRESSED_IMAGES -> COMPRESSED_IMAGES

parent 529dba7d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
images/rules.mk
View file @ b338a468
...@@ -30,7 +30,7 @@ MEMCACHED_IMAGE := $(d)output-memcached/memcached ...@@ -30,7 +30,7 @@ MEMCACHED_IMAGE := $(d)output-memcached/memcached
NOPAXOS_IMAGE := $(d)output-nopaxos/nopaxos NOPAXOS_IMAGE := $(d)output-nopaxos/nopaxos
MTCP_IMAGE := $(d)output-mtcp/mtcp MTCP_IMAGE := $(d)output-mtcp/mtcp
TAS_IMAGE := $(d)output-tas/tas TAS_IMAGE := $(d)output-tas/tas
COMRESSED_IMAGES ?= false COMPRESSED_IMAGES ?= false
IMAGES := $(BASE_IMAGE) $(NOPAXOS_IMAGE) $(MEMCACHED_IMAGE) IMAGES := $(BASE_IMAGE) $(NOPAXOS_IMAGE) $(MEMCACHED_IMAGE)
RAW_IMAGES := $(addsuffix .raw,$(IMAGES)) RAW_IMAGES := $(addsuffix .raw,$(IMAGES))
...@@ -73,7 +73,7 @@ $(BASE_IMAGE): $(packer) $(QEMU) $(bz_image) $(m5_bin) $(kheader_tar) \ ...@@ -73,7 +73,7 @@ $(BASE_IMAGE): $(packer) $(QEMU) $(bz_image) $(m5_bin) $(kheader_tar) \
cp $(m5_bin) $(kheader_tar) $(guest_init) $(bz_image) $(kernel_config) \ cp $(m5_bin) $(kheader_tar) $(guest_init) $(bz_image) $(kernel_config) \
$(img_dir)/input-base/ $(img_dir)/input-base/
cd $(img_dir) && ./packer-wrap.sh base base base.pkr.hcl \ cd $(img_dir) && ./packer-wrap.sh base base base.pkr.hcl \
$(COMRESSED_IMAGES) $(COMPRESSED_IMAGES)
rm -rf $(img_dir)/input-base rm -rf $(img_dir)/input-base
touch $@ touch $@
...@@ -82,7 +82,7 @@ $(MEMCACHED_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \ ...@@ -82,7 +82,7 @@ $(MEMCACHED_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \
scripts/cleanup.sh) scripts/cleanup.sh)
rm -rf $(dir $@) rm -rf $(dir $@)
cd $(img_dir) && ./packer-wrap.sh base memcached \ cd $(img_dir) && ./packer-wrap.sh base memcached \
extended-image.pkr.hcl $(COMRESSED_IMAGES) extended-image.pkr.hcl $(COMPRESSED_IMAGES)
rm -rf $(img_dir)/input-base rm -rf $(img_dir)/input-base
touch $@ touch $@
...@@ -93,7 +93,7 @@ $(NOPAXOS_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \ ...@@ -93,7 +93,7 @@ $(NOPAXOS_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \
mkdir -p $(img_dir)/input-nopaxos mkdir -p $(img_dir)/input-nopaxos
cp $(img_dir)/nopaxos.config $(img_dir)/input-nopaxos/ cp $(img_dir)/nopaxos.config $(img_dir)/input-nopaxos/
cd $(img_dir) && ./packer-wrap.sh base nopaxos extended-image.pkr.hcl \ cd $(img_dir) && ./packer-wrap.sh base nopaxos extended-image.pkr.hcl \
$(COMRESSED_IMAGES) $(COMPRESSED_IMAGES)
touch $@ touch $@
$(MTCP_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \ $(MTCP_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \
...@@ -101,7 +101,7 @@ $(MTCP_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \ ...@@ -101,7 +101,7 @@ $(MTCP_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \
scripts/cleanup.sh) scripts/cleanup.sh)
rm -rf $(dir $@) rm -rf $(dir $@)
cd $(img_dir) && ./packer-wrap.sh base mtcp extended-image.pkr.hcl \ cd $(img_dir) && ./packer-wrap.sh base mtcp extended-image.pkr.hcl \
$(COMRESSED_IMAGES) $(COMPRESSED_IMAGES)
touch $@ touch $@
$(TAS_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \ $(TAS_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \
...@@ -109,7 +109,7 @@ $(TAS_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \ ...@@ -109,7 +109,7 @@ $(TAS_IMAGE): $(packer) $(QEMU) $(BASE_IMAGE) \
scripts/cleanup.sh) scripts/cleanup.sh)
rm -rf $(dir $@) rm -rf $(dir $@)
cd $(img_dir) && ./packer-wrap.sh base tas extended-image.pkr.hcl \ cd $(img_dir) && ./packer-wrap.sh base tas extended-image.pkr.hcl \
$(COMRESSED_IMAGES) $(COMPRESSED_IMAGES)
touch $@ touch $@
$(packer): $(packer):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment