From owner-freebsd-ports@FreeBSD.ORG Sat Aug 10 12:59:31 2013 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F0278E13; Sat, 10 Aug 2013 12:59:30 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A8A382A76; Sat, 10 Aug 2013 12:59:30 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1V88lU-002bPa-4D>; Sat, 10 Aug 2013 14:59:28 +0200 Received: from g225187188.adsl.alicedsl.de ([92.225.187.188] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1V88lT-000ojS-Uw>; Sat, 10 Aug 2013 14:59:28 +0200 Date: Sat, 10 Aug 2013 14:59:22 +0200 From: "O. Hartmann" To: gljennjohn@googlemail.com Subject: Re: CURRENT crashes with nvidia GPU BLOB : vm_radix_insert: key 23c078 is already present Message-ID: <20130810145922.1bc18c5a@thor.walstatt.dyndns.org> In-Reply-To: <20130810113119.3f44ae32@ernst.home> References: <20130808201018.1215f733@munin.geoinf.fu-berlin.de> <1375997961.1451.3.camel@localhost> <20130809073251.376c9206@munin.geoinf.fu-berlin.de> <20130809171237.GN1746@albert.catwhisker.org> <20130810103705.022ce7be@ernst.home> <52060390.1040505@gwdg.de> <20130810113119.3f44ae32@ernst.home> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/VMFiOyelyg1yJjVAXCioeNb"; protocol="application/pgp-signature" X-Originating-IP: 92.225.187.188 Cc: Rainer Hurling , FreeBSD Ports , FreeBSD CURRENT X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Aug 2013 12:59:31 -0000 --Sig_/VMFiOyelyg1yJjVAXCioeNb Content-Type: multipart/mixed; boundary="MP_/p+JT9kiyBsVuns5obrQbw3L" --MP_/p+JT9kiyBsVuns5obrQbw3L Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sat, 10 Aug 2013 11:31:19 +0200 Gary Jennejohn wrote: > On Sat, 10 Aug 2013 11:10:40 +0200 > Rainer Hurling wrote: >=20 > > Yes, I can confirm, that it builds, installs and runs fine for me. > >=20 > > The patch should be placed as > > x11/nvidia-driver/files/patch-src__nvidia_subr.c, shoudn't it? > >=20 > > Many thanks for this work. > >=20 >=20 > Thanks for testing. >=20 > Yes, putting the patch into files/ with that name works also and > is much simpler than the steps I outlined. >=20 Placing the patch in files as recommended here doesn't play well with the obvious intention of the REINPLACE command: the patch only applies to 319.25. I use the cutting edge 325.15. The patch doesn't apply since some lines shifted - here comes the tricky REINPLACE part of the Makefile in place. I simply adapted your patches discussed and introduced here and "adapted" the REINPLACE statements/pattern around line 160 in the toplevel Makefile of port x11/nvidia-driver. Find the patch attached - I forgot to raise PORTREVISION=3D1. I'm now sending this email from the prior crashing box with the patch discussed applied via the Makefile to 325.15. Thanks a lot for the fast help. Regards, Oliver=20 --MP_/p+JT9kiyBsVuns5obrQbw3L Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=nvidia-driver.patch.txt diff -Nur nvidia-driver.orig/Makefile nvidia-driver/Makefile --- nvidia-driver.orig/Makefile 2013-08-10 14:46:08.000000000 +0200 +++ nvidia-driver/Makefile 2013-08-10 14:41:52.000000000 +0200 @@ -158,8 +158,8 @@ .endif # Catch up with KVA space allocation API changes in recent -CURRENT .if ${OSVERSION} > 1000040 - ${REINPLACE_CMD} -e 's/kmem_free(kernel_map,/kva_free(/ ; \ - /kmem_alloc_contig/s/map/arena/' ${WRKSRC}/src/nvidia_subr.c + ${REINPLACE_CMD} -e 's/kmem_free(kernel_map,/kmem_free(kmem_arena,/ ; \ + /kmem_alloc_contig/s/kernel_map/kmem_arena/' ${WRKSRC}/src/nvidia_subr.c .endif # Process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} --MP_/p+JT9kiyBsVuns5obrQbw3L-- --Sig_/VMFiOyelyg1yJjVAXCioeNb Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBAgAGBQJSBjkvAAoJEOgBcD7A/5N8HLYIALx4PtCwZ/VeVcSGFsNX7Iwj orGyh0RNxUlsgmxUY4QdSQ9PXt5bpz6dpxAnhh3ILz/8mGriWyNABeGrURh8v6gG HDBhcsRYQa54vvTHPmOXu6er33sBrz6rUv6I1RBk/4KJaYngax0AQxM0dcgKg6jD JFhac5HsfWIOamEbyV4bu/UOCeuq9xI9F4LEwkNyj/5nc95UUO2CadBGa+cUUuYj qkV17LRY7vsjDzgn4oCzdOQxYimDjsIhgiZtVr9LebHiXjViFQrTRpdswJ9pr2VJ WUBB03ickD+FGkEv8JMr2zJdZnWPKA/ZZoNNORT9a9TegwT44SvF/MIgXhMHUzs= =5Sek -----END PGP SIGNATURE----- --Sig_/VMFiOyelyg1yJjVAXCioeNb--