Skip to content
Snippets Groups Projects
Commit a2f4d6f6 authored by Asias He's avatar Asias He Committed by Pekka Enberg
Browse files

build: Fix Revert "build: Skip rebuild of usr.img on osv.vmdk and osv.vdi target"


1) Adding usr.img dependency to Makefile is broken because no usr.img
target is in Makefile. (It happened to work for me because I have a
file named usr.img under src/osv)

2) Adding usr.img dependency to build.mk will cause the rebuild of usr.img for some reason.

	osv.vmdk osv.vdi: usr.img
		...
	.PHONY: osv.vmdk osv.vdi

So, in order to build correct images. Let's drop the usr.img dependency
completely for now before we can fix issue 2).

Signed-off-by: default avatarAsias He <asias@cloudius-systems.com>
Signed-off-by: default avatarPekka Enberg <penberg@cloudius-systems.com>
parent db09228b
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,7 @@ check: export image ?= tests ...@@ -44,7 +44,7 @@ check: export image ?= tests
check: all check: all
./scripts/test.py ./scripts/test.py
osv.vmdk osv.vdi: all osv.vmdk osv.vdi:
$(MAKE) -r -C $(dir $(submake)) $@ $(MAKE) -r -C $(dir $(submake)) $@
.PHONY: osv.vmdk osv.vdi .PHONY: osv.vmdk osv.vdi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment