Date: Wed, 6 Dec 2023 14:02:28 -0700 From: Warner Losh <imp@bsdimp.com> To: John Baldwin <jhb@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files Message-ID: <CANCZdfp_Vz-K24%2BkBy1DZhMKoAjJ%2B-Z1m_9wB6DZ24=QTopBiA@mail.gmail.com> In-Reply-To: <e30bb1e4-11c7-4829-a7b6-21bfd590e558@FreeBSD.org> References: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> <e30bb1e4-11c7-4829-a7b6-21bfd590e558@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000f4a696060bddab28 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Dec 6, 2023, 1:04 PM John Baldwin <jhb@freebsd.org> wrote: > On 2/25/23 9:37 AM, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D773c13c686e4b6ae9dbbc150b342b82= c3f47d73a > > > > commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a > > Author: Mina Gali=C4=87 <freebsd@igalic.co> > > AuthorDate: 2023-02-25 17:31:58 +0000 > > Commit: Warner Losh <imp@FreeBSD.org> > > CommitDate: 2023-02-25 17:35:43 +0000 > > > > kldxref: skip .pkgsave files > > > > This should help people transitioning from traditional setups to > pkgbase > > experience a lot less friction. > > > > We do this by skipping all files containing two dots. > > > > Reviewed by: imp > > Pull Request: https://github.com/freebsd/freebsd-src/pull/661 > > Differential Revision: https://reviews.freebsd.org/D27959 > > This restriction is too broad and omits all of the modern wifi firmware > klds from linker.hints, e.g. > > /boot/kernel/iwlwifi-3160-17.ucode.ko > /boot/kernel/iwlwifi-3168-29.ucode.ko > /boot/kernel/iwlwifi-7260-17.ucode.ko > /boot/kernel/iwlwifi-7265-17.ucode.ko > /boot/kernel/iwlwifi-7265D-29.ucode.ko > /boot/kernel/iwlwifi-8000C-36.ucode.ko > /boot/kernel/iwlwifi-8265-36.ucode.ko > /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko > /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko > /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko > /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko > /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko > /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko > /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko > /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko > /boot/kernel/iwlwifi-cc-a0-77.ucode.ko > /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko > /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko > /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko > /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko > /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko > /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko > /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko > /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko > /boot/kernel/rtw8723d_fw.bin.ko > /boot/kernel/rtw8821c_fw.bin.ko > /boot/kernel/rtw8822b_fw.bin.ko > /boot/kernel/rtw8822c_fw.bin.ko > /boot/kernel/rtw8822c_wow_fw.bin.ko > > all match this pattern and are skipped. > > I'm busy rewriting a bunch of kldxref to be a cross tool using libelf, > but I think here you want to probably revert this and just add pkgsave > to the list of "known bad" suffixes. > Sure. Any reason to not just require .ko? Or do we have to index the kernel too? Warner --=20 > John Baldwin > > --000000000000f4a696060bddab28 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"auto"><div><br><br><div class=3D"gmail_quote"><div dir=3D"ltr" = class=3D"gmail_attr">On Wed, Dec 6, 2023, 1:04 PM John Baldwin <<a href= =3D"mailto:jhb@freebsd.org">jhb@freebsd.org</a>> wrote:<br></div><blockq= uote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc = solid;padding-left:1ex">On 2/25/23 9:37 AM, Warner Losh wrote:<br> > The branch main has been updated by imp:<br> > <br> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D773c13c686e4= b6ae9dbbc150b342b82c3f47d73a" rel=3D"noreferrer noreferrer" target=3D"_blan= k">https://cgit.FreeBSD.org/src/commit/?id=3D773c13c686e4b6ae9dbbc150b342b8= 2c3f47d73a</a><br> > <br> > commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a<br> > Author:=C2=A0 =C2=A0 =C2=A0Mina Gali=C4=87 <<a href=3D"mailto:freeb= sd@igalic.co" target=3D"_blank" rel=3D"noreferrer">freebsd@igalic.co</a>>= ;<br> > AuthorDate: 2023-02-25 17:31:58 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2023-02-25 17:35:43 +0000<br> > <br> >=C2=A0 =C2=A0 =C2=A0 kldxref: skip .pkgsave files<br> >=C2=A0 =C2=A0 =C2=A0 <br> >=C2=A0 =C2=A0 =C2=A0 This should help people transitioning from traditi= onal setups to pkgbase<br> >=C2=A0 =C2=A0 =C2=A0 experience a lot less friction.<br> >=C2=A0 =C2=A0 =C2=A0 <br> >=C2=A0 =C2=A0 =C2=A0 We do this by skipping all files containing two do= ts.<br> >=C2=A0 =C2=A0 =C2=A0 <br> >=C2=A0 =C2=A0 =C2=A0 Reviewed by: imp<br> >=C2=A0 =C2=A0 =C2=A0 Pull Request: <a href=3D"https://github.com/freebs= d/freebsd-src/pull/661" rel=3D"noreferrer noreferrer" target=3D"_blank">htt= ps://github.com/freebsd/freebsd-src/pull/661</a><br> >=C2=A0 =C2=A0 =C2=A0 Differential Revision: <a href=3D"https://reviews.= freebsd.org/D27959" rel=3D"noreferrer noreferrer" target=3D"_blank">https:/= /reviews.freebsd.org/D27959</a><br> <br> This restriction is too broad and omits all of the modern wifi firmware<br> klds from linker.hints, e.g.<br> <br> /boot/kernel/iwlwifi-3160-17.ucode.ko<br> /boot/kernel/iwlwifi-3168-29.ucode.ko<br> /boot/kernel/iwlwifi-7260-17.ucode.ko<br> /boot/kernel/iwlwifi-7265-17.ucode.ko<br> /boot/kernel/iwlwifi-7265D-29.ucode.ko<br> /boot/kernel/iwlwifi-8000C-36.ucode.ko<br> /boot/kernel/iwlwifi-8265-36.ucode.ko<br> /boot/kernel/iwlwifi-9000-pu-b0-jf-b0-46.ucode.ko<br> /boot/kernel/iwlwifi-9260-th-b0-jf-b0-46.ucode.ko<br> /boot/kernel/iwlwifi-Qu-b0-hr-b0-77.ucode.ko<br> /boot/kernel/iwlwifi-Qu-b0-jf-b0-77.ucode.ko<br> /boot/kernel/iwlwifi-Qu-c0-hr-b0-77.ucode.ko<br> /boot/kernel/iwlwifi-Qu-c0-jf-b0-77.ucode.ko<br> /boot/kernel/iwlwifi-QuZ-a0-hr-b0-77.ucode.ko<br> /boot/kernel/iwlwifi-QuZ-a0-jf-b0-77.ucode.ko<br> /boot/kernel/iwlwifi-cc-a0-77.ucode.ko<br> /boot/kernel/iwlwifi-so-a0-gf-a0-83.ucode.ko<br> /boot/kernel/iwlwifi-so-a0-gf-a0.pnvm.ko<br> /boot/kernel/iwlwifi-so-a0-gf4-a0-83.ucode.ko<br> /boot/kernel/iwlwifi-so-a0-gf4-a0.pnvm.ko<br> /boot/kernel/iwlwifi-so-a0-hr-b0-81.ucode.ko<br> /boot/kernel/iwlwifi-so-a0-jf-b0-77.ucode.ko<br> /boot/kernel/iwlwifi-ty-a0-gf-a0-83.ucode.ko<br> /boot/kernel/iwlwifi-ty-a0-gf-a0.pnvm.ko<br> /boot/kernel/rtw8723d_fw.bin.ko<br> /boot/kernel/rtw8821c_fw.bin.ko<br> /boot/kernel/rtw8822b_fw.bin.ko<br> /boot/kernel/rtw8822c_fw.bin.ko<br> /boot/kernel/rtw8822c_wow_fw.bin.ko<br> <br> all match this pattern and are skipped.<br> <br> I'm busy rewriting a bunch of kldxref to be a cross tool using libelf,<= br> but I think here you want to probably revert this and just add pkgsave<br> to the list of "known bad" suffixes.<br></blockquote></div></div>= <div dir=3D"auto"><br></div><div dir=3D"auto">Sure. Any reason to not just = require .ko? Or do we have to index the kernel too?</div><div dir=3D"auto">= <br></div><div dir=3D"auto">Warner=C2=A0</div><div dir=3D"auto"><br></div><= div dir=3D"auto"><div class=3D"gmail_quote"><blockquote class=3D"gmail_quot= e" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> -- <br> John Baldwin<br> <br> </blockquote></div></div></div> --000000000000f4a696060bddab28--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfp_Vz-K24%2BkBy1DZhMKoAjJ%2B-Z1m_9wB6DZ24=QTopBiA>