pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qemu-git: Improve ivshmem patch for upstream



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue May 30 08:02:36 2017 +0200
Changeset:	e339003b0445ce88b781debb706d476e4422ada3

Modified Files:
	qemu-git/distinfo
	qemu-git/patches/patch-configure
Added Files:
	qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs
	qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs

Log Message:
qemu-git: Improve ivshmem patch for upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e339003b0445ce88b781debb706d476e4422ada3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-git/distinfo                                           | 4 +++-
 qemu-git/patches/patch-configure                            | 2 +-
 qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs | 7 +++++++
 qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs | 7 +++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index d8b325b59f..e7c9624b31 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -4,7 +4,9 @@ SHA1 (qemu-2.8.1.tar.bz2) = 224289c5e568e400920363820a0647e2aca569e7
 RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a
 SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
 Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
-SHA1 (patch-configure) = 2b47ff025df21276443a3a45b9ea098964c9cd43
+SHA1 (patch-configure) = 9a36da2b276df7231821291520b2617959c30e93
+SHA1 (patch-contrib_ivshmem-client_Makefile.objs) = 84c86619bba6ff1b6ca3875e176c5e0b084ed853
+SHA1 (patch-contrib_ivshmem-server_Makefile.objs) = 146a59da648864ff43d6e5807e8e3f94c2242338
 SHA1 (patch-disas_libvixl_Makefile.objs) = 5bc8da5c29c95d18d415fad5936e7c2bf9d48b57
 SHA1 (patch-qemu-nbd.c) = 191b4082aedd0e5b8cc03aa20bc13b415a9df5b4
 SHA1 (patch-util_main-loop.c) = 06ef4669bd63cf05b0c57ceda639b09101471e12
diff --git a/qemu-git/patches/patch-configure b/qemu-git/patches/patch-configure
index 5289b5de5f..82e20c6e79 100644
--- a/qemu-git/patches/patch-configure
+++ b/qemu-git/patches/patch-configure
@@ -23,7 +23,7 @@ $NetBSD$
    if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
      tools="qemu-nbd\$(EXESUF) $tools"
 +  fi
-+  if [ "$eventfd" != "no" ]; then
++  if [ "$eventfd" = "yes" ]; then
      tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
    fi
  fi
diff --git a/qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs b/qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs
new file mode 100644
index 0000000000..9ea45e9a7a
--- /dev/null
+++ b/qemu-git/patches/patch-contrib_ivshmem-client_Makefile.objs
@@ -0,0 +1,7 @@
+$NetBSD$
+
+--- contrib/ivshmem-client/Makefile.objs.orig	2017-04-25 12:42:53.000000000 +0000
++++ contrib/ivshmem-client/Makefile.objs
+@@ -1 +1 @@
+-ivshmem-client-obj-y = ivshmem-client.o main.o
++ivshmem-client-obj-$(CONFIG_IVSHMEM) = ivshmem-client.o main.o
diff --git a/qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs b/qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs
new file mode 100644
index 0000000000..286f0e80d8
--- /dev/null
+++ b/qemu-git/patches/patch-contrib_ivshmem-server_Makefile.objs
@@ -0,0 +1,7 @@
+$NetBSD$
+
+--- contrib/ivshmem-server/Makefile.objs.orig	2017-04-25 12:42:53.000000000 +0000
++++ contrib/ivshmem-server/Makefile.objs
+@@ -1 +1 @@
+-ivshmem-server-obj-y = ivshmem-server.o main.o
++ivshmem-server-obj-$(CONFIG_IVSHMEM) = ivshmem-server.o main.o


Home | Main Index | Thread Index | Old Index