All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Michele Denber <denber@mindspring.com>
Cc: Thomas Huth <thuth@redhat.com>,
	Peter Tribble <peter.tribble@gmail.com>,
	QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PATCH] configure / util: Auto-detect the availability of openpty()
Date: Fri, 3 Jul 2020 17:50:53 +0100	[thread overview]
Message-ID: <CAFEAcA81y59yaOCW=QONy9EKv6Fdkkwb=XGJ786-N5du2+P9NQ@mail.gmail.com> (raw)
In-Reply-To: <5EFF5DFC.2060006@mindspring.com>

On Fri, 3 Jul 2020 at 17:38, Michele Denber <denber@mindspring.com> wrote:
>
> Oops, I hit Send before I was done.  I tried  the Haiku patch:
>
> diff --git a/util/Makefile.objs b/util/Makefile.objs
> index cc5e37177a..faebc13fac 100644
> --- a/util/Makefile.objs
> +++ b/util/Makefile.objs
> @@ -39,7 +39,7 @@ util-obj-y += qsp.o
>  util-obj-y += range.o
>  util-obj-y += stats64.o
>  util-obj-y += systemd.o
> -util-obj-$(CONFIG_POSIX) += drm.o
> +util-obj-$(CONFIG_LINUX) += drm.o
>  util-obj-y += guest-random.o
>  util-obj-$(CONFIG_GIO) += dbus.o
>  dbus.o-cflags = $(GIO_CFLAGS)
>
> but it didn't work:
>
> root@hemlock:~/qemu-5.0.0# gpatch -p1 < Makefile.objs.patch.diff
> patching file util/Makefile.objs
> Hunk #1 FAILED at 39.
> 1 out of 1 hunk FAILED -- saving rejects to file util/Makefile.objs.rej

This is because you're trying to apply the patch to the
5.0.0 release, but it was made against the current head-of-git,
and this file has changed a little between the two.
Generally we do all development against head-of-git, so
I would suggest that you try again with that.

As it happens, the current preferred fix for the drm.c issue
is this one:
https://patchew.org/QEMU/20200703145614.16684-1-peter.maydell@linaro.org/20200703145614.16684-10-peter.maydell@linaro.org/

thanks
-- PMM


  reply	other threads:[~2020-07-03 16:51 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-02 14:39 [PATCH] configure / util: Auto-detect the availability of openpty() Thomas Huth
2020-07-02 14:46 ` Daniel P. Berrangé
2020-07-02 16:07   ` Michele Denber
2020-07-02 17:38   ` Thomas Huth
2020-07-02 16:13 ` Michele Denber
2020-07-02 17:34   ` Thomas Huth
2020-07-02 21:33     ` Michele Denber
2020-07-03  5:11       ` Thomas Huth
2020-07-03 16:25         ` Michele Denber
2020-07-03 16:34         ` Michele Denber
2020-07-03 16:50           ` Peter Maydell [this message]
2020-07-03 18:49             ` gmake in Solaris 11.4: _IOR missing Michele Denber
2020-07-03 21:35               ` gmake in Solaris 11.4: TFR missing Michele Denber
2020-07-03 21:55                 ` Philippe Mathieu-Daudé
2020-07-04  9:11                   ` Peter Maydell
2020-07-04 11:30                     ` Philippe Mathieu-Daudé
2020-07-04 13:52                       ` Peter Maydell
2020-07-04 15:27                   ` Michele Denber
2020-07-04 12:02                 ` Thomas Huth
2020-07-04 15:36                   ` Michele Denber
2020-07-04 15:57                     ` Philippe Mathieu-Daudé
2020-07-04 19:15                       ` Michele Denber
2020-07-04 21:58                         ` Peter Maydell
2020-07-04 19:48                       ` Michele Denber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAFEAcA81y59yaOCW=QONy9EKv6Fdkkwb=XGJ786-N5du2+P9NQ@mail.gmail.com' \
    --to=peter.maydell@linaro.org \
    --cc=denber@mindspring.com \
    --cc=peter.tribble@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.