From nobody Sat Dec 14 20:54:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9djz6dDSz5glp8 for ; Sat, 14 Dec 2024 20:54:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9djz23wHz4Ksk for ; Sat, 14 Dec 2024 20:54:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2ee76befe58so2536723a91.2 for ; Sat, 14 Dec 2024 12:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1734209670; x=1734814470; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=SUPQG0Albe+JpqvSGPJjfetaH2f6tBS/1AXfX2BFwcc=; b=BP6b2IPhve2ywFdWOTIs9bqpQV9hLm//V4PGcSEJSDJoZV3CTyzbNBdhAh+fiKltN0 9DytUr6DsY1BUOkCAv+VJeClPng8E6He0OEga3BhyhMF8CUtTOZZSYuvFjyB/9N1J0c8 HZgYc5DbmHGmr7hYSiiEtVmCJNFRojjfnyhVsf6mtziCL4e7ggqLgnESeE2rskEVY4Aw 3f4qmE3eSBXTqxQUkbMGEy39+7YRz/VY+rvlBv3w86joHpqTL0mYjZN8QxsOuNCvK9ug wme3OL5TaybqQzyoaDVWpegafPUIL7D/Gd+PlcwjtjWnc3qBBHZjlz/TANP/1IxXjT3q U7ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734209670; x=1734814470; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SUPQG0Albe+JpqvSGPJjfetaH2f6tBS/1AXfX2BFwcc=; b=fKkWs4MTRzaXz6LaJXcwVTwbwhKZqdPgiPxKcwB7ZjxpbKMAi70/VD4FL2epAiCTXn aPi3739Oj7ViXvJxbjZpgbom76kajBur1s5M/HC2sY5IX/vgmIUcbC6wsE15UWR8FhDU KEG7X22LX9QIR6P5OxQ7ufKKSjOqOTs7yrq7LnmuxQh88wmr8NZUnMQR1Je3dEHOBFWj 29qUPY+ZfIDkSW5EoUcnfdDM4xSbhpwCyp1uJatcoYolr746Jl9QiTFW63SfssT3H4BK DB6l+AQljENYSR9MAwn+sHZNr/f12irN6uhgv84DwMjFFjzK8+dlDu/h55NEXqdgPO2B 6VSg== X-Forwarded-Encrypted: i=1; AJvYcCWlWTRQ2ds87DHmrKXQAcFQwGgTkPXS/9MkNvcCB9J5BQzpZo8Pj6BEV7pRCb0PcB+6iW9ahwpx0TL1/b76tOxpg8dp@freebsd.org X-Gm-Message-State: AOJu0Yw8G1Qh/hR56GxKGj19LNlLkWwrjxtXacuX7/XV8HQRpr8P+mE6 NBVTRNIc+9heu4r8bYlC0sC+BNo2nyToJ9jvSDfCNJT0m7JoUNAbLmP76sgIOshg78N7v7ZXCSg 6bSttt/GSU8cdhLqIZ1BJYAqLThi59cxOWX+NIQ== X-Gm-Gg: ASbGnctVDPhTWinllbWQuiPV/olWK9Wya0mzCu4z5wO9MBYB9ut0ZtzNaUepVs1Y9NI 7gohbZPkdbx3KMCigo+ocwZFQ/9o89wmiLJd4EqgfxjOgr63V5WFMxUbhIAPG8nd0AES2 X-Google-Smtp-Source: AGHT+IFS5o7PwUJ/5umvXvqUW424gfGGXyVlxFzSlxM6PPKQZBk0iNcZv+fPK8Ym8IgEt3Xb/NKavSyQsYc62uW93Lk= X-Received: by 2002:a17:90b:2548:b0:2ee:d958:1b18 with SMTP id 98e67ed59e1d1-2f2901b7ddbmr9815756a91.36.1734209669815; Sat, 14 Dec 2024 12:54:29 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> <87y10icwq0.wl-herbert@gojira.at> In-Reply-To: From: Warner Losh Date: Sat, 14 Dec 2024 13:54:18 -0700 Message-ID: Subject: Re: git: 42ee30f19cc7 - main - depend-cleanup.sh: Need to delete jemalloc.3 in objtree To: David Wolfskill Cc: Warner Losh , "Herbert J. Skuhra" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000560038062941275b" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Y9djz23wHz4Ksk X-Spamd-Bar: ---- --000000000000560038062941275b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Dec 14, 2024 at 5:50=E2=80=AFAM David Wolfskill wrote: > On Sat, Dec 14, 2024 at 12:47:35PM +0100, Herbert J. Skuhra wrote: > > On Sat, 14 Dec 2024 00:04:26 +0100, Warner Losh wrote: > > > > > > The branch main has been updated by imp: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D42ee30f19cc7ad85187cbf97155dbd5= 207a04845 > > > > > > commit 42ee30f19cc7ad85187cbf97155dbd5207a04845 > > > Author: Warner Losh > > > AuthorDate: 2024-12-13 17:46:59 +0000 > > > Commit: Warner Losh > > > CommitDate: 2024-12-13 23:04:34 +0000 > > > > > > depend-cleanup.sh: Need to delete jemalloc.3 in objtree > > > ... > > > Does this actually work? Should this be > > > > if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then > > > > ? > > Empirically: > On a system running: > FreeBSD 15.0-CURRENT #61 main-n274188-38cb1ba8637d: Fri Dec 13 11:58:34 > UTC 2024 root@freebeast.catwhisker.org:/common/S4/obj/usr/src/amd64.a= md64/sys/GENERIC > amd64 1500029 1500029 > > after updating sources to main-n274215-da5aed38d80a and starting an > in-place source upgrade using meta mode, the build failed: > > ... > Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/mail/mail > Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/tftp/tftp.1.gz > make[4]: don't know how to make jemalloc.3. Stop > Yea, I tested in the wrong tree.. I've just tested in the right tree so will be pushing a fix. Warner > make[4]: stopped making "all" in /usr/src/lib/libc > .ERROR_TARGET=3D'jemalloc.3' > .ERROR_META_FILE=3D'' > .MAKE.LEVEL=3D'4' > MAKEFILE=3D'' > .MAKE.MODE=3D'meta missing-filemon=3Dyes missing-meta=3Dyes silent=3Dyes = verbose' > _ERROR_CMD=3D'.PHONY' > .... > > I then used "find" to find any ocurrences of "jemalloc.3" in > /usr/obj/; one was found: a symlink named > /usr/obj/usr/src/amd64.amd64/lib/libc/jemalloc.3, which pointed to > /usr/src/contrib/jemalloc/doc/jemalloc.3. > > The latter did not exist. > > Once I removed the symlink, the build succeeeded: > FreeBSD 15.0-CURRENT #62 main-n274215-da5aed38d80a: Sat Dec 14 12:08:41 > UTC 2024 root@freebeast.catwhisker.org:/common/S4/obj/usr/src/amd64.a= md64/sys/GENERIC > amd64 1500029 1500029 > > On a pair of other (slower) machines, I then had the opportunity to > remove the symlink before starting the build; those completed without > incident. > > I believe a src/UPDATING entry would be sufficient to help folks > avoid the error condition. > > Peace, > david > -- > David H. Wolfskill david@catwhisker.org > Re. tariffs: https://en.wikipedia.org/wiki/Smoot%E2%80%93Hawley_Tariff_Ac= t > > See https://www.catwhisker.org/~david/publickey.gpg for my public key. > --000000000000560038062941275b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sat, Dec 14,= 2024 at 5:50=E2=80=AFAM David Wolfskill <david@catwhisker.org> wrote:
On Sat, Dec 14, 2024 at 12:47:35PM +0100, Her= bert J. Skuhra wrote:
> On Sat, 14 Dec 2024 00:04:26 +0100, Warner Losh wrote:
> >
> > The branch main has been updated by imp:
> >
> > URL: htt= ps://cgit.FreeBSD.org/src/commit/?id=3D42ee30f19cc7ad85187cbf97155dbd5207a0= 4845
> >
> > commit 42ee30f19cc7ad85187cbf97155dbd5207a04845
> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2024-12-13 17:46:59 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org> > > CommitDate: 2024-12-13 23:04:34 +0000
> >
> >=C2=A0 =C2=A0 =C2=A0depend-cleanup.sh: Need to delete jemalloc.3 i= n objtree
> > ...=C2=A0 =C2=A0 =C2=A0

