From 16f63fe8b0bc520a58920e7c32823b369f569b6b Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 27 Jun 2017 17:25:10 -0700 Subject: [PATCH 1/3] sys-kernel/coreos-firmware: update to 20170622 --- .../coreos-overlay/sys-kernel/coreos-firmware/Manifest | 2 +- ...are-20160331-r1.ebuild => coreos-firmware-20170622.ebuild} | 0 .../coreos-firmware/coreos-firmware-99999999.ebuild | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/{coreos-firmware-20160331-r1.ebuild => coreos-firmware-20170622.ebuild} (100%) 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 2fb76d1d10..41eeaa666b 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-20160331.tar.xz 35957140 SHA256 99ab767835006038e9efcc9d583b767c4a98091c35a6e2710f654e4fc2db7a45 SHA512 99694f336c4051d51f527399e225ee4a5842024d52f0d74204afd947ab5d0517c774e42519f469a1b653bc2ea026735bb83af5e495a8c2c5b5898ebe5d86cb40 WHIRLPOOL 17091f691577fa0976cb90cb6a60599155ff02afb95aacfa9c12228371c69d88750214b76f479cfdf55f36f7584a03c81158a61b1a593012e15db0ce8d740672 +DIST linux-firmware-20170622.tar.gz 104302528 SHA256 03d220c1747ed71b54b53ce04bfb178fe937ba585309b4a0b32eb351d709fcb0 SHA512 946b31666ef79a21e29a757340482dfdb70b43f7818ca47bf5e16fb6a79bb585822af014731b6c6034944dd37269ae948bbc23fc1f104bccfd7b7b405f41bbd5 WHIRLPOOL dedfef88d4ba7fdc9b5e7c07f6a04221d4d34256678e366f3182d4180d0e8de4071ded809d285c89aa0ab68bdf05cd9b9c0139084d9497df4d420e7e91ba48c8 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20160331-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20170622.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20160331-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20170622.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 3dd9d8beb3..ea2e4ce4ea 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 @@ -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}" From ec67ac4b0bf690afa68f3dde8ef815aa35333c2f Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 27 Jun 2017 18:07:23 -0700 Subject: [PATCH 2/3] sys-kernel/coreos-modules: drop AIC94XX SCSI driver It was first enabled in 469ed7cf257d8dbb69c971e67c9e549b2d784e72, but the driver has always required non-redistributable external firmware, which we've apparently never shipped. --- ...s-kernel-4.11.6-r1.ebuild => coreos-kernel-4.11.6-r2.ebuild} | 0 ...modules-4.11.6-r1.ebuild => coreos-modules-4.11.6-r2.ebuild} | 0 .../sys-kernel/coreos-modules/files/commonconfig-4.11 | 2 -- 3 files changed, 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.11.6-r1.ebuild => coreos-kernel-4.11.6-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.11.6-r1.ebuild => coreos-modules-4.11.6-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.6-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.11.6-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.11.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.11.6-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.11.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.11.6-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.11 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.11 index b5dde6d944..da8580bdbd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.11 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.11 @@ -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 From 4f7e0ee36846cf6c6a470d5395db2b53c9eb57ce Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 27 Jun 2017 18:30:29 -0700 Subject: [PATCH 3/3] sys-kernel/coreos-firmware: fail build if any firmware is missing Warnings will not be noticed. --- .../coreos-firmware/coreos-firmware-99999999.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 ea2e4ce4ea..87241401f2 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 @@ -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"