X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=images%2FMakefile.am;h=ff6bc5d531ce58729a5d24f5fe0b2ecbf0916c4a;hp=d4aed5520bf1924ac781f9c42c124c9652e7ebdb;hb=e645763007e7097c14c1c3ba94010f2e32e536bf;hpb=1f65b900f0f17a700035dea9a76b910504f4507c

diff --git a/images/Makefile.am b/images/Makefile.am
index d4aed55..ff6bc5d 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST = \
 	helloworld.tar \
 	helloworld.tar.gz \
 	mbr-ext2-empty.img.gz \
-	empty known-1 known-2 known-3 \
+	empty known-1 known-2 known-3 known-4 known-5 \
 	bin-i586-dynamic \
 	bin-sparc-dynamic \
 	bin-win32.exe \
@@ -32,23 +32,25 @@ EXTRA_DIST = \
 	lib-sparc.so \
 	lib-win32.dll \
 	lib-win64.dll \
-	lib-x86_64.so
+	lib-x86_64.so \
+	test-grep.txt
 
-
-noinst_DATA = test.sqsh
+noinst_DATA = test.iso
 
 CLEANFILES = \
-	test.sqsh \
+	test.iso test.sqsh \
 	100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
 	initrd
 
-squash_files_src = \
+images_files_src = \
 	$(srcdir)/helloworld.tar \
 	$(srcdir)/helloworld.tar.gz \
 	$(srcdir)/empty \
 	$(srcdir)/known-1 \
 	$(srcdir)/known-2 \
 	$(srcdir)/known-3 \
+	$(srcdir)/known-4 \
+	$(srcdir)/known-5 \
 	$(srcdir)/bin-i586-dynamic \
 	$(srcdir)/bin-sparc-dynamic \
 	$(srcdir)/bin-win32.exe \
@@ -58,9 +60,10 @@ squash_files_src = \
 	$(srcdir)/lib-sparc.so \
 	$(srcdir)/lib-win32.dll \
 	$(srcdir)/lib-win64.dll \
-	$(srcdir)/lib-x86_64.so
+	$(srcdir)/lib-x86_64.so \
+	$(srcdir)/test-grep.txt
 
-squash_files_build = \
+images_files_build = \
 	$(builddir)/100kallzeroes \
 	$(builddir)/100kallnewlines \
 	$(builddir)/100kallspaces \
@@ -68,13 +71,19 @@ squash_files_build = \
 	$(builddir)/10klines \
 	$(builddir)/initrd \
 	$(builddir)/initrd-x86_64.img \
-	$(builddir)/initrd-x86_64.img.gz
+	$(builddir)/initrd-x86_64.img.gz \
+	$(builddir)/test-grep.txt.gz
 
-squash_files = $(squash_files_src) $(squash_files_build)
+images_files = $(images_files_src) $(images_files_build)
 
-test.sqsh: $(squash_files)
-	rm -f $@
-	$(MKSQUASHFS) $(squash_files) $@
+test.iso: $(images_files)
+	rm -f $@ $@-t
+	mkdir -p directory
+	$(MKISOFS) -J -r -graft-points \
+	  -o $@-t \
+	  $(images_files) /directory=directory
+	rmdir directory
+	mv $@-t $@
 
 $(builddir)/100kallzeroes:
 	rm -f $@ $@-t
@@ -105,7 +114,7 @@ $(builddir)/10klines:
 	done > $@-t
 	mv $@-t $@
 
-$(builddir)/initrd: empty known-1 known-2 known-3
+$(builddir)/initrd: empty known-1 known-2 known-3 known-4 known-5
 	rm -f $@ $@-t
 	for f in $^; do echo $$f; done | cpio -o -H newc | gzip --best > $@-t
 	mv $@-t $@
@@ -124,3 +133,8 @@ $(builddir)/initrd-x86_64.img.gz: initrd-x86_64.img
 	rm -f $@ $@-t
 	gzip --best -c $< > $@-t
 	mv $@-t $@
+
+$(builddir)/test-grep.txt.gz: test-grep.txt
+	rm -f $@ $@-t
+	gzip --best -c $< > $@-t
+	mv $@-t $@