Merge pull request #2631 from bgilbert/firmware

sys-kernel/coreos-firmware: update to 20170622
This commit is contained in:
Benjamin Gilbert 2017-06-29 13:03:10 -07:00 committed by GitHub
commit 7fd0621cf8
6 changed files with 10 additions and 11 deletions

View File

@ -1 +1 @@
DIST linux-firmware-20160331.tar.xz 35957140 SHA256 99ab767835006038e9efcc9d583b767c4a98091c35a6e2710f654e4fc2db7a45 SHA512 99694f336c4051d51f527399e225ee4a5842024d52f0d74204afd947ab5d0517c774e42519f469a1b653bc2ea026735bb83af5e495a8c2c5b5898ebe5d86cb40 WHIRLPOOL 17091f691577fa0976cb90cb6a60599155ff02afb95aacfa9c12228371c69d88750214b76f479cfdf55f36f7584a03c81158a61b1a593012e15db0ce8d740672
DIST linux-firmware-20170622.tar.gz 104302528 SHA256 03d220c1747ed71b54b53ce04bfb178fe937ba585309b4a0b32eb351d709fcb0 SHA512 946b31666ef79a21e29a757340482dfdb70b43f7818ca47bf5e16fb6a79bb585822af014731b6c6034944dd37269ae948bbc23fc1f104bccfd7b7b405f41bbd5 WHIRLPOOL dedfef88d4ba7fdc9b5e7c07f6a04221d4d34256678e366f3182d4180d0e8de4071ded809d285c89aa0ab68bdf05cd9b9c0139084d9497df4d420e7e91ba48c8

View File

@ -15,12 +15,12 @@ if [[ ${PV} == 99999999* ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
KEYWORDS=""
else
SRC_URI="mirror://gentoo/linux-firmware-${PV}.tar.xz"
SRC_URI="mirror://gentoo/linux-firmware-${PV}.tar.gz"
KEYWORDS="amd64 arm64"
fi
DESCRIPTION="Linux firmware files"
HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
SLOT="0/${PVR}"
@ -83,17 +83,15 @@ src_unpack() {
src_prepare() {
local kernel_mods="${ROOT}/lib/modules/${KV_FULL}"
# If any firmware is missing warn but don't raise a fuss. Missing
# files either means linux-firmware probably out-of-date but since
# this is new and hacky I'm not going to worry too much just yet.
# Fail if any firmware is missing.
einfo "Scanning for files required by ${KV_FULL}"
echo -n > "${T}/firmware-scan"
local kofile fwfile
local kofile fwfile failed
for kofile in $(find "${kernel_mods}" -name '*.ko'); do
for fwfile in $(modinfo --field firmware "${kofile}"); do
if [[ ! -e "${fwfile}" ]]; then
ewarn "Missing firmware: ${fwfile} (${kofile##*/})"
eerror "Missing firmware: ${fwfile} (${kofile##*/})"
failed=1
elif [[ -L "${fwfile}" ]]; then
echo "${fwfile}" >> "${T}/firmware-scan"
realpath --relative-to=. "${fwfile}" >> "${T}/firmware-scan"
@ -102,6 +100,9 @@ src_prepare() {
fi
done
done
if [[ -n "${failed}" ]]; then
die "Missing firmware"
fi
einfo "Pruning all unneeded firmware files..."
sort -u "${T}/firmware-scan" > "${T}/firmware"

View File

@ -440,8 +440,6 @@ CONFIG_SCSI_3W_9XXX=m
CONFIG_SCSI_3W_SAS=m
CONFIG_SCSI_AACRAID=m
CONFIG_SCSI_AIC79XX=m
CONFIG_SCSI_AIC94XX=m
# CONFIG_AIC94XX_DEBUG is not set
CONFIG_SCSI_MVSAS=m
# CONFIG_SCSI_MVSAS_DEBUG is not set
CONFIG_SCSI_MVSAS_TASKLET=y