commit: b93fd5aaf427285a4f7b5f11f6c7fc41c0144d95
Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 6 17:44:53 2025 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 20:25:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b93fd5aa
sys-firmware/intel-microcode: 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 <nowa <AT> gentoo.org>
.../intel-microcode/intel-microcode-20240813_p20240815.ebuild | 6 +++---
.../intel-microcode/intel-microcode-20240910_p20240915.ebuild | 6 +++---
.../intel-microcode/intel-microcode-20241112_p20241103.ebuild | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild
b/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild
index 3af9d1741d1e..b2000fab7d45 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.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
@@ -95,7 +95,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
@@ -311,7 +311,7 @@ pkg_postrm() {
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-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild
b/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild
index 3af9d1741d1e..b2000fab7d45 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.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
@@ -95,7 +95,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
@@ -311,7 +311,7 @@ pkg_postrm() {
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-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild
b/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild
index 3af9d1741d1e..b2000fab7d45 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.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
@@ -95,7 +95,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
@@ -311,7 +311,7 @@ pkg_postrm() {
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
