diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest index 40f0e7f04a..fa71770299 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest @@ -1 +1 @@ -DIST linux-firmware-20211216.tar.xz 198929516 BLAKE2B 01391e29d742b7e618563bdf011fd6541a20e51bc700c8f55550f2c50bf61b2c2cf105da7b655927be9fc0c7b38b7f03ebe968900b1716096074af037fb89eb2 SHA512 dfcecf4fa5471d590c6444853efb4923957c11e5cd16ba9c7612aa367af699184595e33a023c4821b6feb9d84dd5eb4c5cb1808fd3e524b859ecb84b95ba4fa6 +DIST linux-firmware-20230625_p20230724.tar.gz 441906566 BLAKE2B 5bed31d9ad78440bb12feeacb1ba27a07ad30b0eb8c7bfd03a4e7a7590012af1f9535a49fbf031abf79dd05ca90be79566f06db6f955910edfdca61281831c67 SHA512 daaf07422eb6f3e1b50f8a5dba5bfff747fe6750c0210ab798745f61d774eef7642ab45b9b404c668cf017d6b7fcf89c34bce9e6c77053b1b81f1a3498c5be18 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20211216.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20230625_p20230724.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20211216.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20230625_p20230724.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 128b4ac929..5a5989fb5f 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 @@ -10,7 +10,7 @@ inherit linux-info savedconfig # In case this is a real snapshot, fill in commit below. # For normal, tagged releases, leave blank -MY_COMMIT= +MY_COMMIT="59fbffa9ec8e4b0b31d2d13e715cf6580ad0e99c" if [[ ${PV} == 99999999* ]]; then inherit git-r3 @@ -18,6 +18,7 @@ if [[ ${PV} == 99999999* ]]; then else if [[ -n "${MY_COMMIT}" ]]; then SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> linux-firmware-${PV}.tar.gz" + S="${WORKDIR}/${MY_COMMIT}" else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-${PV}.tar.xz -> linux-firmware-${PV}.tar.xz" fi @@ -59,13 +60,19 @@ RESTRICT="binchecks strip" # source name is linux-firmware, not coreos-firmware S="${WORKDIR}/linux-firmware-${PV}" -CXGB_VERSION="1.26.4.0" +CXGB_VERSION="1.27.3.0" +ICE_DDP_VERSION="1.3.30.0" src_unpack() { if [[ ${PV} == 99999999* ]]; then git-r3_src_unpack else default + # rename directory from git snapshot tarball + if [[ ${#MY_COMMIT} -gt 8 ]]; then + mv ${MY_COMMIT}/ linux-firmware-${PV} || die + fi + # Upstream linux-firmware tarball does not contain # symlinks for cxgb4 firmware files, but "modinfo # cxgb4.ko" shows it requires t?fw.bin files. These @@ -86,7 +93,7 @@ src_unpack() { # 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 + ln -sfn ice-${ICE_DDP_VERSION}.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