> Does this actually work? Should this be
>
> if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then
>
> ?

Empirically:
On a system running:
FreeBSD 15.0-CURRENT #61 main-n274188-38cb1ba8637d: Fri Dec 13 11:58:34 UTC= 2024=C2=A0 =C2=A0 =C2=A0root@freebeast.catwhisker.org:/common/S4/obj/usr/src/a= md64.amd64/sys/GENERIC amd64 1500029 1500029

after updating sources to main-n274215-da5aed38d80a and starting an
in-place source upgrade using meta mode, the build failed:

...
Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/mail/mail
Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/tftp/tftp.1.gz
make[4]: don't know how to make jemalloc.3. Stop
<= br>
Yea, I tested in the wrong tree.. I've just tested in the= right tree so will be pushing a fix.

Warner
=
=C2=A0
make[4]: stopped making "all" in /usr/src/lib/libc
.ERROR_TARGET=3D'jemalloc.3'
.ERROR_META_FILE=3D''
.MAKE.LEVEL=3D'4'
MAKEFILE=3D''
.MAKE.MODE=3D'meta missing-filemon=3Dyes missing-meta=3Dyes silent=3Dye= s verbose'
_ERROR_CMD=3D'.PHONY'
....

I then used "find" to find any ocurrences of "jemalloc.3&quo= t; in
/usr/obj/; one was found: a symlink named
/usr/obj/usr/src/amd64.amd64/lib/libc/jemalloc.3, which pointed to
/usr/src/contrib/jemalloc/doc/jemalloc.3.

The latter did not exist.

Once I removed the symlink, the build succeeeded:
FreeBSD 15.0-CURRENT #62 main-n274215-da5aed38d80a: Sat Dec 14 12:08:41 UTC= 2024=C2=A0 =C2=A0 =C2=A0root@freebeast.catwhisker.org:/common/S4/obj/usr/src/a= md64.amd64/sys/GENERIC amd64 1500029 1500029

On a pair of other (slower) machines, I then had the opportunity to
remove the symlink before starting the build; those completed without
incident.

I believe a src/UPDATING entry would be sufficient to help folks
avoid the error condition.

Peace,
david
--
David H. Wolfskill=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 david@catwhisker.org
Re. tariffs: https://en.wikipedia.org/w= iki/Smoot%E2%80%93Hawley_Tariff_Act

See https://www.catwhisker.org/~david/publickey.gpg for my public key.
--000000000000560038062941275b--