Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Feb 2024 11:21:44 -0700
From:      Warner Losh <imp@bsdimp.com>
To:        Mark Johnston <markj@freebsd.org>
Cc:        src-committers@freebsd.org, dev-commits-src-all@freebsd.org,  dev-commits-src-main@freebsd.org
Subject:   Re: git: 72c166696b78 - main - traceroute6: Update .PATH and include path after traceroute moved
Message-ID:  <CANCZdfpVSt4wg0ASqYZkz%2B3saH9%2BjxN-fiUpd5O4zwwaGztcgw@mail.gmail.com>
In-Reply-To: <202402081759.418HxQmA057275@gitrepo.freebsd.org>
References:  <202402081759.418HxQmA057275@gitrepo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000e43e990610e2e254
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Ah, beat me to the punch... Thanks! I was confirming it worked with a full
rebuild before pushing...

Warner

On Thu, Feb 8, 2024 at 10:59=E2=80=AFAM Mark Johnston <markj@freebsd.org> w=
rote:

> The branch main has been updated by markj:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=3D72c166696b78e3d878be17cf2b01555=
391b9c97e
>
> commit 72c166696b78e3d878be17cf2b01555391b9c97e
> Author:     Mark Johnston <markj@FreeBSD.org>
> AuthorDate: 2024-02-08 17:57:33 +0000
> Commit:     Mark Johnston <markj@FreeBSD.org>
> CommitDate: 2024-02-08 17:57:33 +0000
>
>     traceroute6: Update .PATH and include path after traceroute moved
>
>     Fixes:  9b7a920a12a9 ("traceroute: move from contrib to usr.sbin")
> ---
>  usr.sbin/traceroute6/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefil=
e
> index 5086b3c08706..d2b84296fe97 100644
> --- a/usr.sbin/traceroute6/Makefile
> +++ b/usr.sbin/traceroute6/Makefile
> @@ -14,7 +14,7 @@
>
>  .include <src.opts.mk>
>
> -TRACEROUTE_DISTDIR?=3D ${SRCTOP}/contrib/traceroute
> +TRACEROUTE_DISTDIR?=3D ${SRCTOP}/usr.sbin/traceroute
>  .PATH: ${TRACEROUTE_DISTDIR}
>
>  PACKAGE=3D       runtime
>

--000000000000e43e990610e2e254
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Ah, beat me to the punch... Thanks! I was confirming it wo=
rked with a full rebuild before pushing...<div><br></div><div>Warner</div><=
/div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">O=
n Thu, Feb 8, 2024 at 10:59=E2=80=AFAM Mark Johnston &lt;<a href=3D"mailto:=
markj@freebsd.org">markj@freebsd.org</a>&gt; wrote:<br></div><blockquote cl=
ass=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid=
 rgb(204,204,204);padding-left:1ex">The branch main has been updated by mar=
kj:<br>
<br>
URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D72c166696b78e3d87=
8be17cf2b01555391b9c97e" rel=3D"noreferrer" target=3D"_blank">https://cgit.=
FreeBSD.org/src/commit/?id=3D72c166696b78e3d878be17cf2b01555391b9c97e</a><b=
r>
<br>
commit 72c166696b78e3d878be17cf2b01555391b9c97e<br>
Author:=C2=A0 =C2=A0 =C2=A0Mark Johnston &lt;markj@FreeBSD.org&gt;<br>
AuthorDate: 2024-02-08 17:57:33 +0000<br>
Commit:=C2=A0 =C2=A0 =C2=A0Mark Johnston &lt;markj@FreeBSD.org&gt;<br>
CommitDate: 2024-02-08 17:57:33 +0000<br>
<br>
=C2=A0 =C2=A0 traceroute6: Update .PATH and include path after traceroute m=
oved<br>
<br>
=C2=A0 =C2=A0 Fixes:=C2=A0 9b7a920a12a9 (&quot;traceroute: move from contri=
b to usr.sbin&quot;)<br>
---<br>
=C2=A0usr.sbin/traceroute6/Makefile | 2 +-<br>
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile<=
br>
index 5086b3c08706..d2b84296fe97 100644<br>
--- a/usr.sbin/traceroute6/Makefile<br>
+++ b/usr.sbin/traceroute6/Makefile<br>
@@ -14,7 +14,7 @@<br>
<br>
=C2=A0.include &lt;<a href=3D"http://src.opts.mk" rel=3D"noreferrer" target=
=3D"_blank">src.opts.mk</a>&gt;<br>
<br>
-TRACEROUTE_DISTDIR?=3D ${SRCTOP}/contrib/traceroute<br>
+TRACEROUTE_DISTDIR?=3D ${SRCTOP}/usr.sbin/traceroute<br>
=C2=A0.PATH: ${TRACEROUTE_DISTDIR}<br>
<br>
=C2=A0PACKAGE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0runtime<br>
</blockquote></div>

--000000000000e43e990610e2e254--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpVSt4wg0ASqYZkz%2B3saH9%2BjxN-fiUpd5O4zwwaGztcgw>