VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Make the other image/ targets depend on $(RAW_IMAGE). 

Instead of "image" so that if the raw image is built and up-to-date then it
need not be rebuilt to satisfy the other image targets.  This excludes the
stage4 "image" which of course is necessary to build the $(RAW_IMAGE)
target.
This commit is contained in:
Albert Hopkins 2015-02-28 22:30:01 +00:00
parent dff2e32481
commit c8c9bc1a1f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -287,14 +287,14 @@ endif
rm -f partitions device-map rm -f partitions device-map
mv $(RAW_IMAGE).tmp $(RAW_IMAGE) mv $(RAW_IMAGE).tmp $(RAW_IMAGE)
$(QCOW_IMAGE): image $(QCOW_IMAGE): $(RAW_IMAGE)
@scripts/echo Creating $(QCOW_IMAGE) @scripts/echo Creating $(QCOW_IMAGE)
qemu-img convert -f raw -O qcow2 -c $(RAW_IMAGE) $(QCOW_IMAGE).tmp qemu-img convert -f raw -O qcow2 -c $(RAW_IMAGE) $(QCOW_IMAGE).tmp
mv $(QCOW_IMAGE).tmp $(QCOW_IMAGE) mv $(QCOW_IMAGE).tmp $(QCOW_IMAGE)
qcow: $(QCOW_IMAGE) qcow: $(QCOW_IMAGE)
$(XVA_IMAGE): image $(XVA_IMAGE): $(RAW_IMAGE)
@scripts/echo Creating $(XVA_IMAGE) @scripts/echo Creating $(XVA_IMAGE)
xva.py --disk=$(RAW_IMAGE) --is-hvm --memory=256 --vcpus=1 --name=$(APPLIANCE) \ xva.py --disk=$(RAW_IMAGE) --is-hvm --memory=256 --vcpus=1 --name=$(APPLIANCE) \
--filename=$(XVA_IMAGE).tmp --filename=$(XVA_IMAGE).tmp
@ -303,7 +303,7 @@ $(XVA_IMAGE): image
xva: $(XVA_IMAGE) xva: $(XVA_IMAGE)
$(VMDK_IMAGE): image $(VMDK_IMAGE): $(RAW_IMAGE)
@scripts/echo Creating $(VMDK_IMAGE) @scripts/echo Creating $(VMDK_IMAGE)
qemu-img convert -f raw -O vmdk $(RAW_IMAGE) $(VMDK_IMAGE).tmp qemu-img convert -f raw -O vmdk $(RAW_IMAGE) $(VMDK_IMAGE).tmp
mv $(VMDK_IMAGE).tmp $(VMDK_IMAGE) mv $(VMDK_IMAGE).tmp $(VMDK_IMAGE)