sys-kernel/coreos-firmware: Update to 20200817

Also sync with upstream.
This commit is contained in:
Krzesimir Nowak 2020-09-04 18:53:55 +02:00
parent 4e7dfb9c50
commit 36cf4b16e9
3 changed files with 40 additions and 38 deletions

View File

@ -1 +1 @@
DIST linux-firmware-20191022.tar.gz 198407909 BLAKE2B 646f382da9400d1dfc7bbcd5779169e7cdb078551093286e007131515446e693cd1254033c7e83054883649f02981a26b30aa81473f20e0ea24c3b09edd7c3b9 SHA512 27037bc1583d39f075fc6273428e02ef80d696b93cdc195b3cf9ddcd9edad6cc83d01213cd8b764b3c74a64bf6b0612744b5f0af6e06072b7b93a05b6e1b8b6c
DIST linux-firmware-20200817.tar.xz 121401548 BLAKE2B 77a9ddbab368994801c5f834b65e0c991798eb5ecaeecb84a5b69e886f7aae6e6186f60ebdd4f18449ffe639fb8230c3db108151026161ab23740da63be928a2 SHA512 dba347534d1b51ebcc55600c05293fad5f04f0bfdaec80b2ba27b40a9a20eb5c8bd76cb29d8ca6c814b067952cba4ee3fdb903510a171df98959d592b2c00c13

View File

@ -1,72 +1,58 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
EAPI=7
# Tell linux-info where to find the kernel source/build
KERNEL_DIR="${SYSROOT}/usr/src/linux"
KBUILD_OUTPUT="${SYSROOT}/var/cache/portage/sys-kernel/coreos-kernel"
inherit linux-info savedconfig
# In case this is a real snapshot, fill in commit below.
# For normal, tagged releases, leave blank
MY_COMMIT=
if [[ ${PV} == 99999999* ]]; then
inherit git-r3
SRC_URI=""
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-${PV}.tar.gz -> linux-firmware-${PV}.tar.gz"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86"
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"
else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-${PV}.tar.xz -> linux-firmware-${PV}.tar.xz"
fi
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+"
LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
BSD-2 BSD BSD-4 ISC MIT no-source-code"
SLOT="0"
IUSE="savedconfig"
CDEPEND=">=sys-kernel/coreos-modules-4.6.3-r1:="
DEPEND="${CDEPEND}
sys-kernel/coreos-sources"
#add anything else that collides to this
RDEPEND="!savedconfig? (
!sys-firmware/alsa-firmware[alsa_cards_ca0132]
!sys-firmware/alsa-firmware[alsa_cards_korg1212]
!sys-firmware/alsa-firmware[alsa_cards_maestro3]
!sys-firmware/alsa-firmware[alsa_cards_sb16]
!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
!media-tv/cx18-firmware
!<sys-firmware/ivtv-firmware-20080701-r1
!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
!net-dialup/ueagle-atm
!net-dialup/ueagle4-atm
!net-wireless/ar9271-firmware
!net-wireless/i2400m-fw
!net-wireless/libertas-firmware
!sys-firmware/rt61-firmware
!net-wireless/rt73-firmware
!net-wireless/rt2860-firmware
!net-wireless/rt2870-firmware
!sys-block/qla-fc-firmware
!sys-firmware/amd-ucode
!sys-firmware/iwl1000-ucode
!sys-firmware/iwl2000-ucode
!sys-firmware/iwl2030-ucode
!sys-firmware/iwl3945-ucode
!sys-firmware/iwl4965-ucode
!sys-firmware/iwl5000-ucode
!sys-firmware/iwl5150-ucode
!sys-firmware/iwl6000-ucode
!sys-firmware/iwl6005-ucode
!sys-firmware/iwl6030-ucode
!sys-firmware/iwl6050-ucode
!sys-firmware/iwl3160-ucode
!sys-firmware/iwl7260-ucode
!sys-firmware/iwl7265-ucode
!sys-firmware/iwl3160-7260-bt-ucode
!sys-firmware/radeon-ucode
)"
#add anything else that collides to this
RESTRICT="binchecks strip"
@ -78,14 +64,31 @@ src_unpack() {
git-r3_src_unpack
else
default
# Upstream linux-firmware tarball does not contain
# symlinks for cxgb4 firmware files, but "modinfo
# cxgb4.ko" shows it requires t?fw.bin files. These
# normally are installed by the copy-firmware.sh
# script, which refers to the WHENCE file. Both the
# script and the file are in the tarball. The WHENCE
# file actually mentions that these symlinks should be
# created, but apparently our ebuild is not using this
# way of installing the firmware files, so we need to
# create the symlinks to avoid failures at the
# firmware scanning stage.
ln -sfn t4fw-1.24.17.0.bin linux-firmware-${PV}/cxgb4/t4fw.bin
ln -sfn t5fw-1.24.17.0.bin linux-firmware-${PV}/cxgb4/t5fw.bin
ln -sfn t6fw-1.24.17.0.bin linux-firmware-${PV}/cxgb4/t6fw.bin
# upstream linux-firmware tarball does not create symlinks for
# cxgb4 firmware files, but "modinfo cxgb4.ko" shows it requires
# t?fw.bin files. So we need to create the symlinks to avoid
# failures at the firmware scanning stage.
ln -sfn t4fw-1.24.3.0.bin linux-firmware-${PV}/cxgb4/t4fw.bin
ln -sfn t5fw-1.24.3.0.bin linux-firmware-${PV}/cxgb4/t5fw.bin
ln -sfn t6fw-1.24.3.0.bin linux-firmware-${PV}/cxgb4/t6fw.bin
# 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
# the existence of the firmware, so the firmware
# scanning stage won't fail. Obviously, this means
# that if someone is going to use this specific
# renesas controller that requires the firmware, it
# won't work. Hopefully that file appears at some
# point in the tarball.
touch "linux-firmware-${PV}/renesas_usb_fw.mem"
fi
}
@ -160,7 +163,6 @@ src_prepare() {
# remove empty directories, bug #396073
find -type d -empty -delete || die
fi
}
src_install() {