From owner-svn-src-head@FreeBSD.ORG Tue Apr 30 09:57:06 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D4ED6198; Tue, 30 Apr 2013 09:57:06 +0000 (UTC) (envelope-from flo@zoidberg.smeets.im) Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:4f8:162:1142::2]) by mx1.freebsd.org (Postfix) with ESMTP id 94E1D16E0; Tue, 30 Apr 2013 09:57:06 +0000 (UTC) Received: from cpos1.nexxtmobile.de (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id 6A5E01254A; Tue, 30 Apr 2013 11:57:05 +0200 (CEST) X-Virus-Scanned: amavisd-new at nexxtmobile.de Received: from mail.solomo.de ([127.0.0.1]) by cpos1.nexxtmobile.de (cpos1.nexxtmobile.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id G4lPmBQqtZF7; Tue, 30 Apr 2013 11:57:03 +0200 (CEST) Received: from zoidberg.smeets.im (zoidberg.smeets.im [85.214.194.88]) by mail.solomo.de (Postfix) with ESMTP id 8E6FB12542; Tue, 30 Apr 2013 11:57:03 +0200 (CEST) Received: by zoidberg.smeets.im (Postfix, from userid 1001) id 64B0D69F2A; Tue, 30 Apr 2013 11:57:03 +0200 (CEST) Date: Tue, 30 Apr 2013 11:57:03 +0200 From: Florian Smeets To: Carl Delsey Subject: Re: svn commit: r250079 - in head: share/man/man4 sys/amd64/conf sys/conf sys/dev/ntb sys/dev/ntb/if_ntb sys/dev/ntb/ntb_hw sys/modules sys/modules/ntb sys/modules/ntb/if_ntb sys/modules/ntb/ntb_hw Message-ID: <20130430095703.GC14196@zoidberg.smeets.im> References: <201304292248.r3TMmrqT027087@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="rQ2U398070+RC21q" Content-Disposition: inline In-Reply-To: <201304292248.r3TMmrqT027087@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2013 09:57:06 -0000 --rQ2U398070+RC21q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 29, 2013 at 10:48:53PM +0000, Carl Delsey wrote: > Author: carl > Date: Mon Apr 29 22:48:53 2013 > New Revision: 250079 > URL: http://svnweb.freebsd.org/changeset/base/250079 >=20 > Log: > Add a new driver to support the Intel Non-Transparent Bridge(NTB). > =20 Hi Carl, This change breaks installworld. /usr/share/man/man4/nve.4.gz -> /usr/share/man/man4/ntb_hw.4.gz install: link /usr/share/man/man4/ntb_hw.4.gz -> /usr/share/man/man4/nve.4.= gz: No such file or directory *** [_maninstall] Error code 71 I think the following patch does what you intended? Index: share/man/man4/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- share/man/man4/Makefile (revision 250097) +++ share/man/man4/Makefile (working copy) @@ -648,7 +648,8 @@ netintro.4 networking.4 MLINKS+=3D${_nfe.4} ${_if_nfe.4} MLINKS+=3Dnge.4 if_nge.4 -MLINKS+=3D${_ntb.4} ${_if_ntb.4} ${_ntb_hw.4} +MLINKS+=3D${_ntb.4} ${_if_ntb.4} \ + ${_ntb.4} ${_ntb_hw.4} MLINKS+=3D${_nve.4} ${_if_nve.4} MLINKS+=3D${_nxge.4} ${_if_nxge.4} MLINKS+=3Dpatm.4 if_patm.4 With this installworld finished as expected. Florian --rQ2U398070+RC21q Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlF/lW0ACgkQapo8P8lCvwnJpACgxtFsaxuLIgoYT5zCmZMFYd06 GIcAnjoaI5IillYfHj1SkbGH6li2odFL =Azqz -----END PGP SIGNATURE----- --rQ2U398070+RC21q--