From nobody Thu Jun 26 12:38:17 2025 X-Original-To: dev-commits-src-main@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 4bSdXB6d7Tz60WMk; Thu, 26 Jun 2025 12:38:34 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (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 4bSdXB1xKWz44cw; Thu, 26 Jun 2025 12:38:34 +0000 (UTC) (envelope-from asomers@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-ade58ef47c0so210789366b.1; Thu, 26 Jun 2025 05:38:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750941512; x=1751546312; 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=7Ejvph/pIiZaewIrOcpgkqDJOCMlcOJH4WmPHf8sJ+M=; b=uvQM+MVlVQm1JV8kedtOv+y/9ukiLPd/TLuB2PUOF2qzSZxHpKrh0kPOfn9PrtxpnN 2TiQYLUsVRMkS0rBLytBdjBV0+cnGECihfa2o8DdeDwak2RBV17dj+eTTWDC5Yd/qsY1 tmM+dAASgT7Kh1XdeLoNlUwEIj38VbNL3LIBBUkZZASJDhQXwuOb2ojiU2zmDouDrjM7 RlVcmjSPa2A2R7ZNhgzSMpMv+pGd8V4MfGAoKN2EqIxgNSerzAjvqEQNK8I+RAQ6ttVg wQyU/39E4j2viVbpucSuzJGdCpwsOfuEI1cYkfhNhVX+3QhHN55MEdL82Swf1e7jL22P yCTQ== X-Forwarded-Encrypted: i=1; AJvYcCWIonpqAlmZ0u6aDYf7ICe/pAM8AHdfO2b3ALCPeo9poj9eCMmYHWlEHeJjwRpXxp6cVwdn5x78KzV0UKwYKgQ6WKHT4ds=@freebsd.org, AJvYcCWjr41IKEljXFlpGQMYd92m/CG7/FO0D8Ly1AaGQnqTYLRIUYQSejXsPF2x/4ww8wjOGymVmCbOgrZV+Rb9sIcXIL/F@freebsd.org X-Gm-Message-State: AOJu0Yw4+iwGMZg22Ie6NLVgt0hrr8xHIXLiH/+lVLnfvimGH52OBKVK w4a3gnoMqN6jsLzhJplago8B94FYz0u4L/M+bFxOyIaI7RWx5ORIVlO5MTtJyjg7vKn7/kuHRZJ uxkIaEbEKaqdcbMZr1TLRMVgmYOSlzbXTWXjH X-Gm-Gg: ASbGncu5k4sYPe6PFY4a7EWyc0yvfzE/2y+4cKlrLQGvz0g4irMQh6F41vaukNUg6is za1vy0UmX/B9AhOtbWT4FKJOo2zfKfri3wfQZGqR/bhlP+IW043mEhGzsUYk3EnyM8pJD7YDBHM LhxINONlYNyWNdfajJOwftqQjuLp/2jpidJSk0Kj+sVVpZTPRYARLX7g== X-Google-Smtp-Source: AGHT+IHGE46ssEacanpR6FepLyLU7UoKV/oZF2OmX9vWpMwWsY4kk6K9eeWZ/Cwov45X+ztmlkoNvCdHWFR6OjvLra8= X-Received: by 2002:a17:906:f588:b0:ae0:d409:5f19 with SMTP id a640c23a62f3a-ae0d40969c5mr317367166b.2.1750941510995; Thu, 26 Jun 2025 05:38:30 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202506151602.55FG2SHe047772@gitrepo.freebsd.org> In-Reply-To: From: Alan Somers Date: Thu, 26 Jun 2025 06:38:17 -0600 X-Gm-Features: Ac12FXwN-3_Lj3QofW2OYUdUwkuR39CnMxsZCLwheKl8fPa4mduH9jhx_LrL0w4 Message-ID: Subject: Re: git: 5c1ba994a8bc - main - Add a regression test for a libtpool bug To: =?UTF-8?Q?Olivier_Cochard=2DLabb=C3=A9?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000c9131f063878d69d" X-Rspamd-Queue-Id: 4bSdXB1xKWz44cw X-Spamd-Bar: ---- 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:209.85.128.0/17, country:US] --000000000000c9131f063878d69d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jun 25, 2025 at 11:54=E2=80=AFPM Olivier Cochard-Labb=C3=A9 wrote: > Hi Alan, > > > On Sun, Jun 15, 2025 at 6:02=E2=80=AFPM Alan Somers = wrote: > >> The branch main has been updated by asomers: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D5c1ba994a8bcb6676ea3d1bb21b072= b90e2d3ae9 >> >> commit 5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9 >> Author: Alan Somers >> AuthorDate: 2024-05-07 17:48:33 +0000 >> Commit: Alan Somers >> CommitDate: 2025-06-15 16:01:37 +0000 >> >> Add a regression test for a libtpool bug >> >> >> > It seems this commit is the cause of preventing all my (freshly installed= ) > ZFS systems from booting than stop with: > > Mounting local filesystems:. > ld-elf.so.1: Shared object "libtpool.so.2" not found, required by "zfs" > > Because liptpool.so.2 isn=E2=80=99t no more in /lib (belong to the / data= set), but > in another dataset (/usr/lib) but it needs to use zfs to mount this one. > > Could the added include in its Makefile modified the > installed directory of libtpool.so.2 ? > > Here is the bisect script used: > > #!/bin/sh > set -eu > WRKDIR=3D/tmp/bisec > mkdir -p $WRKDIR/lib $WRKDIR/usr/lib $WRKDIR/usr/include > make -C cddl/lib/libtpool > make -C cddl/lib/libtpool install DESTDIR=3D$WRKDIR > if [ -f $WRKDIR/lib/libtpool.so.2 ]; then > rm -rf $WRKDIR > exit 0 > else > rm -rf $WRKDIR > exit 1 > fi > > And my bisect session pointed me to this commit. > git bisect start HEAD 9ce5410b9094 -- > git bisect run /tmp/bisec.libtpool.sh > git bisect reset > > Regards, > Olivier > Wow! That change was definitely not intended. And I"m very sorry for the breakage. Could you please try this patch? diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index cab8949b635b..aa8883cf9b7c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250626: For 11 days 15.0-CURRENT installed libtpool to the wrong location +MOVED_LIBS+=3Dusr/lib/libtpool.so.2 + # 20250623: fscandir() renamed to fdscandir() OLD_FILES+=3Dusr/share/man/man3/fscandir.3.gz OLD_FILES+=3Dusr/share/man/man3/fscandir_b.3.gz diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 3ab625dd306b..e14eea509708 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -3,6 +3,7 @@ LIB=3D tpool +SHLIBDIR?=3D /lib LIBADD=3D spl PACKAGE=3D libzfs --000000000000c9131f063878d69d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Wed, Jun 25, 2025 at 11:54=E2=80=AFPM Oliv= ier Cochard-Labb=C3=A9 <olivier@f= reebsd.org> wrote:
Hi Alan,


On Sun, Jun 15, 2= 025 at 6:02=E2=80=AFPM Alan Somers <asomers@freebsd.org> wrote:
The branch main has been updated by= asomers:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9
commit 5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9
Author:=C2=A0 =C2=A0 =C2=A0Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-05-07 17:48:33 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Alan Somers <asomers@FreeBSD.org>
CommitDate: 2025-06-15 16:01:37 +0000

=C2=A0 =C2=A0 Add a regression test for a libtpool bug



It seems this commit is the cause of preventing all m= y (freshly installed) ZFS systems from booting than stop with:

Mounting local filesyste= ms:.
ld-elf.so.1: Shared object "libtpool.so.2" not found, req= uired by "zfs"

Because liptpool.so.2 isn=E2=80=99t no more in /lib (belong to = the / dataset), but in another dataset (/usr/lib) but it needs to use zfs t= o mount this one.

Could the added include<src.opts.mk> in its Makefile modified the installed directory = of=C2=A0libtpool.so.2 ?

Here is the bisect script used:

#!/bin/sh
set -eu
WRKDIR=3D/tmp= /bisec
mkdir -p $WRKDIR/lib $WRKDIR/usr/lib $WRKDIR/usr/include
make = -C cddl/lib/libtpool
make -C cddl/lib/libtpool install DESTDIR=3D$WRKDIR=
if [ -f $WRKDIR/lib/libtpool.so.2 ]; then
=C2=A0 =C2=A0 rm -rf $WRKD= IR
=C2=A0 =C2=A0 exit 0
else
=C2=A0 =C2=A0 rm -rf $WRKDIR
=C2= =A0 =C2=A0 exit 1
fi

And my bisect session pointed me to this commit.
git bisect start HEAD 9c= e5410b9094 --
git bisect run /tmp/bisec.libtpool.sh
git bisect reset

Regards,
Olivier

Wow!=C2=A0 That change was definitely n= ot intended.=C2=A0 And I"m very sorry for the breakage.=C2=A0 Could yo= u please try this patch?

diff --git a/ObsoleteFile= s.inc b/ObsoleteFiles.inc
index cab8949b635b..aa8883cf9b7c 100644
---= a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
=C2= =A0# =C2=A0 xargs -n1 | sort | uniq -d;
=C2=A0# done
=C2=A0
+# 202= 50626: For 11 days 15.0-CURRENT installed libtpool to the wrong location+MOVED_LIBS+=3Dusr/lib/libtpool.so.2
+
=C2=A0# 20250623: fscandir() = renamed to fdscandir()
=C2=A0OLD_FILES+=3Dusr/share/man/man3/fscandir.3.= gz
=C2=A0OLD_FILES+=3Dusr/share/man/man3/fscandir_b.3.gz
diff --git a= /cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
index 3ab625dd3= 06b..e14eea509708 100644
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/= lib/libtpool/Makefile
@@ -3,6 +3,7 @@
=C2=A0
=C2=A0
=C2=A0LIB= =3D =C2=A0 tpool
+SHLIBDIR?=3D =C2=A0 =C2=A0 =C2=A0/lib
=C2=A0LIBADD= =3D =C2=A0 =C2=A0 =C2=A0 =C2=A0spl
=C2=A0PACKAGE=3D =C2=A0 =C2=A0 =C2=A0= libzfs

--000000000000c9131f063878d69d--