git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for version 1.0.79.
[libguestfs.git]
/
images
/
Makefile.am
diff --git
a/images/Makefile.am
b/images/Makefile.am
index
3c30df5
..
ff6bc5d
100644
(file)
--- a/
images/Makefile.am
+++ b/
images/Makefile.am
@@
-35,14
+35,14
@@
EXTRA_DIST = \
lib-x86_64.so \
test-grep.txt
lib-x86_64.so \
test-grep.txt
-noinst_DATA = test.
sqsh
+noinst_DATA = test.
iso
CLEANFILES = \
CLEANFILES = \
- test.sqsh \
+ test.
iso test.
sqsh \
100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
initrd
100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
initrd
-
squash
_files_src = \
+
images
_files_src = \
$(srcdir)/helloworld.tar \
$(srcdir)/helloworld.tar.gz \
$(srcdir)/empty \
$(srcdir)/helloworld.tar \
$(srcdir)/helloworld.tar.gz \
$(srcdir)/empty \
@@
-63,7
+63,7
@@
squash_files_src = \
$(srcdir)/lib-x86_64.so \
$(srcdir)/test-grep.txt
$(srcdir)/lib-x86_64.so \
$(srcdir)/test-grep.txt
-
squash
_files_build = \
+
images
_files_build = \
$(builddir)/100kallzeroes \
$(builddir)/100kallnewlines \
$(builddir)/100kallspaces \
$(builddir)/100kallzeroes \
$(builddir)/100kallnewlines \
$(builddir)/100kallspaces \
@@
-74,12
+74,14
@@
squash_files_build = \
$(builddir)/initrd-x86_64.img.gz \
$(builddir)/test-grep.txt.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)
+test.
iso: $(images
_files)
rm -f $@ $@-t
mkdir -p directory
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 $@
rmdir directory
mv $@-t $@