Date: Fri, 2 Dec 2005 20:00:18 GMT From: Juergen Lock <nox@jelal.kn-bremen.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/89816: update emulators/qemu to 2005-11-30 snapshot Message-ID: <200512022000.jB2K0IF7079189@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/89816; it has been noted by GNATS.
From: Juergen Lock <nox@jelal.kn-bremen.de>
To: Marcus Alves Grando <mnag@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/89816: update emulators/qemu to 2005-11-30 snapshot
Date: Fri, 2 Dec 2005 20:49:03 +0100
On Fri, Dec 02, 2005 at 01:44:03AM +0000, Marcus Alves Grando wrote:
> Synopsis: update emulators/qemu to 2005-11-30 snapshot
>
> State-Changed-From-To: open->feedback
> State-Changed-By: mnag
> State-Changed-When: Fri Dec 2 01:43:33 GMT 2005
> State-Changed-Why:
> Patch patch-libmath2 failed to apply cleanly.
>
> # make checkpatch Notice: you can build qemu with the (alpha!) kqemu
> accelerator kernel module by defining WITH_KQEMU. Notice: if you need
>[...]
Ooops. Well the problem isnt patch-libmath2 (`make checkpatch' fails
there expectedly because that patch patches a file created by a previos
patch), but `make patch' fails as well because I patched qemu-img.1 when
I should have patched qemu-img.texi (the .1 gets created from it). If
you replace patch-qemu-img with the following then `make patch' works
and the port builds:
Index: files/patch-qemu-img
@@ -0,0 +1,29 @@
+Index: qemu/qemu-img.c
+@@ -134,7 +134,7 @@
+ "Command syntax:\n"
+ " create [-e] [-b base_image] [-f fmt] filename [size]\n"
+ " commit [-f fmt] filename\n"
+- " convert [-c] [-e] [-f fmt] filename [-O output_fmt] output_filename\n"
++ " convert [-c] [-e] [-f fmt] [-O output_fmt] filename output_filename\n"
+ " info [-f fmt] filename\n"
+ "\n"
+ "Command parameters:\n"
+Index: qemu/qemu-img.texi
+@@ -10,7 +10,7 @@
+ @table @option
+ @item create [-e] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}]
+ @item commit [-f @var{fmt}] @var{filename}
+-@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
++@item convert [-c] [-e] [-f @var{fmt}] [-O @var{output_fmt}] @var{filename} @var{output_filename}
+ @item info [-f @var{fmt}] @var{filename}
+ @end table
+
+@@ -83,7 +83,7 @@
+
+ Commit the changes recorded in @var{filename} in its base image.
+
+-@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
++@item convert [-c] [-e] [-f @var{fmt}] [-O @var{output_fmt}] @var{filename} @var{output_filename}
+
+ Convert the disk image @var{filename} to disk image @var{output_filename}
+ using format @var{output_fmt}. It can be optionnaly encrypted
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512022000.jB2K0IF7079189>