Date: Thu, 26 Jun 2025 06:38:17 -0600 From: Alan Somers <asomers@freebsd.org> To: =?UTF-8?Q?Olivier_Cochard=2DLabb=C3=A9?= <olivier@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5c1ba994a8bc - main - Add a regression test for a libtpool bug Message-ID: <CAOtMX2h%2BhKnDvTjX8ZW0Z%2BEAMU-zm4XWxWfrfVqSoCBfiru_dQ@mail.gmail.com> In-Reply-To: <CA%2Bq%2BTcriXQzqGFZH0hWtqyPZGrhO2RPCrXr%2ByhkqCJGznzOJQA@mail.gmail.com> References: <202506151602.55FG2SHe047772@gitrepo.freebsd.org> <CA%2Bq%2BTcriXQzqGFZH0hWtqyPZGrhO2RPCrXr%2ByhkqCJGznzOJQA@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Wed, Jun 25, 2025 at 11:54 PM Olivier Cochard-Labbé <olivier@freebsd.org> wrote: > Hi Alan, > > > On Sun, Jun 15, 2025 at 6:02 PM Alan Somers <asomers@freebsd.org> wrote: > >> The branch main has been updated by asomers: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9 >> >> commit 5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9 >> Author: Alan Somers <asomers@FreeBSD.org> >> AuthorDate: 2024-05-07 17:48:33 +0000 >> Commit: Alan Somers <asomers@FreeBSD.org> >> 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’t no more in /lib (belong to the / dataset), but > in another dataset (/usr/lib) but it needs to use zfs to mount this one. > > Could the added include<src.opts.mk> in its Makefile modified the > installed directory of libtpool.so.2 ? > > Here is the bisect script used: > > #!/bin/sh > set -eu > WRKDIR=/tmp/bisec > mkdir -p $WRKDIR/lib $WRKDIR/usr/lib $WRKDIR/usr/include > make -C cddl/lib/libtpool > make -C cddl/lib/libtpool install DESTDIR=$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+=usr/lib/libtpool.so.2 + # 20250623: fscandir() renamed to fdscandir() OLD_FILES+=usr/share/man/man3/fscandir.3.gz OLD_FILES+=usr/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= tpool +SHLIBDIR?= /lib LIBADD= spl PACKAGE= libzfs [-- Attachment #2 --] <div dir="ltr"><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Wed, Jun 25, 2025 at 11:54 PM Olivier Cochard-Labbé <<a href="mailto:olivier@freebsd.org">olivier@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div style="font-family:"courier new",monospace">Hi Alan,</div><div style="font-family:"courier new",monospace"><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Jun 15, 2025 at 6:02 PM Alan Somers <<a href="mailto:asomers@freebsd.org" target="_blank">asomers@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by asomers:<br> <br> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9</a><br>; <br> commit 5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9<br> Author: Alan Somers <asomers@FreeBSD.org><br> AuthorDate: 2024-05-07 17:48:33 +0000<br> Commit: Alan Somers <asomers@FreeBSD.org><br> CommitDate: 2025-06-15 16:01:37 +0000<br> <br> Add a regression test for a libtpool bug<br> <br><br></blockquote><div><br></div><div style="font-family:"courier new",monospace">It seems this commit is the cause of preventing all my (freshly installed) ZFS systems from booting than stop with:</div><div style="font-family:"courier new",monospace"><br></div><div style="font-family:"courier new",monospace">Mounting local filesystems:.<br>ld-elf.so.1: Shared object "libtpool.so.2" not found, required by "zfs"</div><div style="font-family:"courier new",monospace"><br></div><div style="font-family:"courier new",monospace">Because liptpool.so.2 isn’t no more in /lib (belong to the / dataset), but in another dataset (/usr/lib) but it needs to use zfs to mount this one.</div><div style="font-family:"courier new",monospace"><br></div><div style="font-family:"courier new",monospace">Could the added include<<a href="http://src.opts.mk" target="_blank">src.opts.mk</a>> in its Makefile modified the installed directory of libtpool.so.2 ?</div><div style="font-family:"courier new",monospace"><br></div><div style="font-family:"courier new",monospace">Here is the bisect script used:</div><div style="font-family:"courier new",monospace"><br>#!/bin/sh<br>set -eu<br>WRKDIR=/tmp/bisec<br>mkdir -p $WRKDIR/lib $WRKDIR/usr/lib $WRKDIR/usr/include<br>make -C cddl/lib/libtpool<br>make -C cddl/lib/libtpool install DESTDIR=$WRKDIR<br>if [ -f $WRKDIR/lib/libtpool.so.2 ]; then<br> rm -rf $WRKDIR<br> exit 0<br>else<br> rm -rf $WRKDIR<br> exit 1<br>fi</div><div style="font-family:"courier new",monospace"><br></div><div style="font-family:"courier new",monospace">And my bisect session pointed me to this commit.</div><div style="font-family:"courier new",monospace">git bisect start HEAD 9ce5410b9094 -- <br>git bisect run /tmp/<a href="http://bisec.libtpool.sh" target="_blank">bisec.libtpool.sh</a><br>git bisect reset</div><div style="font-family:"courier new",monospace"><br></div><div style="font-family:"courier new",monospace">Regards,</div><div style="font-family:"courier new",monospace">Olivier</div></div></div></div></blockquote><div><br></div><div>Wow! That change was definitely not intended. And I"m very sorry for the breakage. Could you please try this patch?</div><div><br></div><div>diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc<br>index cab8949b635b..aa8883cf9b7c 100644<br>--- a/ObsoleteFiles.inc<br>+++ b/ObsoleteFiles.inc<br>@@ -51,6 +51,9 @@<br> # xargs -n1 | sort | uniq -d;<br> # done<br> <br>+# 20250626: For 11 days 15.0-CURRENT installed libtpool to the wrong location<br>+MOVED_LIBS+=usr/lib/libtpool.so.2<br>+<br> # 20250623: fscandir() renamed to fdscandir()<br> OLD_FILES+=usr/share/man/man3/fscandir.3.gz<br> OLD_FILES+=usr/share/man/man3/fscandir_b.3.gz<br>diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile<br>index 3ab625dd306b..e14eea509708 100644<br>--- a/cddl/lib/libtpool/Makefile<br>+++ b/cddl/lib/libtpool/Makefile<br>@@ -3,6 +3,7 @@<br> <br> <br> LIB= tpool<br>+SHLIBDIR?= /lib<br> LIBADD= spl<br> PACKAGE= libzfs<br><br></div></div></div>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOtMX2h%2BhKnDvTjX8ZW0Z%2BEAMU-zm4XWxWfrfVqSoCBfiru_dQ>