Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files
Date: Wed, 06 Dec 2023 21:02:28 UTC
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=773c13c686e4b6ae9dbbc150b342b82c3f47d73a > > > > commit 773c13c686e4b6ae9dbbc150b342b82c3f47d73a > > Author: Mina Galić <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 -- > John Baldwin > >