tests: Use squashfs for static data where possible.

[libguestfs.git] / images / Makefile.am

diff --git a/images/Makefile.am b/images/Makefile.am
index b6b7f72..3c30df5 100644 (file)
--- 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 \
@@ -49,6 +49,8 @@ squash_files_src = \
        $(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 \
@@ -75,8 +77,11 @@ squash_files_build = \
 squash_files = $(squash_files_src) $(squash_files_build)
 
 test.sqsh: $(squash_files)
-       rm -f $@
-       $(MKSQUASHFS) $(squash_files) $@
+       rm -f $@ $@-t
+       mkdir -p directory
+       $(MKSQUASHFS) $(squash_files) directory $@-t
+       rmdir directory
+       mv $@-t $@
 
 $(builddir)/100kallzeroes:
        rm -f $@ $@-t
@@ -107,7 +112,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 $@