From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C0E2158091 for ; Sun, 22 Jun 2025 09:48:14 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 02628341967 for ; Sun, 22 Jun 2025 09:48:14 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E2BC3110534; Sun, 22 Jun 2025 09:48:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id DD300110534 for ; Sun, 22 Jun 2025 09:48:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99B773415DF for ; Sun, 22 Jun 2025 09:48:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB4112A08 for ; Sun, 22 Jun 2025 09:47:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1750585606.1e5be6af9463e13666223e95e078f4785a736e14.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/linux-firmware/linux-firmware-20250613-r1.ebuild sys-kernel/linux-firmware/linux-firmware-20250613.ebuild sys-kernel/linux-firmware/linux-firmware-99999999.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1e5be6af9463e13666223e95e078f4785a736e14 X-VCS-Branch: master Date: Sun, 22 Jun 2025 09:47:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b51db04-eced-46e3-9422-a657cf2eaec6 X-Archives-Hash: 735113dff8e3c07da8038a04bbaaf06d commit: 1e5be6af9463e13666223e95e078f4785a736e14 Author: Alexander Tsoy tsoy me> AuthorDate: Wed Jun 18 09:41:30 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 22 09:46:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5be6af sys-kernel/linux-firmware: directory->symlink transition workaround Bug: https://bugs.gentoo.org/958268#c3 Bug: https://bugs.gentoo.org/958268 Signed-off-by: Alexander Tsoy tsoy.me> Part-of: https://github.com/gentoo/gentoo/pull/42653 Closes: https://github.com/gentoo/gentoo/pull/42653 Signed-off-by: Sam James gentoo.org> ...ux-firmware-20250613.ebuild => linux-firmware-20250613-r1.ebuild} | 5 +++++ sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sys-kernel/linux-firmware/linux-firmware-20250613.ebuild b/sys-kernel/linux-firmware/linux-firmware-20250613-r1.ebuild similarity index 98% rename from sys-kernel/linux-firmware/linux-firmware-20250613.ebuild rename to sys-kernel/linux-firmware/linux-firmware-20250613-r1.ebuild index 2202b123f02c..fe39f88ef6cc 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20250613.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20250613-r1.ebuild @@ -371,6 +371,11 @@ pkg_preinst() { rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX fi + # Fix 'symlink is blocked by a directory' https://bugs.gentoo.org/958268#c3 + if has_version "<${CATEGORY}/${PN}-20250613" ; then + rm -rf "${EROOT}"/lib/firmware/nvidia/{ad103,ad104,ad106,ad107} + fi + # Make sure /boot is available if needed. use initramfs && ! use dist-kernel && mount-boot_pkg_preinst } diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index 2202b123f02c..fe39f88ef6cc 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -371,6 +371,11 @@ pkg_preinst() { rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX fi + # Fix 'symlink is blocked by a directory' https://bugs.gentoo.org/958268#c3 + if has_version "<${CATEGORY}/${PN}-20250613" ; then + rm -rf "${EROOT}"/lib/firmware/nvidia/{ad103,ad104,ad106,ad107} + fi + # Make sure /boot is available if needed. use initramfs && ! use dist-kernel && mount-boot_pkg_preinst }