From nobody Wed Dec 06 21:13:23 2023 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 4SlqrP64hTz53105; Wed, 6 Dec 2023 21:13:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlqrP5Yq7z3Tb2; Wed, 6 Dec 2023 21:13:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701897205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3PbWF0wdLtnIDMTpc+NokPGv3dF/lZtfMsCroWepwwE=; b=IHq5CDOb5K2qPVejke9GH4xXtOrsOX9uWssniVWR3djH/M33cZ9aeR8K3DPqLSDQ1nj5Op wrkth5cGO5iZuEwEaIzxWpaozau/Q3Kik+zf4mkdMeCK1pSp7FoBC74q+lVW5Mt4aHp6pT OG4AVDGHe5V83E3y+jndH/cluAlZ7e+h7oq0BufXllxX6YDCE0rXo6eUbRtQObd77znRI/ dbRMVGVb8/AF+ZGP9HF+ck0aQQs/XN6QmjnhZ+0FafpyNj9/RAmFRbOshF+c47sPtPIEnq +n/TixPJFrI0J76akEq9KiZfDLsJqV4waNIFeThm41aM0OtMDBDXmZ8TFkj//Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701897205; a=rsa-sha256; cv=none; b=j8ubpdryGZFf8kKpM7lr2fQsmVQ1LrH3vBukBTQjNfUhDOvx2e6tS0TkZGG1Il7l6Gc4Ji +vMsbzGxvxZQtvFBfglnbP7Gxn9jrPtmo61LRR8WK9PyWMvu2wEZZ4u+c3kEas8U5aPMVv xVFw1XmEIISJoL2OZlRmBsNE1IDwwPzzGRGwGV4Mtu58S4gR5T3Tm3honq4Q1mIRH1NM34 F47FjkyTDbl3QobsL4fnuzx4fzcyjroZ/uCkL4AAu3JbTJaFo7YC05ujjlSUTDj95NZNwl VESTkldb+wVkSbBa0gw1ZeyNLr1qXhOWdLoJ29bsatEJZGekowwcv4BYydHfPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701897205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3PbWF0wdLtnIDMTpc+NokPGv3dF/lZtfMsCroWepwwE=; b=tXmtBEotPSak1L8HcD0iUHkMsDbEEnAUZWimw3ugjy9w4jVdRc6EIxNRTPmc1TSILpAZzC 0R18h/bcLXnicbkSeAy2H2Lj5qEIuIN0GZFGwe7N8dXUL0dc28f6HTt6+rZD1+VIi8DfcL P7P9KdmfP7sjuDBzybCD8s233n1Rs3O6okvIqPVmhn6J1KY48klkpf0Iw/f7W/1shMqWhU nDybzoIHqUuSdDzOTWLzsrYJInFnCBb7TFCJuRVRZ0Dcx4AIHQToY4dojHUbfJnsUMj0qt gAsXRfqNI1uMGnzrVjKWp2t77WT5B1axYy4CNQjhauOlYSdTNLU/qPY1nXkpGA== Received: from [IPV6:2601:648:8384:fd00:8d37:e6e8:747c:72de] (unknown [IPv6:2601:648:8384:fd00:8d37:e6e8:747c:72de]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SlqrP1J7Fz1FZc; Wed, 6 Dec 2023 21:13:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 6 Dec 2023 13:13:23 -0800 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 773c13c686e4 - main - kldxref: skip .pkgsave files Content-Language: en-US To: Warner Losh Cc: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202302251737.31PHb2R8072300@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 12/6/23 1:02 PM, Warner Losh wrote: > On Wed, Dec 6, 2023, 1:04 PM John Baldwin 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ć >>> AuthorDate: 2023-02-25 17:31:58 +0000 >>> Commit: Warner Losh >>> 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? We do index the kernel as well, yes. However, we could probably get by with "kernel" and ends in ".ko" as a valid set of files. This would also avoid bogusly warning about linker.hints not being a valid ELF file on re-runs if you use -v. -- John Baldwin