Date: Fri, 23 May 2003 09:22:16 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Poul-Henning Kamp <phk@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sbin/bsdlabel Makefile Message-ID: <20030523062216.GE17107@sunbay.com> In-Reply-To: <200305230608.h4N68SDB018936@repoman.freebsd.org> References: <200305230608.h4N68SDB018936@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <bsd.prog.mk>
+
+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/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030523062216.GE17107>