git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problems found by 'make syntax check'
[libguestfs.git]
/
images
/
Makefile.am
diff --git
a/images/Makefile.am
b/images/Makefile.am
index
b6b7f72
..
ff6bc5d
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 \
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 \
bin-i586-dynamic \
bin-sparc-dynamic \
bin-win32.exe \
@@
-35,20
+35,22
@@
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)/known-1 \
$(srcdir)/known-2 \
$(srcdir)/known-3 \
$(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 \
$(srcdir)/bin-i586-dynamic \
$(srcdir)/bin-sparc-dynamic \
$(srcdir)/bin-win32.exe \
@@
-61,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 \
@@
-72,11
+74,16
@@
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)
- 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
$(builddir)/100kallzeroes:
rm -f $@ $@-t
@@
-107,7
+114,7
@@
$(builddir)/10klines:
done > $@-t
mv $@-t $@
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 $@
rm -f $@ $@-t
for f in $^; do echo $$f; done | cpio -o -H newc | gzip --best > $@-t
mv $@-t $@