From owner-cvs-src@FreeBSD.ORG Thu May 22 23:22:25 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7EA437B404; Thu, 22 May 2003 23:22:25 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BB9743F75; Thu, 22 May 2003 23:22:22 -0700 (PDT) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h4N6MGEd021589 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 23 May 2003 09:22:18 +0300 (EEST) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h4N6MGYN021584; Fri, 23 May 2003 09:22:16 +0300 (EEST) (envelope-from ru) Date: Fri, 23 May 2003 09:22:16 +0300 From: Ruslan Ermilov To: Poul-Henning Kamp Message-ID: <20030523062216.GE17107@sunbay.com> References: <200305230608.h4N68SDB018936@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Ns7jmDPpOpCD+GE/" Content-Disposition: inline In-Reply-To: <200305230608.h4N68SDB018936@repoman.freebsd.org> User-Agent: Mutt/1.5.4i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sbin/bsdlabel Makefile X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 May 2003 06:22:26 -0000 --Ns7jmDPpOpCD+GE/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 22, 2003 at 11:08:28PM -0700, Peter Wemm wrote: > peter 2003/05/22 23:08:28 PDT >=20 > FreeBSD src repository >=20 > Modified files: > sbin/bsdlabel Makefile=20 > Log: > Add amd64 to the MACHINE_ARCH list of systems that link bsdlabel to > disklabel. I just got burnt again by having an old disklabel binary > kicking around. > =20 > Discussed with: phk > Approved by: re (safe amd64 stuff) > =20 > Revision Changes Path > 1.18 +2 -1 src/sbin/bsdlabel/Makefile >=20 Speaking of which... Poul-Henning, when do you plan to initiate the de-orbit burn sequence for /sbin/disklabel, something like this? %%% Index: 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 RCS file: /home/ncvs/src/sbin/bsdlabel/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 17 May 2003 19:06:45 -0000 1.17 +++ Makefile 23 May 2003 06:19:20 -0000 @@ -7,12 +7,6 @@ SRCS=3D bsdlabel.c geom_bsd_enc.c #MAN=3D bsdlabel.5 MAN+=3D bsdlabel.8 - -.if ${MACHINE_ARCH} =3D=3D "i386" || ${MACHINE_ARCH} =3D=3D "alpha" -LINKS=3D ${BINDIR}/bsdlabel ${BINDIR}/disklabel -MLINKS=3D bsdlabel.8 disklabel.8 -.endif - DPADD=3D ${LIBGEOM} LDADD=3D -lgeom =20 @@ -21,6 +15,11 @@ .endif =20 .include + +afterinstall: +.if exists(${DESTDIR}${BINDIR}/disklabel) + rm -f ${DESTDIR}${BINDIR}/disklabel +.endif =20 test: ${PROG} sh ${.CURDIR}/runtest.sh %%% Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --Ns7jmDPpOpCD+GE/ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+zb4XUkv4P6juNwoRAvgaAJ9SMWkNv4zEvKPDz/enAPTWDEbLlQCfX/zf cCqaEjTlZ0kW0unOTVmXB30= =gZld -----END PGP SIGNATURE----- --Ns7jmDPpOpCD+GE/--