Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Dec 2004 02:27:22 +0100 (CET)
From:      Juergen Lock <nox@jelal.kn-bremen.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/75644: update emulators/qemu to Dec 28 snapshot
Message-ID:  <200412300127.iBU1RMv14267@saturn.kn-bremen.de>
Resent-Message-ID: <200412300120.iBU1KUoU042273@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         75644
>Category:       ports
>Synopsis:       update emulators/qemu to Dec 28 snapshot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 30 01:20:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Juergen Lock
>Release:        FreeBSD 5.3-RC2 i386
>Organization:
me?  organized??
>Environment:
System: FreeBSD neptun 5.3-RC2 FreeBSD 5.3-RC2 #3: Wed Nov  3 17:49:24 CET 2004     nox@neptun:/ad0/usr/home/nox/src5/usr/src/sys/i386/compile/NEPTUN  i386


>Description:
	force use of gcc 3.3, 3.4 builds a broken qemu-system-ppc
	and doesnt build target-i386/op.c on amd64 (amd64 build
	untested but i've read reports that gcc 3.3 works there
	on linux)

	better BIOS ATA translation support, slirp fixes,
	added undocumented i386 FPU ops, update vga bios,
	Cirrus VGA: support for 1280x1024x[8,15,16] modes,
	added WIN_IDLEIMMEDIATE and WIN_DIAGNOSE ATA commands,
	ppc FRSP insn fix, audio fixes, -pidfile option,
	keymaps support, fixed i386 io ins in case of page fault,
	SPARC merge

>How-To-Repeat:
	n/a
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	17 Nov 2004 09:47:38 -0000	1.18
+++ Makefile	30 Dec 2004 00:24:58 -0000
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.6.1s.20041115
-PORTREVISION=	0
+PORTVERSION=	0.6.1s.20041228
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.fruitsalad.org/qemu/ \
+MASTER_SITES=	http://people.fruitsalad.org/nox/qemu/ \
 		http://dad-answers.com/qemu/
-DISTNAME=	${PORTNAME}-snapshot-2004-11-15_23
+DISTNAME=	${PORTNAME}-snapshot-2004-12-28_23
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 COMMENT=	QEMU CPU Emulator
@@ -24,14 +23,26 @@
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes
 USE_SDL=	sdl
-USE_GCC=	3.4
 USE_PERL5=	yes
 PATCH_STRIP=	-p1
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}\ -I${PREFIX}/include
 MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
+# gcc34 (system cc on 5.x now) has problems with qemu:
+# doesnt build target-i386/op.c on amd64, and builds a broken qemu-system-ppc
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 502126
+CC=		gcc33
+CXX=		g++33
+BUILD_DEPENDS+=	gcc33:${PORTSDIR}/lang/gcc33
+GCCVERSION=	030301
+.else
+USE_GCC=	3.3
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo	17 Nov 2004 09:47:38 -0000	1.12
+++ distinfo	30 Dec 2004 00:16:38 -0000
@@ -1,2 +1,2 @@
-MD5 (qemu-snapshot-2004-11-15_23.tar.bz2) = ea604165b37be4d4dd6c3fbdfacf06c5
-SIZE (qemu-snapshot-2004-11-15_23.tar.bz2) = 845053
+MD5 (qemu-snapshot-2004-12-28_23.tar.bz2) = 01ee06f083091053f6c2595549f615a0
+SIZE (qemu-snapshot-2004-12-28_23.tar.bz2) = 911183
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/pkg-message,v
retrieving revision 1.6
diff -u -r1.6 pkg-message
--- pkg-message	17 Nov 2004 09:47:38 -0000	1.6
+++ pkg-message	30 Dec 2004 00:34:35 -0000
@@ -1,19 +1,19 @@
 ====
 FreeBSD host notes:
 - needs to run as root in order to use /dev/tap* networking (why?)
-- slirp (usermode networking) is fixed now in cvs, on FreeSBIE guests
+- slirp (usermode networking) is fixed now in cvs, on FreeSBIE 1.0 guests
 you still have to manually do:
 	echo nameserver 10.0.2.3 >/etc/resolv.conf
-but i've been told that that's normal. (and you have to wait a bit
-for dhclient to do its thing; traffic to address 10.0.2.2 is routed
-to 127.1 on the host)
-- expect timer problems when guest kernel HZ is > hosts
-(for example time sleep 1 takes 49 seconds and booting sleeps for
-minutes at the acd0 probe with a FreeSBIE guest, thats because
-the FreeSBIE kernel is built with HZ=5000, and FreeBSD's default
-is 100...  The linux 2.6 kernel uses 1000 by default btw.)  Enabling
-/dev/rtc doesn't seem to help either (not included since it needs a
-patch to emulators/rtc.)
+but i've been told that that's normal. (fixed on FreeSBIE 1.1.)
+and you have to wait a bit for dhclient to do its thing; traffic to
+address 10.0.2.2 is routed to 127.1 on the host.
+- expect timer problems when guest kernel HZ is > hosts,
+for example time sleep 1 takes 49 seconds and booting sleeps for
+minutes at the acd0 probe with a FreeSBIE 1.0 guest, thats because
+its kernel is built with HZ=5000, and FreeBSD's default is 100...
+(no longer a problem with FreeSBIE 1.1.)  The linux 2.6 kernel uses
+1000 by default btw.  Enabling /dev/rtc doesn't seem to help either
+(not included since it needs a patch to emulators/rtc.)
 - using physical media doesn't work on 4.x hosts (missing DIOCGMEDIASIZE
-ioctl)
+ioctl.)
 ====
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist	25 Oct 2004 14:57:30 -0000	1.7
+++ pkg-plist	29 Dec 2004 22:58:45 -0000
@@ -9,6 +9,42 @@
 share/qemu/vgabios.bin
 share/qemu/vgabios-cirrus.bin
 share/qemu/ppc_rom.bin
-share/qemu/proll.bin
+share/qemu/proll.elf
+share/qemu/keymaps/ar
+share/qemu/keymaps/common
+share/qemu/keymaps/da
+share/qemu/keymaps/de
+share/qemu/keymaps/de-ch
+share/qemu/keymaps/en-gb
+share/qemu/keymaps/en-us
+share/qemu/keymaps/es
+share/qemu/keymaps/et
+share/qemu/keymaps/fi
+share/qemu/keymaps/fo
+share/qemu/keymaps/fr
+share/qemu/keymaps/fr-be
+share/qemu/keymaps/fr-ca
+share/qemu/keymaps/fr-ch
+share/qemu/keymaps/hr
+share/qemu/keymaps/hu
+share/qemu/keymaps/is
+share/qemu/keymaps/it
+share/qemu/keymaps/ja
+share/qemu/keymaps/lt
+share/qemu/keymaps/lv
+share/qemu/keymaps/mk
+share/qemu/keymaps/modifiers
+share/qemu/keymaps/nl
+share/qemu/keymaps/nl-be
+share/qemu/keymaps/no
+share/qemu/keymaps/pl
+share/qemu/keymaps/pt
+share/qemu/keymaps/pt-br
+share/qemu/keymaps/ru
+share/qemu/keymaps/sl
+share/qemu/keymaps/sv
+share/qemu/keymaps/th
+share/qemu/keymaps/tr
+@dirrm share/qemu/keymaps
 @dirrm share/qemu
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412300127.iBU1RMv14267>