Merge branch 'build'

- faster builds

Signed-off-by: Avi Kivity <avi@cloudius-systems.com>

Makefile

@@ -17,7 +17,7 @@ all: $(submake)
 	$(call quiet, $(silentant) ant -Dmode=$(mode) -Dout=$(abspath $(out)/tests/bench) \
 		-e -f tests/bench/build.xml $(if $V,,-q), ANT tests/bench)
 	cd mgmt && ./gradlew --daemon :web:jar build
-	$(MAKE) -C $(dir $(submake)) $@
+	$(MAKE) -r -C $(dir $(submake)) $@
 
 $(submake): Makefile
 	mkdir -p $(dir $@)

build.mk

@@ -561,7 +561,6 @@ usr.img: loader.img scripts/mkzfs.py usr.manifest $(jni)
 		glibcbase=$(glibcbase) -D miscbase=$(miscbase) -s $(zfs-start)
 	$(call quiet, dd if=loader.img of=$@ conv=notrunc > /dev/null 2>&1)
 	$(call quiet, $(src)/scripts/imgedit.py setpartition $@ 2 $(zfs-start) $(zfs-size), IMGEDIT $@)
-	$(call quiet, rm loader.img)
 
 $(jni): INCLUDES += -I /usr/lib/jvm/java/include -I /usr/lib/jvm/java/include/linux/