summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/qemu/Makefile7
-rw-r--r--emulators/qemu/PLIST5
-rw-r--r--emulators/qemu/distinfo15
-rw-r--r--emulators/qemu/options.mk15
-rw-r--r--emulators/qemu/patches/patch-Makefile.objs12
-rw-r--r--emulators/qemu/patches/patch-configure65
-rw-r--r--emulators/qemu/patches/patch-default-configs_pci.mak11
-rw-r--r--emulators/qemu/patches/patch-tests_Makefile8
8 files changed, 118 insertions, 20 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 39271952092..0e640449a64 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.143.2.1 2015/09/27 18:51:37 bsiegert Exp $
+# $NetBSD: Makefile,v 1.143.2.2 2015/12/22 20:21:43 bsiegert Exp $
-DISTNAME= qemu-2.4.0.1
+DISTNAME= qemu-2.5.0
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
EXTRACT_SUFX= .tar.bz2
@@ -80,7 +80,7 @@ PLIST.nbd= YES
CONFIGURE_ARGS+= --disable-coroutine-pool
.endif
-PLIST_VARS+= ${UE_ARCHS} nbd
+PLIST_VARS+= ${UE_ARCHS} nbd ivshmem
.for _var_ in ${USER_EMUL}
PLIST.${_var_}= YES
.endfor
@@ -97,6 +97,7 @@ post-install:
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/extension.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 69bc9e2fd55..6767737249f 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.43 2015/08/12 06:55:59 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.43.2.1 2015/12/22 20:21:43 bsiegert Exp $
+${PLIST.ivshmem}bin/ivshmem-client
+${PLIST.ivshmem}bin/ivshmem-server
${PLIST.alpha}bin/qemu-alpha
${PLIST.arm}bin/qemu-arm
${PLIST.armeb}bin/qemu-armeb
@@ -55,6 +57,7 @@ bin/qemu-system-xtensaeb
${PLIST.x86_64}bin/qemu-x86_64
man/man1/qemu-img.1
man/man1/qemu.1
+man/man8/qemu-ga.8
man/man8/qemu-nbd.8
share/doc/qemu/Makefile.multinode-NetBSD
share/doc/qemu/qemu-doc.html
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 7e1724ec3eb..d6801979580 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.105.2.1 2015/09/27 18:51:37 bsiegert Exp $
+$NetBSD: distinfo,v 1.105.2.2 2015/12/22 20:21:43 bsiegert Exp $
-SHA1 (qemu-2.4.0.1.tar.bz2) = 10701fb6fbb44646b2f655c6ab097cf7a04b2b52
-RMD160 (qemu-2.4.0.1.tar.bz2) = 203d22967bc29de0767c07cbc87a74df09a20d4b
-Size (qemu-2.4.0.1.tar.bz2) = 25068555 bytes
-SHA1 (patch-configure) = 2d0d2549056c9f53a932b236ed4d69a5ee58a856
+SHA1 (qemu-2.5.0.tar.bz2) = ed6c02a267f9edf98058743f0f76a25743a0dfe7
+RMD160 (qemu-2.5.0.tar.bz2) = 51007a50ddbeae1ba2c986e0cb0b110efeae2dc9
+SHA512 (qemu-2.5.0.tar.bz2) = 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3
+Size (qemu-2.5.0.tar.bz2) = 25464996 bytes
+SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92
+SHA1 (patch-configure) = 7ef7a8e1071edc56b317d214ec285ceecf08a68c
+SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18
SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
@@ -13,4 +16,4 @@ SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5
SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463
SHA1 (patch-memory.c) = f5193fb86a6fad5864477dafc4651d3d51147cc8
SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820
-SHA1 (patch-tests_Makefile) = 44ec206f8061274d0c0a7ca0d4a3e2dbe936fafa
+SHA1 (patch-tests_Makefile) = bd8997ea00eea05489335020ccae0e33dbcb84f9
diff --git a/emulators/qemu/options.mk b/emulators/qemu/options.mk
index eac6719eb9e..87b4b64d96d 100644
--- a/emulators/qemu/options.mk
+++ b/emulators/qemu/options.mk
@@ -1,12 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2011/02/28 17:49:30 wiz Exp $
+# $NetBSD: options.mk,v 1.1.38.1 2015/12/22 20:21:43 bsiegert Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qemu
-PKG_SUPPORTED_OPTIONS= sdl
+PKG_SUPPORTED_OPTIONS= sdl ivshmem
.include "../../mk/bsd.fast.prefs.mk"
+.if empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*)
+PKG_SUGGESTED_OPTIONS+= ivshmem
+.endif
+
.if empty(OPSYS:MDarwin)
-PKG_SUGGESTED_OPTIONS= sdl
+PKG_SUGGESTED_OPTIONS+= sdl
.endif
.include "../../mk/bsd.options.mk"
@@ -17,3 +21,8 @@ CONFIGURE_ARGS+= --enable-sdl
.else
CONFIGURE_ARGS+= --disable-sdl
.endif
+
+.if !empty(PKG_OPTIONS:Mivshmem)
+PLIST.ivshmem= yes
+.endif
+
diff --git a/emulators/qemu/patches/patch-Makefile.objs b/emulators/qemu/patches/patch-Makefile.objs
new file mode 100644
index 00000000000..97822f41025
--- /dev/null
+++ b/emulators/qemu/patches/patch-Makefile.objs
@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile.objs,v 1.1.2.2 2015/12/22 20:21:43 bsiegert Exp $
+
+--- Makefile.objs.orig 2015-12-16 22:04:47.000000000 +0000
++++ Makefile.objs
+@@ -109,5 +109,7 @@ qga-vss-dll-obj-y = qga/
+
+ ######################################################################
+ # contrib
++ifeq ($(CONFIG_SHM_OPEN),y)
+ ivshmem-client-obj-y = contrib/ivshmem-client/
+ ivshmem-server-obj-y = contrib/ivshmem-server/
++endif
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index f9245dffc5b..8971a64b084 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.6 2015/01/07 21:39:24 wiedi Exp $
+$NetBSD: patch-configure,v 1.6.6.1 2015/12/22 20:21:43 bsiegert Exp $
Don't use gld on SunOS
---- configure.orig 2014-12-09 14:45:40.000000000 +0000
+--- configure.orig 2015-12-16 22:04:48.000000000 +0000
+++ configure
-@@ -622,7 +622,6 @@ SunOS)
+@@ -650,7 +650,6 @@ SunOS)
solaris="yes"
make="${MAKE-gmake}"
install="${INSTALL-ginstall}"
@@ -11,3 +11,62 @@ Don't use gld on SunOS
smbd="${SMBD-/usr/sfw/sbin/smbd}"
needs_libsunmath="no"
solarisrev=`uname -r | cut -f2 -d.`
+@@ -3672,6 +3671,23 @@ if compile_prog "" "" ; then
+ fallocate_zero_range=yes
+ fi
+
++# check for shm_open
++shm_open=no
++cat > $TMPC << EOF
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++
++int main(void)
++{
++ shm_open(NULL, O_RDWR, 0644);
++ return 0;
++}
++EOF
++if compile_prog "" "-lrt" ; then
++ shm_open=yes
++fi
++
+ # check for posix_fallocate
+ posix_fallocate=no
+ cat > $TMPC << EOF
+@@ -3935,8 +3951,13 @@ fi
+ cat > $TMPC <<EOF
+ #include <signal.h>
+ #include <time.h>
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++
+ int main(void) {
+ timer_create(CLOCK_REALTIME, NULL, NULL);
++ shm_open(NULL, O_RDWR, 0644);
+ return clock_gettime(CLOCK_REALTIME, NULL);
+ }
+ EOF
+@@ -4568,7 +4589,9 @@ if test "$want_tools" = "yes" ; then
+ tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
+ if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
+ tools="qemu-nbd\$(EXESUF) $tools"
+- tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
++ if ["$shm_open" = "yes" ] ; then
++ tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
++ fi
+ fi
+ fi
+ if test "$softmmu" = yes ; then
+@@ -5049,6 +5072,9 @@ fi
+ if test "$fallocate_zero_range" = "yes" ; then
+ echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak
+ fi
++if test "$shm_open" = "yes" ; then
++ echo "CONFIG_SHM_OPEN=y" >> $config_host_mak
++fi
+ if test "$posix_fallocate" = "yes" ; then
+ echo "CONFIG_POSIX_FALLOCATE=y" >> $config_host_mak
+ fi
diff --git a/emulators/qemu/patches/patch-default-configs_pci.mak b/emulators/qemu/patches/patch-default-configs_pci.mak
new file mode 100644
index 00000000000..5a0b9b204ad
--- /dev/null
+++ b/emulators/qemu/patches/patch-default-configs_pci.mak
@@ -0,0 +1,11 @@
+$NetBSD: patch-default-configs_pci.mak,v 1.1.2.2 2015/12/22 20:21:43 bsiegert Exp $
+
+--- default-configs/pci.mak.orig 2015-12-16 22:04:48.000000000 +0000
++++ default-configs/pci.mak
+@@ -35,5 +35,5 @@ CONFIG_SDHCI=y
+ CONFIG_EDU=y
+ CONFIG_VGA=y
+ CONFIG_VGA_PCI=y
+-CONFIG_IVSHMEM=$(CONFIG_POSIX)
++CONFIG_IVSHMEM=$(CONFIG_SHM_OPEN)
+ CONFIG_ROCKER=y
diff --git a/emulators/qemu/patches/patch-tests_Makefile b/emulators/qemu/patches/patch-tests_Makefile
index a5d2d9ee027..255f450d39c 100644
--- a/emulators/qemu/patches/patch-tests_Makefile
+++ b/emulators/qemu/patches/patch-tests_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-tests_Makefile,v 1.2 2015/04/29 20:30:53 ryoon Exp $
+$NetBSD: patch-tests_Makefile,v 1.2.4.1 2015/12/22 20:21:43 bsiegert Exp $
Don't link -lutil on SunOS
---- tests/Makefile.orig 2015-04-27 14:08:27.000000000 +0000
+--- tests/Makefile.orig 2015-12-16 22:04:51.000000000 +0000
+++ tests/Makefile
-@@ -371,8 +371,10 @@ tests/test-qemu-opts$(EXESUF): tests/tes
- tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(block-obj-y) libqemuutil.a libqemustub.a
+@@ -539,8 +539,10 @@ tests/ivshmem-test$(EXESUF): tests/ivshm
+ tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
ifeq ($(CONFIG_POSIX),y)
+ifneq ($(CONFIG_SOLARIS),y)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 23:04:48 +0000