Disable test for RHBZ#576879 comment 5.

[libguestfs.git] / images / Makefile.am

diff --git a/images/Makefile.am b/images/Makefile.am
index 3c30df5..771018f 100644 (file)
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -15,12 +15,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 # Old RHEL 5 autoconf doesn't have builddir.
 builddir ?= $(top_builddir)/images
 
 EXTRA_DIST = \
        helloworld.tar \
        helloworld.tar.gz \
+       helloworld.tar.xz \
        mbr-ext2-empty.img.gz \
        empty known-1 known-2 known-3 known-4 known-5 \
        bin-i586-dynamic \
@@ -35,16 +38,17 @@ EXTRA_DIST = \
        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)/helloworld.tar.xz \
        $(srcdir)/empty \
        $(srcdir)/known-1 \
        $(srcdir)/known-2 \
@@ -63,23 +67,27 @@ squash_files_src = \
        $(srcdir)/lib-x86_64.so \
        $(srcdir)/test-grep.txt
 
-squash_files_build = \
+images_files_build = \
        $(builddir)/100kallzeroes \
        $(builddir)/100kallnewlines \
        $(builddir)/100kallspaces \
        $(builddir)/100krandom \
        $(builddir)/10klines \
+       $(builddir)/abssymlink \
+       $(builddir)/hello.b64 \
        $(builddir)/initrd \
        $(builddir)/initrd-x86_64.img \
        $(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)
+test.iso: $(images_files)
        rm -f $@ $@-t
        mkdir -p directory
-       $(MKSQUASHFS) $(squash_files) directory $@-t
+       $(MKISOFS) -J -r -graft-points \
+         -o $@-t \
+         $(images_files) /directory=directory
        rmdir directory
        mv $@-t $@
 
@@ -112,6 +120,12 @@ $(builddir)/10klines:
        done > $@-t
        mv $@-t $@
 
+$(builddir)/abssymlink:
+       ln -sf /10klines $@
+
+$(builddir)/hello.b64:
+       echo "hello" | base64 > $@
+
 $(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