Cole Robinson
2012-Dec-07 00:22 UTC
[Libguestfs] [PATCH v2] tests: Fix qemu-wrapper.sh generation
--- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2eebefa..560ebda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -352,11 +352,11 @@ check-with-upstream-qemu: check-with-upstream-qemu-1: $(top_builddir)/qemu-wrapper.sh $(QEMUBINARY) --version - $(MAKE) LIBGUESTFS_QEMU=$(top_builddir)/qemu-wrapper.sh check + $(MAKE) LIBGUESTFS_QEMU=$(abs_builddir)/qemu-wrapper.sh check $(top_builddir)/qemu-wrapper.sh: Makefile rm -f $@ $@-t - echo exec "$(QEMUBINARY)" -L "$(QEMUDIR)/pc-bios" "$$@" > $@-t + echo -e "#!/bin/sh\nexec" "$(QEMUBINARY)" -L "$(QEMUDIR)/pc-bios" \"\$$@\" > $@-t chmod +x,-w $@-t mv $@-t $@ -- 1.8.0
Richard W.M. Jones
2012-Dec-07 13:27 UTC
[Libguestfs] [PATCH v2] tests: Fix qemu-wrapper.sh generation
On Thu, Dec 06, 2012 at 07:22:32PM -0500, Cole Robinson wrote:> --- > Makefile.am | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 2eebefa..560ebda 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -352,11 +352,11 @@ check-with-upstream-qemu: > > check-with-upstream-qemu-1: $(top_builddir)/qemu-wrapper.sh > $(QEMUBINARY) --version > - $(MAKE) LIBGUESTFS_QEMU=$(top_builddir)/qemu-wrapper.sh check > + $(MAKE) LIBGUESTFS_QEMU=$(abs_builddir)/qemu-wrapper.sh check > > $(top_builddir)/qemu-wrapper.sh: MakefileDid you mean $(abs_top_builddir) ?> rm -f $@ $@-t > - echo exec "$(QEMUBINARY)" -L "$(QEMUDIR)/pc-bios" "$$@" > $@-t > + echo -e "#!/bin/sh\nexec" "$(QEMUBINARY)" -L "$(QEMUDIR)/pc-bios" \"\$$@\" > $@-t > chmod +x,-w $@-t > mv $@-t $@This seems OK. Not sure why I didn't have that amount of quoting before. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top