From: Antti Kantee <pooka@iki.fi>
Date: Fri, 19 Dec 2014 02:51:39 +0000 (+0000)
Subject: create test.ffs in makefile instead of buildxen.sh
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=404885b3f4cdf69199013674294cb67214ec6133;p=rumpuser-xen.git

create test.ffs in makefile instead of buildxen.sh
---

diff --git a/Makefile b/Makefile
index 3c9bcbd..18f3359 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ $(OBJ_DIR)/%.o: %.c $(HDRS) $(EXTRA_DEPS)
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 .PHONY: default
-default: prepare mini-os rumprun app-tools tests rump-kernel
+default: prepare mini-os rumprun app-tools tests rump-kernel img/test.ffs
 
 .PHONY: prepare
 prepare:
@@ -123,6 +123,9 @@ STDTESTS=tests/libstdtests/rumpkern_demo.c tests/libstdtests/pthread_test.c
 rump-kernel: ${STDTESTS} httpd
 	app-tools/rumpapp-xen-cc -o $@ ${STDTESTS} httpd/*.o
 
+img/test.ffs:
+	cp img/test_clean.ffs img/test.ffs
+
 .PHONY: clean arch_clean app-tools_clean
 
 clean:	app-tools_clean
diff --git a/buildxen.sh b/buildxen.sh
index 44af209..6f1f65d 100755
--- a/buildxen.sh
+++ b/buildxen.sh
@@ -78,8 +78,6 @@ for lib in ${LIBS}; do
 	makeuserlib ${lib}
 done
 
-[ ! -f img/test.ffs ] && cp img/test_clean.ffs img/test.ffs
-
 # build the domU image
 make