From ebf22560eea93f7dc7f07fb349c8f4e13c0a3318 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 31 Aug 2021 18:15:05 +0200 Subject: [PATCH] sys-kernel/coreos-firmware: fix symlink to Intel ICE firmware Now that Kernel config `CONFIG_ICE` is enabled, its corresponding firmware file needs to be also in place. However, upstream linux-firmware tarball does not contain a correct symlink to `intel/ice/ddp/ice-1.3.26.0.pkg`, but `modinfo ice.ko` shows it requires `ice.pkg`. So we need to create the symlink to avoid failures at the firmware scanning stage like below: ``` Missing firmware: intel/ice/ddp/ice.pkg (ice.ko.xz) ``` --- ...-20210818.ebuild => coreos-firmware-20210818-r1.ebuild} | 0 .../coreos-firmware/coreos-firmware-99999999.ebuild | 7 +++++++ 2 files changed, 7 insertions(+) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/{coreos-firmware-20210818.ebuild => coreos-firmware-20210818-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20210818.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20210818-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20210818.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20210818-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild index bdb0d6b4a7..31df6f197c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild @@ -81,6 +81,13 @@ src_unpack() { ln -sfn t5fw-${CXGB_VERSION}.bin linux-firmware-${PV}/cxgb4/t5fw.bin ln -sfn t6fw-${CXGB_VERSION}.bin linux-firmware-${PV}/cxgb4/t6fw.bin + # Upstream linux-firmware tarball does not contain + # a correct symlink to intel/ice/ddp/ice-1.3.26.0.pkg, + # but "modinfo ice.ko" shows it requires ice.pkg. + # So we need to create the symlink to avoid failures at the + # firmware scanning stage. + ln -sfn ice-1.3.26.0.pkg linux-firmware-${PV}/intel/ice/ddp/ice.pkg + # The xhci-pci.ko kernel module started requiring a # renesas_usb_fw.mem firmware file, but this file is # nowhere to be found in the tarball. So we just fake