On Fri, 3 Jul 2020 at 17:38, Michele Denber <den...@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.mayd...@linaro.org/20200703145614.16684-10-peter.mayd...@linaro.org/ thanks -- PMM
