Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
sambuc
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emulators/qemu/Makefile
+35 -5
View File
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.143 2015/08/18 07:31:07 wiz Exp $
# $NetBSD: Makefile,v 1.154 2016/09/04 09:21:04 ryoon Exp $
DISTNAME= qemu-2.4.0
PKGREVISION= 2
DISTNAME= qemu-2.7.0
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
EXTRACT_SUFX= .tar.bz2
@@ -36,13 +35,43 @@ CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
CONFIGURE_ARGS+= --enable-curses
#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X
CONFIGURE_ARGS+= --disable-opengl
CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-i386
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-lm32
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-m68k
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblaze
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblazeel
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64el
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mipsel
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-moxie
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-or32
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppc
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppc64
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppcemb
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-s390x
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4eb
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc64
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-tricore
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-unicore32
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-x86_64
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensa
NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensaeb
PKG_SYSCONFSUBDIR= qemu
REPLACE_PERL+= scripts/texi2pod.pl
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported yet as of 1.7.0
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported yet as of 1.7.0
BUILDLINK_PASSTHRU_DIRS+= /usr/lib
BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
@@ -81,7 +110,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
@@ -98,6 +127,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"
emulators/qemu/PLIST
+8 -4
View File
@@ -1,4 +1,6 @@
@comment $NetBSD: PLIST,v 1.43 2015/08/12 06:55:59 ryoon Exp $
@comment $NetBSD: PLIST,v 1.47 2016/09/04 09:21:04 ryoon 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
@@ -67,11 +70,13 @@ share/qemu/bamboo.dtb
share/qemu/bios-256k.bin
share/qemu/bios.bin
share/qemu/efi-e1000.rom
share/qemu/efi-e1000e.rom
share/qemu/efi-eepro100.rom
share/qemu/efi-ne2k_pci.rom
share/qemu/efi-pcnet.rom
share/qemu/efi-rtl8139.rom
share/qemu/efi-virtio.rom
share/qemu/efi-vmxnet3.rom
share/qemu/keymaps/ar
share/qemu/keymaps/bepo
share/qemu/keymaps/common
@@ -111,6 +116,7 @@ share/qemu/keymaps/th
share/qemu/keymaps/tr
share/qemu/kvmvapic.bin
share/qemu/linuxboot.bin
share/qemu/linuxboot_dma.bin
share/qemu/multiboot.bin
share/qemu/openbios-ppc
share/qemu/openbios-sparc32
@@ -125,15 +131,13 @@ share/qemu/pxe-ne2k_pci.rom
share/qemu/pxe-pcnet.rom
share/qemu/pxe-rtl8139.rom
share/qemu/pxe-virtio.rom
share/qemu/q35-acpi-dsdt.aml
share/qemu/qemu-icon.bmp
share/qemu/qemu_logo_no_text.svg
share/qemu/s390-ccw.img
share/qemu/s390-zipl.rom
share/qemu/sgabios.bin
share/qemu/slof.bin
share/qemu/spapr-rtas.bin
share/qemu/trace-events
share/qemu/trace-events-all
share/qemu/u-boot.e500
share/qemu/vgabios-cirrus.bin
share/qemu/vgabios-qxl.bin
emulators/qemu/PLIST.Linux
+3 -1
View File
@@ -1,6 +1,8 @@
@comment $NetBSD: PLIST.Linux,v 1.3 2014/08/17 08:57:01 adam Exp $
@comment $NetBSD: PLIST.Linux,v 1.4 2015/12/10 02:51:05 joerg Exp $
bin/qemu-aarch64
bin/qemu-mips64
bin/qemu-mips64el
bin/qemu-mipsn32
bin/qemu-mipsn32el
bin/qemu-ppc64le
libexec/qemu-bridge-helper
emulators/qemu/distinfo
+16 -11
View File
@@ -1,16 +1,21 @@
$NetBSD: distinfo,v 1.105 2015/08/12 06:55:59 ryoon Exp $
$NetBSD: distinfo,v 1.117 2016/09/04 09:21:04 ryoon Exp $
SHA1 (qemu-2.4.0.tar.bz2) = 27c4651243ad885a2a3b35fe6d2532e6a7f0711e
RMD160 (qemu-2.4.0.tar.bz2) = f3b5ce602574aec28a5b5e43591248d4358ec5f7
Size (qemu-2.4.0.tar.bz2) = 25070979 bytes
SHA1 (patch-configure) = 2d0d2549056c9f53a932b236ed4d69a5ee58a856
SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
SHA1 (qemu-2.7.0.tar.bz2) = 96737d31a2fb74553dacbd0ddaa93014858dc986
RMD160 (qemu-2.7.0.tar.bz2) = cc962261a4f7b05ace8c16027bda770a89322cd3
SHA512 (qemu-2.7.0.tar.bz2) = 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db
Size (qemu-2.7.0.tar.bz2) = 26867760 bytes
SHA1 (patch-Makefile.objs) = f40deeed5482a24369e898411bb611be418dc3ca
SHA1 (patch-configure) = 9eb469dc5be1d7c6b4ee69e8ee61e6ab8d542112
SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7
SHA1 (patch-ef) = 98a1de2fd48638886b5d16f6a61dc72910e98b41
SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
SHA1 (patch-hw_misc_ivshmem.c) = c1fdc8111286f2c760512189db4a854bfc6129d0
SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
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-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6
SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7
SHA1 (patch-memory.c) = 9f94de7799ef80931fb1de572e5603894f3fb328
SHA1 (patch-scripts_qemu-binfmt-conf.sh) = a59c227e5891efe201eb2b8af15fb0832a1b20d0
SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154
SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162
emulators/qemu/options.mk
+12 -3
View File
@@ -1,12 +1,16 @@
# $NetBSD: options.mk,v 1.1 2011/02/28 17:49:30 wiz Exp $
# $NetBSD: options.mk,v 1.2 2015/12/21 12:10:22 ryoon 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
emulators/qemu/patches/patch-Makefile.objs
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-Makefile.objs,v 1.2 2016/09/04 09:21:04 ryoon Exp $
--- Makefile.objs.orig 2016-09-02 15:34:17.000000000 +0000
+++ Makefile.objs
@@ -113,8 +113,10 @@ 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
######################################################################
emulators/qemu/patches/patch-configure
+71 -5
View File
@@ -1,13 +1,79 @@
$NetBSD: patch-configure,v 1.6 2015/01/07 21:39:24 wiedi Exp $
Don't use gld on SunOS
$NetBSD: patch-configure,v 1.14 2016/09/04 09:21:04 ryoon Exp $
--- configure.orig 2014-12-09 14:45:40.000000000 +0000
Don't use gld on SunOS
add check for shm_open
avoid bad substitution
--- configure.orig 2016-09-02 15:34:17.000000000 +0000
+++ configure
@@ -622,7 +622,6 @@ SunOS)
@@ -625,7 +625,6 @@ SunOS)
solaris="yes"
make="${MAKE-gmake}"
install="${INSTALL-ginstall}"
- ld="gld"
smbd="${SMBD-/usr/sfw/sbin/smbd}"
needs_libsunmath="no"
solarisrev=`uname -r | cut -f2 -d.`
solarisrev=$(uname -r | cut -f2 -d.)
@@ -3706,6 +3705,27 @@ 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>
+#include <stddef.h> // for NULL
+
+int main(void)
+{
+ shm_open(NULL, O_RDWR, 0644);
+ return 0;
+}
+EOF
+if compile_prog "" "" ; then
+ shm_open=yes
+elif compile_prog "" "-lrt" ; then
+ LIBS="$LIBS -lrt"
+ shm_open=yes
+fi
+
# check for posix_fallocate
posix_fallocate=no
cat > $TMPC << EOF
@@ -3955,8 +3975,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
@@ -4607,7 +4632,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 test "$shm_open" = "yes" ; then
+ tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
+ fi
fi
fi
if test "$softmmu" = yes ; then
@@ -5114,6 +5141,9 @@ fi
if test "$fallocate_zero_range" = "yes" ; then
echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak
fi
+if [ "$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
emulators/qemu/patches/patch-default-configs_pci.mak
+11
View File
@@ -0,0 +1,11 @@
$NetBSD: patch-default-configs_pci.mak,v 1.2 2016/05/15 01:25:15 ryoon Exp $
--- default-configs/pci.mak.orig 2016-05-11 15:56:07.000000000 +0000
+++ default-configs/pci.mak
@@ -36,5 +36,5 @@ CONFIG_SDHCI=y
CONFIG_EDU=y
CONFIG_VGA=y
CONFIG_VGA_PCI=y
-CONFIG_IVSHMEM=$(CONFIG_EVENTFD)
+CONFIG_IVSHMEM=$(CONFIG_SHM_OPEN)
CONFIG_ROCKER=y
emulators/qemu/patches/patch-ef
+6 -6
View File
@@ -1,16 +1,16 @@
$NetBSD: patch-ef,v 1.7 2014/01/15 18:26:20 wiz Exp $
$NetBSD: patch-ef,v 1.8 2016/09/04 09:21:04 ryoon Exp $
Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
(PR lib/43832: ssp causes common names to be defines)
--- audio/audio.c.orig 2013-11-27 22:15:55.000000000 +0000
--- audio/audio.c.orig 2016-09-02 15:34:17.000000000 +0000
+++ audio/audio.c
@@ -1173,7 +1173,7 @@ int AUD_read (SWVoiceIn *sw, void *buf,
@@ -1156,7 +1156,7 @@ int AUD_read (SWVoiceIn *sw, void *buf,
return 0;
}
- bytes = sw->hw->pcm_ops->read (sw, buf, size);
+ bytes = (*sw->hw->pcm_ops->read)(sw, buf, size);
return bytes;
- return sw->hw->pcm_ops->read(sw, buf, size);
+ return (sw->hw->pcm_ops->read)(sw, buf, size);
}
int AUD_get_buffer_size_out (SWVoiceOut *sw)
emulators/qemu/patches/patch-hw_misc_ivshmem.c
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-hw_misc_ivshmem.c,v 1.1 2016/05/15 01:25:15 ryoon Exp $
--- hw/misc/ivshmem.c.orig 2016-05-11 15:56:09.000000000 +0000
+++ hw/misc/ivshmem.c
@@ -567,7 +567,9 @@ static void process_msg_connect(IVShmemS
vector = peer->nb_eventfds++;
IVSHMEM_DPRINTF("eventfds[%d][%d] = %d\n", posn, vector, fd);
+#if defined(CONFIG_EVENTFD)
event_notifier_init_fd(&peer->eventfds[vector], fd);
+#endif
fcntl_setfl(fd, O_NONBLOCK); /* msix/irqfd poll non block */
if (posn == s->vm_id) {
emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
+6 -6
View File
@@ -1,10 +1,10 @@
$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.3 2016/05/15 01:25:15 ryoon Exp $
Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
--- hw/ppc/mac_newworld.c.orig 2013-11-27 22:15:55.000000000 +0000
--- hw/ppc/mac_newworld.c.orig 2016-05-11 15:56:09.000000000 +0000
+++ hw/ppc/mac_newworld.c
@@ -125,7 +125,7 @@ static uint64_t translate_kernel_address
@@ -131,7 +131,7 @@ static uint64_t translate_kernel_address
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
}
@@ -13,7 +13,7 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
{
return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
}
@@ -252,7 +252,7 @@ static void ppc_core99_init(QEMUMachineI
@@ -262,7 +262,7 @@ static void ppc_core99_init(MachineState
}
/* load initrd */
if (initrd_filename) {
@@ -22,8 +22,8 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
initrd_size = load_image_targphys(initrd_filename, initrd_base,
ram_size - initrd_base);
if (initrd_size < 0) {
@@ -260,11 +260,11 @@ static void ppc_core99_init(QEMUMachineI
initrd_filename);
@@ -270,11 +270,11 @@ static void ppc_core99_init(MachineState
initrd_filename);
exit(1);
}
- cmdline_base = round_page(initrd_base + initrd_size);
emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
+6 -6
View File
@@ -1,10 +1,10 @@
$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.3 2016/05/15 01:25:15 ryoon Exp $
Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
--- hw/ppc/mac_oldworld.c.orig 2013-11-27 22:15:55.000000000 +0000
--- hw/ppc/mac_oldworld.c.orig 2016-05-11 15:56:09.000000000 +0000
+++ hw/ppc/mac_oldworld.c
@@ -59,7 +59,7 @@ static uint64_t translate_kernel_address
@@ -64,7 +64,7 @@ static uint64_t translate_kernel_address
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
}
@@ -13,7 +13,7 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
{
return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
}
@@ -181,7 +181,7 @@ static void ppc_heathrow_init(QEMUMachin
@@ -188,7 +188,7 @@ static void ppc_heathrow_init(MachineSta
}
/* load initrd */
if (initrd_filename) {
@@ -22,8 +22,8 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
initrd_size = load_image_targphys(initrd_filename, initrd_base,
ram_size - initrd_base);
if (initrd_size < 0) {
@@ -189,11 +189,11 @@ static void ppc_heathrow_init(QEMUMachin
initrd_filename);
@@ -196,11 +196,11 @@ static void ppc_heathrow_init(MachineSta
initrd_filename);
exit(1);
}
- cmdline_base = round_page(initrd_base + initrd_size);
emulators/qemu/patches/patch-memory.c
+6 -6
View File
@@ -1,13 +1,13 @@
$NetBSD: patch-memory.c,v 1.9 2015/08/12 06:55:59 ryoon Exp $
$NetBSD: patch-memory.c,v 1.10 2016/05/15 01:25:15 ryoon Exp $
--- memory.c.orig 2015-08-11 19:11:09.000000000 +0000
--- memory.c.orig 2016-05-11 15:56:12.000000000 +0000
+++ memory.c
@@ -396,7 +396,7 @@ static MemTxResult memory_region_read_a
@@ -431,7 +431,7 @@ static MemTxResult memory_region_read_a
{
uint64_t tmp;
- tmp = mr->ops->read(mr->opaque, addr, size);
+ tmp = (mr->ops->read)(mr->opaque, addr, size);
trace_memory_region_ops_read(mr, addr, tmp, size);
*value |= (tmp & mask) << shift;
return MEMTX_OK;
if (mr->subpage) {
trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);
} else if (mr == &io_mem_notdirty) {
emulators/qemu/patches/patch-scripts_qemu-binfmt-conf.sh
+21
View File
@@ -0,0 +1,21 @@
$NetBSD: patch-scripts_qemu-binfmt-conf.sh,v 1.1 2016/09/04 09:21:04 ryoon Exp $
* POSIX shell portability
--- scripts/qemu-binfmt-conf.sh.orig 2016-09-02 15:34:23.000000000 +0000
+++ scripts/qemu-binfmt-conf.sh
@@ -279,12 +279,12 @@ while true ; do
shift
# check given cpu is in the supported CPU list
for cpu in ${qemu_target_list} ; do
- if [ "$cpu" == "$1" ] ; then
+ if [ "$cpu" = "$1" ] ; then
break
fi
done
- if [ "$cpu" == "$1" ] ; then
+ if [ "$cpu" = "$1" ] ; then
qemu_target_list="$1"
else
echo "ERROR: unknown CPU \"$1\"" 1>&2
emulators/qemu/patches/patch-slirp_tcp__subr.c
+5 -5
View File
@@ -1,13 +1,13 @@
$NetBSD: patch-slirp_tcp__subr.c,v 1.6 2014/01/15 18:26:20 wiz Exp $
$NetBSD: patch-slirp_tcp__subr.c,v 1.7 2016/05/15 01:25:15 ryoon Exp $
--- slirp/tcp_subr.c.orig 2013-11-27 22:15:55.000000000 +0000
--- slirp/tcp_subr.c.orig 2016-05-11 15:56:13.000000000 +0000
+++ slirp/tcp_subr.c
@@ -340,6 +340,8 @@ int tcp_fconnect(struct socket *so)
@@ -407,6 +407,8 @@ int tcp_fconnect(struct socket *so, unsi
socket_set_fast_reuse(s);
opt = 1;
qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
+ opt = 1;
+ qemu_setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
addr.sin_family = AF_INET;
if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
addr = so->fhost.ss;
DEBUG_CALL(" connect()ing")
emulators/qemu/patches/patch-tests_Makefile
-16
View File
@@ -1,16 +0,0 @@
$NetBSD: patch-tests_Makefile,v 1.2 2015/04/29 20:30:53 ryoon Exp $
Don't link -lutil on SunOS
--- tests/Makefile.orig 2015-04-27 14:08:27.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
ifeq ($(CONFIG_POSIX),y)
+ifneq ($(CONFIG_SOLARIS),y)
LIBS += -lutil
endif
+endif
# QTest rules
emulators/qemu/patches/patch-tests_Makefile.include
+17
View File
@@ -0,0 +1,17 @@
$NetBSD: patch-tests_Makefile.include,v 1.1 2016/09/04 09:21:04 ryoon Exp $
* Don't link -lutil on SunOS
--- tests/Makefile.include.orig 2016-09-02 15:34:24.000000000 +0000
+++ tests/Makefile.include
@@ -645,8 +645,10 @@ tests/migration/initrd-stress.img: tests
rmdir $(INITRD_WORK_DIR)
ifeq ($(CONFIG_POSIX),y)
+ifneq ($(CONFIG_SOLARIS),y)
LIBS += -lutil
endif
+endif
# QTest rules