From 4c6131bc0220913610d3eaa6bb9fe8e63ac9ec05 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Wed, 29 Nov 2006 20:58:35 +0000 Subject: - Update to 2006-11-28 snapshot - Fix WITHOUT_CDROM_DMA check which was the wrong way around (doh!) - Document physical device problems in pkg-message and move aio item to the bottom so it has a slightly smaller chance of being overlooked PR: ports/105971 Submitted by: Juergen Lock (maintainer) --- emulators/qemu-devel/Makefile | 6 +++--- emulators/qemu-devel/distinfo | 6 +++--- emulators/qemu-devel/pkg-message | 16 ++++++++++++---- emulators/qemu/Makefile | 6 +++--- emulators/qemu/distinfo | 6 +++--- emulators/qemu/pkg-message | 16 ++++++++++++---- 6 files changed, 36 insertions(+), 20 deletions(-) (limited to 'emulators') diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index f2be5e352867..e7183d593a88 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qemu -PORTVERSION= 0.8.2s.20061102 +PORTVERSION= 0.8.2s.20061128 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \ @@ -14,7 +14,7 @@ MASTER_SITES= http://www.qemu.org/:release \ http://www.volny.cz/xnavara/qemu/:snapshot \ http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \ http://people.freebsd.org/~maho/qemu/:misc -DISTNAME= ${PORTNAME}-snapshot-2006-11-02_05 +DISTNAME= ${PORTNAME}-snapshot-2006-11-28_05 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot DIST_SUBDIR= qemu EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -93,7 +93,7 @@ post-patch: .if defined(WITH_RTL8139_TIMER) @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/rtl8139-re-patch .endif -.if !defined(WITHOUT_CDROM_DMA) +.if defined(WITHOUT_CDROM_DMA) @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch .endif @${REINPLACE_CMD} -E \ diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo index 29a42d58590f..afe3bc653309 100644 --- a/emulators/qemu-devel/distinfo +++ b/emulators/qemu-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (qemu/qemu-snapshot-2006-11-02_05.tar.bz2) = 51fb1369ea3225f5d734c54f0112ffec -SHA256 (qemu/qemu-snapshot-2006-11-02_05.tar.bz2) = cee2ba40b46beb72357042c608ee3be9f1d0ec726d78b4cb956cd39a5f160999 -SIZE (qemu/qemu-snapshot-2006-11-02_05.tar.bz2) = 1494519 +MD5 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 14dfd81c651af3982125c33f19f7a49a +SHA256 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = e31744fd00096a41aabc3dc8d2f1f989cfd11f4c4ffa155a1f91f8c5ae244dfe +SIZE (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 1495656 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11 SIZE (qemu/patch3_cirrus) = 8817 diff --git a/emulators/qemu-devel/pkg-message b/emulators/qemu-devel/pkg-message index bb5c6281bc04..e26c4d60f0c8 100644 --- a/emulators/qemu-devel/pkg-message +++ b/emulators/qemu-devel/pkg-message @@ -56,13 +56,21 @@ rtl8139 timer by building the port with RTL8139_TIMER enabled. (the rtl8139c+ that model=rtl8139 emulates needs less cpu than qemu's default ne2k nic which is driven by ed(4), it has not been made default only because it may not work with all guests yet.) -- qemu now uses aio at least for ide dma, so if you get `Bad system call' -crashes that is because aio is not (kld)loaded. - if you get repeated `atapi_poll called!' console messages with FreeBSD guests or other weird cdrom problems then thats probably because the guest has atapicam loaded, which for reasons still to be determined has problems with qemu's now by default enabled cdrom dma. You can build the port with CDROM_DMA disabled to disable it. -- if you build qemu wihout SDL and then get crashes running it try passing -it -nographic. This should probably be default in that case... +- if you build qemu wihout SDL and then get crashes running it try +passing it -nographic. This should probably be default in that case... +- physical device access (real cdrom/dvd instead of iso) seems to cause +problems with some guests now. If this happens to you you can make +an iso of the disc by doing something like + dd bs=2k cd.iso +and then use + qemu -cdrom cd.iso ... +instead of giving it the physical device. (This might also speed up the +guest somewhat.) +- qemu now uses aio at least for ide dma, so if you get `Bad system call' +crashes that is because aio is not (kld)loaded. ==== diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index f2be5e352867..e7183d593a88 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qemu -PORTVERSION= 0.8.2s.20061102 +PORTVERSION= 0.8.2s.20061128 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \ @@ -14,7 +14,7 @@ MASTER_SITES= http://www.qemu.org/:release \ http://www.volny.cz/xnavara/qemu/:snapshot \ http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \ http://people.freebsd.org/~maho/qemu/:misc -DISTNAME= ${PORTNAME}-snapshot-2006-11-02_05 +DISTNAME= ${PORTNAME}-snapshot-2006-11-28_05 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot DIST_SUBDIR= qemu EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -93,7 +93,7 @@ post-patch: .if defined(WITH_RTL8139_TIMER) @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/rtl8139-re-patch .endif -.if !defined(WITHOUT_CDROM_DMA) +.if defined(WITHOUT_CDROM_DMA) @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch .endif @${REINPLACE_CMD} -E \ diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 29a42d58590f..afe3bc653309 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,6 +1,6 @@ -MD5 (qemu/qemu-snapshot-2006-11-02_05.tar.bz2) = 51fb1369ea3225f5d734c54f0112ffec -SHA256 (qemu/qemu-snapshot-2006-11-02_05.tar.bz2) = cee2ba40b46beb72357042c608ee3be9f1d0ec726d78b4cb956cd39a5f160999 -SIZE (qemu/qemu-snapshot-2006-11-02_05.tar.bz2) = 1494519 +MD5 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 14dfd81c651af3982125c33f19f7a49a +SHA256 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = e31744fd00096a41aabc3dc8d2f1f989cfd11f4c4ffa155a1f91f8c5ae244dfe +SIZE (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 1495656 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11 SIZE (qemu/patch3_cirrus) = 8817 diff --git a/emulators/qemu/pkg-message b/emulators/qemu/pkg-message index bb5c6281bc04..e26c4d60f0c8 100644 --- a/emulators/qemu/pkg-message +++ b/emulators/qemu/pkg-message @@ -56,13 +56,21 @@ rtl8139 timer by building the port with RTL8139_TIMER enabled. (the rtl8139c+ that model=rtl8139 emulates needs less cpu than qemu's default ne2k nic which is driven by ed(4), it has not been made default only because it may not work with all guests yet.) -- qemu now uses aio at least for ide dma, so if you get `Bad system call' -crashes that is because aio is not (kld)loaded. - if you get repeated `atapi_poll called!' console messages with FreeBSD guests or other weird cdrom problems then thats probably because the guest has atapicam loaded, which for reasons still to be determined has problems with qemu's now by default enabled cdrom dma. You can build the port with CDROM_DMA disabled to disable it. -- if you build qemu wihout SDL and then get crashes running it try passing -it -nographic. This should probably be default in that case... +- if you build qemu wihout SDL and then get crashes running it try +passing it -nographic. This should probably be default in that case... +- physical device access (real cdrom/dvd instead of iso) seems to cause +problems with some guests now. If this happens to you you can make +an iso of the disc by doing something like + dd bs=2k cd.iso +and then use + qemu -cdrom cd.iso ... +instead of giving it the physical device. (This might also speed up the +guest somewhat.) +- qemu now uses aio at least for ide dma, so if you get `Bad system call' +crashes that is because aio is not (kld)loaded. ==== -- cgit v1.2.3