From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (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 57EC215812D for ; Mon, 06 Jan 2025 20:26:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C26AE07BA; Mon, 06 Jan 2025 20:26:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15F58E07BA for ; Mon, 06 Jan 2025 20:26: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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E501335DE9 for ; Mon, 06 Jan 2025 20:26:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE7B31D2A for ; Mon, 06 Jan 2025 20:25:58 +0000 (UTC) From: "Nowa Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nowa Ammerlaan" Message-ID: <1736195135.6214198d6596fbf6b172d57d0ee824cf0b25dea8.nowa@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-20241017-r3.ebuild sys-kernel/linux-firmware/linux-firmware-20241110.ebuild sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild sys-kernel/linux-firmware/linux-firmware-20241210.ebuild sys-kernel/linux-firmware/linux-firmware-99999999.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: 6214198d6596fbf6b172d57d0ee824cf0b25dea8 X-VCS-Branch: master Date: Mon, 06 Jan 2025 20:25: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: eb01838e-25fc-46e4-b709-d413b7136e76 X-Archives-Hash: 2f091fb870c7b3d51f800e4ca0e56d83 commit: 6214198d6596fbf6b172d57d0ee824cf0b25dea8 Author: Nowa Ammerlaan gentoo org> AuthorDate: Mon Jan 6 17:42:05 2025 +0000 Commit: Nowa Ammerlaan gentoo org> CommitDate: Mon Jan 6 20:25:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6214198d sys-kernel/linux-firmware: drop left over -z ROOT condition This we don't need any more since dist-kernel_reinstall_initramfs already does the appropriate checks. Signed-off-by: Nowa Ammerlaan gentoo.org> sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild | 6 +++--- sys-kernel/linux-firmware/linux-firmware-20241110.ebuild | 6 +++--- sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild | 6 +++--- sys-kernel/linux-firmware/linux-firmware-20241210.ebuild | 6 +++--- sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild index a631c9c507f1..6d307d60b2c3 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -83,7 +83,7 @@ pkg_pretend() { if use dist-kernel; then # Check, but don't die because we can fix the problem and then # emerge --config ... to re-run installation. - [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status + nonfatal mount-boot_check_status else mount-boot_pkg_pretend fi @@ -388,7 +388,7 @@ pkg_postinst() { if use initramfs; then if use dist-kernel; then - [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst diff --git a/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild index e9871c3b719c..c9ea9c688a9a 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -82,7 +82,7 @@ pkg_pretend() { if use dist-kernel; then # Check, but don't die because we can fix the problem and then # emerge --config ... to re-run installation. - [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status + nonfatal mount-boot_check_status else mount-boot_pkg_pretend fi @@ -387,7 +387,7 @@ pkg_postinst() { if use initramfs; then if use dist-kernel; then - [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst diff --git a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild index 4f68f0a8809f..ec4a3c1f8df9 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -82,7 +82,7 @@ pkg_pretend() { if use dist-kernel; then # Check, but don't die because we can fix the problem and then # emerge --config ... to re-run installation. - [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status + nonfatal mount-boot_check_status else mount-boot_pkg_pretend fi @@ -387,7 +387,7 @@ pkg_postinst() { if use initramfs; then if use dist-kernel; then - [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst diff --git a/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild index e9871c3b719c..c9ea9c688a9a 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -82,7 +82,7 @@ pkg_pretend() { if use dist-kernel; then # Check, but don't die because we can fix the problem and then # emerge --config ... to re-run installation. - [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status + nonfatal mount-boot_check_status else mount-boot_pkg_pretend fi @@ -387,7 +387,7 @@ pkg_postinst() { if use initramfs; then if use dist-kernel; then - [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index 2e4486362db9..2931f5f88e0d 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -81,7 +81,7 @@ pkg_pretend() { if use dist-kernel; then # Check, but don't die because we can fix the problem and then # emerge --config ... to re-run installation. - [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status + nonfatal mount-boot_check_status else mount-boot_pkg_pretend fi @@ -381,7 +381,7 @@ pkg_postinst() { if use initramfs; then if use dist-kernel; then - [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst