X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=images%2FMakefile.am;h=68eb5506dccdb1c75db29d7d884de5a5e7185b97;hp=b1b4855c47af66ca7cd1abe7ef491a52c7ee8a78;hb=f7d18c84dde596699ffc5100fec2cf7b0d582450;hpb=4d900cdac8258daa2e99c6ceb2a4985154e94150

diff --git a/images/Makefile.am b/images/Makefile.am
index b1b4855..68eb550 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -37,18 +37,31 @@ EXTRA_DIST = \
 	lib-win64.dll \
 	lib-x86_64.so \
 	test-grep.txt \
-	make-dummy-fedora-img.sh
+	guest-aux/make-debian-img.sh \
+	guest-aux/debian-packages \
+	guest-aux/make-fedora-img.sh \
+	guest-aux/fedora-name.db.txt \
+	guest-aux/fedora-name.db \
+	guest-aux/fedora-packages.db.txt \
+	guest-aux/fedora-packages.db \
+	guest-aux/make-ubuntu-img.sh \
+	guest-aux/make-windows-img.sh \
+	guest-aux/windows-software \
+	guest-aux/windows-software.reg \
+	guest-aux/windows-system \
+	guest-aux/windows-system.reg \
+	guest-aux/minimal-hive
 
 noinst_DATA = test.iso
 
 # This is 'check_DATA' because we don't need it until 'make check'
 # time and we need the tools we have built in order to make it.
-check_DATA = fedora.img
+check_DATA = debian.img fedora.img ubuntu.img windows.img
 
 CLEANFILES = \
 	test.iso test.sqsh \
 	100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
-	initrd fedora.img
+	initrd $(check_DATA)
 
 images_files_src = \
 	$(srcdir)/helloworld.tar \
@@ -90,7 +103,7 @@ images_files = $(images_files_src) $(images_files_build)
 test.iso: $(images_files)
 	rm -f $@ $@-t
 	mkdir -p directory
-	$(MKISOFS) -J -r -graft-points \
+	$(GENISOIMAGE) -J -r -graft-points \
 	  -o $@-t \
 	  $(images_files) /directory=directory
 	rmdir directory
@@ -157,7 +170,56 @@ $(builddir)/test-grep.txt.gz: test-grep.txt
 	mv $@-t $@
 
 # Make a (dummy) Fedora image.
-fedora.img: make-dummy-fedora-img.sh
-	LIBGUESTFS_PATH=../appliance \
-	LD_LIBRARY_PATH=../src/.libs \
+fedora.img: guest-aux/make-fedora-img.sh \
+		guest-aux/fedora-name.db \
+		guest-aux/fedora-packages.db
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
 	bash $<
+
+guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
+	rm -f $@ $@-t
+	$(DB_LOAD) $@-t < $<
+	mv $@-t $@
+
+guest-aux/fedora-packages.db: guest-aux/fedora-packages.db.txt
+	rm -f $@ $@-t
+	$(DB_LOAD) $@-t < $<
+	mv $@-t $@
+
+# Make a (dummy) Debian image.
+debian.img: guest-aux/make-debian-img.sh
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
+	bash $<
+
+# Make a (dummy) Ubuntu image.
+ubuntu.img: guest-aux/make-ubuntu-img.sh
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
+	bash $<
+
+# Make a (dummy) Windows image.
+windows.img: guest-aux/make-windows-img.sh \
+	     guest-aux/windows-software guest-aux/windows-system
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
+	bash $<
+
+# Since users might not have the tools needed to create this, we
+# also distribute these files.
+guest-aux/windows-software: guest-aux/windows-software.reg
+	rm -f $@ $@-t
+	cp guest-aux/minimal-hive $@-t
+	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SOFTWARE' $<
+	mv $@-t $@
+
+guest-aux/windows-system: guest-aux/windows-system.reg
+	rm -f $@ $@-t
+	cp guest-aux/minimal-hive $@-t
+	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SYSTEM' $<
+	mv $@-t $@