From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- sys-kernel/linux-firmware/Manifest | 14 +- .../linux-firmware/linux-firmware-20190815.ebuild | 354 --------------------- .../linux-firmware/linux-firmware-20190923.ebuild | 354 --------------------- .../linux-firmware/linux-firmware-20191022.ebuild | 354 --------------------- .../linux-firmware/linux-firmware-20191215.ebuild | 354 --------------------- .../linux-firmware/linux-firmware-20200122.ebuild | 354 --------------------- .../linux-firmware/linux-firmware-20200619.ebuild | 333 +++++++++++++++++++ .../linux-firmware/linux-firmware-99999999.ebuild | 25 +- 8 files changed, 337 insertions(+), 1805 deletions(-) delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20190815.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20190923.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20191022.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20191215.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20200122.ebuild create mode 100644 sys-kernel/linux-firmware/linux-firmware-20200619.ebuild (limited to 'sys-kernel/linux-firmware') diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index 96d3d76e9503..f600d890925f 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -1,18 +1,10 @@ -DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703 SHA512 99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a -DIST linux-firmware-20190923.tar.gz 198130120 BLAKE2B 21f337e8ef693513b5569ab67bf3ae2323f2c9109ce3fc7d6d0d071974dc8c53301eb21e0b1c279753e867873e4bb04274c0b2b5bfb1160aeaff2f2c92d7f26c SHA512 1421f283602fe889b6fba5d84eab1199c63c597a4fb487583bee188cfa01c7d41bde4ac53eee992a6aa1bb95a77126eee786f96fb682cd7992c5ec581601db54 -DIST linux-firmware-20191022.tar.gz 198935619 BLAKE2B 94d90a8e85af7104f08c398d3df20a88dc4d6f86d638565ab6e45e7fc5dff53e4e56a62a859585438812a1438ea7f7c4e4e47ce4adb22b0adf69439feb5803b4 SHA512 2cc99664c8d0275b670373581d7c6e29699f8b84cd6403949182cc1970c3241e5d9c388c34643630a237d87962b7c8e891445969ca9817ac92a4bbbe74e0dc0d -DIST linux-firmware-20191215.tar.gz 203746264 BLAKE2B cd756ac1b1bde9706cd8321133da2e4e620a3236614427ae9836fc5e98fbc62e79060e6cf50717b41391fba9d56e16140f722ffcc5764e4b81ad2e798d1b41ec SHA512 75eb78ef642cc48dc3d8d2cdd7e5312b82ee3c9ebd6ead40a02fdc1d4329c5a9226237fa0ec8e617fc358cc12144dacf4ef6c1441fe444974c1506ef21ea70a0 -DIST linux-firmware-20200122.tar.gz 219807963 BLAKE2B 976cf7f8da61213a1210348cffdda8cae1b3f3a2d46aac05fe331fdff37e954620c2768f8941e0d4b6fff8c7b69d68b86516c9df9b9cf96538a4463b0957d1a2 SHA512 23500cc99d31597fe691341404cbe9375f7995783b4bf055a53a67ace380bdf9db1c247f12ae7e63ac02e4078e5089aa33e5cc6c2622b26dfaab4a65bfab1db3 DIST linux-firmware-20200316.tar.gz 221745284 BLAKE2B 6ab4944927420dd8c50d3a97beb32aff22917ab13b283c3358de9f5331479c2a4353dde68a221ac221e9ff5202e46cdaaab9b65cd0431a3984877ab44e2bd0ab SHA512 2fb16fcc474753902ab0236cbb116cdd5de10080d5ad5fc19a015ad3881a203c42beeccf5745e18346fc028a5c743d3d6439f0a04b86b2e0abf9f32aa5f55bad DIST linux-firmware-20200421.tar.gz 223307272 BLAKE2B 0f598acd7e88b4dbe275509a6cd7709ee8f6dddf79b262be3967b0ec19f4b51e1deb7bd4be8b392af42a7dcf31e978126b3390b2748ee71fd0172318d5252ccf SHA512 3f8ec2150f9895381e71cb0d0d403694784c4a50f164da59d338dbb37bb643150bed2c6de4729d37f25989b8e799475a53319882c05a06d3eadcc4c349082162 DIST linux-firmware-20200519.tar.gz 234290201 BLAKE2B 00852b1e035f28aae5532d6ba92d547857ac6445e17b9f29b0954a460a1af9a98b348ad1700cd9f78baa83a2c63b657b6c10a8944188c6d4edf85c2336cc5763 SHA512 9724cf3d1aea73f264d53564ef160a62e90bb35766f3300bbbeaf7c7c6a356ef50c7d17bfa01197e8e991ff72b1aeef002bb78f5dc78243b2792cafbf1139dff -EBUILD linux-firmware-20190815.ebuild 9648 BLAKE2B 0db410cd671af196fdea060a6e199a1658e13684fc6fcb2880b8b31fc5c8108efebd478b2235a1fb0d93c959697946fb74c71c7e6665c0f61822f4f7c0ec0242 SHA512 91f5c8a7157a5b32073d791758f66f50816a3ade7d3045ccc68708110fc42dbd692820334371fe298f32871b054df275eabe96217ecc5432c766ca2b8b62b895 -EBUILD linux-firmware-20190923.ebuild 9648 BLAKE2B 7c661531b5e7800ebce4bd8720d58f99e036bd4282982a34a8f14c4c75e7031b301c8bfdf15016aa4df082f3f3c45fbe7b0b63370096467a395bc1ac4922c9ae SHA512 fde2a958629a49f6b51a8443aad1158d4a3655ffcdb0c1d872ab507cef1b07420c63661a5846390c78eb81d7cd6d36782875d1b2c2399aef9937ce02e97bcd5c -EBUILD linux-firmware-20191022.ebuild 9648 BLAKE2B 8d8fb50d68faae58e2f6af8f6bac97917749756318a5baa04c7c3530b10d494d8cdb9d56e412806c1c8f97a3d0e2b7c1e5ada2373f1c39c5c068ab92a49a56a7 SHA512 95889ab2a87066138ad59adccbdc9e1281c29b5ed4504fe1f0594416841ceee9ede3ebaa4b249ae3ea4504be9635b5334c33124647772f97e62fb3a11ab8a461 -EBUILD linux-firmware-20191215.ebuild 9648 BLAKE2B bdd9169b53bbacec33a2264810ad3cc8cdc68d05036c37b2635abda96426322b680504978e61015d9761fe65688c4c7a7ce8521f2629c159872f4c83e4cb5e90 SHA512 6e0fa4b4792100099fb85d5726485d31bda067be9ce3b252c2f531acddf6bb5a49c8fd2188812daa8e8905012d728e15d701ba6679dcfb2e4a084d3842053cbd -EBUILD linux-firmware-20200122.ebuild 9648 BLAKE2B cce67724bab2e103203d4a55802fbc75a3c924d8b897dd2baac302276f47b70fcfe25bae3ff7d540a5d2ec2c70b126dfd4c4d9d782a37471223cd739ed1388af SHA512 991c72eac102ff6444f70e86a7a5e9c4f8781c8cf376e8dc68e21b1315cd4601d017d7aa701427246810fc21f6e653c6f1014986a2faaa3835dce494379c470c +DIST linux-firmware-20200619.tar.gz 250595335 BLAKE2B 9bb010b6600d02c536caf17502e54c5225934706eff747d7edaf55774f3c78841d3ff235b7eed037ff117e6e29e7ac11fec498fcace5c52f8b0ddd6b553b96f8 SHA512 9ee615f7d458e453ac53294cb920f322fa29c84255d127cd5f47fad178b0983e7e3fcd6be0b80bc6878c01258bdf75a1356ff6b6766279b10f352bfdb2e4b9a5 EBUILD linux-firmware-20200316.ebuild 9660 BLAKE2B 6368aae540fb7bb98a57d4ad70741873094fdfd3aa36bef754562a5f8c48093079f86e2c8e909c2d1e66c2793a826334c0469511cb4a719d4bb0c7755b23ea47 SHA512 c90a9722986f83c90fe9b2b9878c99eba98e986c13fb88268fd3609a978d43aabae0928d2e4ed515fb702a4661e07a20a3ce7c499dcf72684e2d3b74287aa4fe EBUILD linux-firmware-20200421.ebuild 9660 BLAKE2B c741265f2a3dafb946563c8cb0261ca1f99c015bcb2550b4a87ca9d14545f55e5005313791b0b81d9e847d6077dc055ac7306f19017ce53716b8990c85e5397c SHA512 44ea1aecdbaf9212b794642d73f5fefeffdf9e6a35ab0975d7cab3398cf73ef0a4e8e4c2797d46b576d528b23ac794f4a9a078becc9ac5ce66cf278eab1863ac EBUILD linux-firmware-20200519.ebuild 9660 BLAKE2B cd503e55e0c033302121d852cd184fed2a9b03d4145750173189052d369e08efe8bef2165e6e1f1a7aab17bdafd5fc162291cacb473cbe96404cf6d8a6fffbad SHA512 b5393343df8bfe9c62faad9e31ec97c0f8cc691d3bc637cb233a9d74a731987e72835fc437d0541ed4aa86cb02fc4ee2bf7f3c1e84de99c353217037c8ddd381 -EBUILD linux-firmware-99999999.ebuild 9661 BLAKE2B b32eb941d517abf7a0249c1e7b09765249740d117732e32bf5c5bc3930ff231eb798fa1865d654c7064dbbde318298c2450dfc86095dcac985e2d38045349749 SHA512 985b209c055103931971e0ef662d908aa73c79dceb32431614ac9d9cbbf459f363336281d2b18124ada15fd37ffe16a8ab19dc9800194f980e217c6f8c83a0bb +EBUILD linux-firmware-20200619.ebuild 8852 BLAKE2B b2b88cc88050011ebd76d527e2941e74307971b38eca60ca2949a02899506b8384e141df640c76f32ed4d6f837b09e06a8de146a38b06e78d6dac640c9dd7ffa SHA512 0f6a5df627918340e365b492a123279d89bc91fb46f94245cb3561ad8741678ac2b9bbd2fb4d6ea547c3bcb9054e17810b69ce7dc72e569a4422509a4206a249 +EBUILD linux-firmware-99999999.ebuild 8861 BLAKE2B 013f41958e6fde36b8103c0b980688eab0f1e902631355109cd8a9c0889e0b2dcc869f320993bc0557b49d18f613aed28ff44d302531dd8bf30fa9535fe97cd5 SHA512 9842369bb1e087b426068130a87da0b9d546a6b297ee0c79a18437313de55d44f5acbd732ad8548bc0f44dcbb18c5f46c3f5f77e76da24dbd13374b28f820646 MISC metadata.xml 867 BLAKE2B db510434e654367fb0ae439b1a3ca3fc170f558022f07634a534ea982f2445ff656fa618b9dac5ebb6ac2f64d9ee93dcc59525c1f3d429eda4ebce05a678298c SHA512 5429e7424fac663e3448e80dad98365239b855f09522fe7ea3cd2c731bec37fee29209cc8ead46e73ea03cd85a3e9c8fafe18ddf4a35e5bb55513d63ad5ae7ff diff --git a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild deleted file mode 100644 index cf65c9dc98fb..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit mount-boot savedconfig - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - GIT_COMMIT="07b925b450bfb4cf3e141c612ec5b104658cd020" - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - 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="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) - redistributable? ( - linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) - unknown-license? ( all-rights-reserved )" -SLOT="0" -IUSE="initramfs +redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -REQUIRED_USE="initramfs? ( redistributable )" - -BDEPEND="initramfs? ( app-arch/cpio )" - -#add anything else that collides to this -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! "${UCODETMP}/early_cpio" - - local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin" - cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode" - - if [[ ! -s "${amd_ucode_file}" ]]; then - die "Sanity check failed: '${amd_ucode_file}' is empty!" - fi - - pushd "${UCODETMP}" &>/dev/null || die - find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img - popd &>/dev/null || die - if [[ ! -s "${S}/amd-uc.img" ]]; then - die "Failed to create '${S}/amd-uc.img'!" - fi - else - # If this will ever happen something has changed which - # must be reviewed - die "'${S}/amd-ucode' not found!" - fi - fi - - echo "# Remove files that shall not be installed from this list." > ${PN}.conf - find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - ebegin "Removing all files not listed in config" - find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \ - | grep -Fvx -f <(grep -v '^#' ${PN}.conf \ - || die "grep failed, empty config file?") \ - | xargs -d '\n' --no-run-if-empty rm - eend $? || die - fi - - # remove empty directories, bug #396073 - find -type d -empty -delete || die -} - -src_install() { - save_config ${PN}.conf - rm ${PN}.conf || die - - if use initramfs ; then - mkdir "${ED}/boot" || die - mv "${S}"/amd-uc.img "${ED}/boot" || die - fi - - if ! ( shopt -s failglob; : * ) 2>/dev/null; then - eerror "No files to install. Check your USE flag settings" - eerror "and the list of files in your saved configuration." - die "Refusing to install an empty package" - fi - - insinto /lib/firmware/ - doins -r * -} - -pkg_preinst() { - if use savedconfig; then - ewarn "USE=savedconfig is active. You must handle file collisions manually." - fi - - # Make sure /boot is available if needed. - use initramfs && mount-boot_pkg_preinst -} - -pkg_postinst() { - elog "If you are only interested in particular firmware files, edit the saved" - elog "configfile and remove those that you do not want." - - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt 20190514; then - elog - elog 'Starting with version 20190514, installation of many firmware' - elog 'files is controlled by USE flags. Please review your USE flag' - elog 'and package.license settings if you are missing some files.' - break - fi - done - - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postinst -} - -pkg_prerm() { - # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! - use initramfs && mount-boot_pkg_prerm -} - -pkg_postrm() { - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postrm -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild deleted file mode 100644 index e212d2e40887..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit mount-boot savedconfig - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - GIT_COMMIT="417a9c6e197a8d3eec792494efc87a2b42f76324" - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - 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="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) - redistributable? ( - linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) - unknown-license? ( all-rights-reserved )" -SLOT="0" -IUSE="initramfs +redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -REQUIRED_USE="initramfs? ( redistributable )" - -BDEPEND="initramfs? ( app-arch/cpio )" - -#add anything else that collides to this -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! "${UCODETMP}/early_cpio" - - local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin" - cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode" - - if [[ ! -s "${amd_ucode_file}" ]]; then - die "Sanity check failed: '${amd_ucode_file}' is empty!" - fi - - pushd "${UCODETMP}" &>/dev/null || die - find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img - popd &>/dev/null || die - if [[ ! -s "${S}/amd-uc.img" ]]; then - die "Failed to create '${S}/amd-uc.img'!" - fi - else - # If this will ever happen something has changed which - # must be reviewed - die "'${S}/amd-ucode' not found!" - fi - fi - - echo "# Remove files that shall not be installed from this list." > ${PN}.conf - find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - ebegin "Removing all files not listed in config" - find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \ - | grep -Fvx -f <(grep -v '^#' ${PN}.conf \ - || die "grep failed, empty config file?") \ - | xargs -d '\n' --no-run-if-empty rm - eend $? || die - fi - - # remove empty directories, bug #396073 - find -type d -empty -delete || die -} - -src_install() { - save_config ${PN}.conf - rm ${PN}.conf || die - - if use initramfs ; then - mkdir "${ED}/boot" || die - mv "${S}"/amd-uc.img "${ED}/boot" || die - fi - - if ! ( shopt -s failglob; : * ) 2>/dev/null; then - eerror "No files to install. Check your USE flag settings" - eerror "and the list of files in your saved configuration." - die "Refusing to install an empty package" - fi - - insinto /lib/firmware/ - doins -r * -} - -pkg_preinst() { - if use savedconfig; then - ewarn "USE=savedconfig is active. You must handle file collisions manually." - fi - - # Make sure /boot is available if needed. - use initramfs && mount-boot_pkg_preinst -} - -pkg_postinst() { - elog "If you are only interested in particular firmware files, edit the saved" - elog "configfile and remove those that you do not want." - - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt 20190514; then - elog - elog 'Starting with version 20190514, installation of many firmware' - elog 'files is controlled by USE flags. Please review your USE flag' - elog 'and package.license settings if you are missing some files.' - break - fi - done - - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postinst -} - -pkg_prerm() { - # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! - use initramfs && mount-boot_pkg_prerm -} - -pkg_postrm() { - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postrm -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild b/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild deleted file mode 100644 index b5f0efd8ab05..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit mount-boot savedconfig - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - GIT_COMMIT="2b016afc348ba4b5fb2016ffcb2822f4a293da0c" - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - 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="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) - redistributable? ( - linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) - unknown-license? ( all-rights-reserved )" -SLOT="0" -IUSE="initramfs +redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -REQUIRED_USE="initramfs? ( redistributable )" - -BDEPEND="initramfs? ( app-arch/cpio )" - -#add anything else that collides to this -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! "${UCODETMP}/early_cpio" - - local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin" - cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode" - - if [[ ! -s "${amd_ucode_file}" ]]; then - die "Sanity check failed: '${amd_ucode_file}' is empty!" - fi - - pushd "${UCODETMP}" &>/dev/null || die - find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img - popd &>/dev/null || die - if [[ ! -s "${S}/amd-uc.img" ]]; then - die "Failed to create '${S}/amd-uc.img'!" - fi - else - # If this will ever happen something has changed which - # must be reviewed - die "'${S}/amd-ucode' not found!" - fi - fi - - echo "# Remove files that shall not be installed from this list." > ${PN}.conf - find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - ebegin "Removing all files not listed in config" - find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \ - | grep -Fvx -f <(grep -v '^#' ${PN}.conf \ - || die "grep failed, empty config file?") \ - | xargs -d '\n' --no-run-if-empty rm - eend $? || die - fi - - # remove empty directories, bug #396073 - find -type d -empty -delete || die -} - -src_install() { - save_config ${PN}.conf - rm ${PN}.conf || die - - if use initramfs ; then - mkdir "${ED}/boot" || die - mv "${S}"/amd-uc.img "${ED}/boot" || die - fi - - if ! ( shopt -s failglob; : * ) 2>/dev/null; then - eerror "No files to install. Check your USE flag settings" - eerror "and the list of files in your saved configuration." - die "Refusing to install an empty package" - fi - - insinto /lib/firmware/ - doins -r * -} - -pkg_preinst() { - if use savedconfig; then - ewarn "USE=savedconfig is active. You must handle file collisions manually." - fi - - # Make sure /boot is available if needed. - use initramfs && mount-boot_pkg_preinst -} - -pkg_postinst() { - elog "If you are only interested in particular firmware files, edit the saved" - elog "configfile and remove those that you do not want." - - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt 20190514; then - elog - elog 'Starting with version 20190514, installation of many firmware' - elog 'files is controlled by USE flags. Please review your USE flag' - elog 'and package.license settings if you are missing some files.' - break - fi - done - - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postinst -} - -pkg_prerm() { - # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! - use initramfs && mount-boot_pkg_prerm -} - -pkg_postrm() { - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postrm -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild b/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild deleted file mode 100644 index 9ab4a3265a20..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit mount-boot savedconfig - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - GIT_COMMIT="f1100ddf581f49aa79a54b56fe6ef0815a7ae57e" - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - 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="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) - redistributable? ( - linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) - unknown-license? ( all-rights-reserved )" -SLOT="0" -IUSE="initramfs +redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -REQUIRED_USE="initramfs? ( redistributable )" - -BDEPEND="initramfs? ( app-arch/cpio )" - -#add anything else that collides to this -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! "${UCODETMP}/early_cpio" - - local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin" - cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode" - - if [[ ! -s "${amd_ucode_file}" ]]; then - die "Sanity check failed: '${amd_ucode_file}' is empty!" - fi - - pushd "${UCODETMP}" &>/dev/null || die - find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img - popd &>/dev/null || die - if [[ ! -s "${S}/amd-uc.img" ]]; then - die "Failed to create '${S}/amd-uc.img'!" - fi - else - # If this will ever happen something has changed which - # must be reviewed - die "'${S}/amd-ucode' not found!" - fi - fi - - echo "# Remove files that shall not be installed from this list." > ${PN}.conf - find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - ebegin "Removing all files not listed in config" - find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \ - | grep -Fvx -f <(grep -v '^#' ${PN}.conf \ - || die "grep failed, empty config file?") \ - | xargs -d '\n' --no-run-if-empty rm - eend $? || die - fi - - # remove empty directories, bug #396073 - find -type d -empty -delete || die -} - -src_install() { - save_config ${PN}.conf - rm ${PN}.conf || die - - if use initramfs ; then - mkdir "${ED}/boot" || die - mv "${S}"/amd-uc.img "${ED}/boot" || die - fi - - if ! ( shopt -s failglob; : * ) 2>/dev/null; then - eerror "No files to install. Check your USE flag settings" - eerror "and the list of files in your saved configuration." - die "Refusing to install an empty package" - fi - - insinto /lib/firmware/ - doins -r * -} - -pkg_preinst() { - if use savedconfig; then - ewarn "USE=savedconfig is active. You must handle file collisions manually." - fi - - # Make sure /boot is available if needed. - use initramfs && mount-boot_pkg_preinst -} - -pkg_postinst() { - elog "If you are only interested in particular firmware files, edit the saved" - elog "configfile and remove those that you do not want." - - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt 20190514; then - elog - elog 'Starting with version 20190514, installation of many firmware' - elog 'files is controlled by USE flags. Please review your USE flag' - elog 'and package.license settings if you are missing some files.' - break - fi - done - - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postinst -} - -pkg_prerm() { - # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! - use initramfs && mount-boot_pkg_prerm -} - -pkg_postrm() { - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postrm -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild deleted file mode 100644 index 48f34fefc553..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit mount-boot savedconfig - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - GIT_COMMIT="1eb2408c6feacccd10b02a49214745f15d1c6fb7" - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - 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="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) - redistributable? ( - linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) - unknown-license? ( all-rights-reserved )" -SLOT="0" -IUSE="initramfs +redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -REQUIRED_USE="initramfs? ( redistributable )" - -BDEPEND="initramfs? ( app-arch/cpio )" - -#add anything else that collides to this -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! "${UCODETMP}/early_cpio" - - local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin" - cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode" - - if [[ ! -s "${amd_ucode_file}" ]]; then - die "Sanity check failed: '${amd_ucode_file}' is empty!" - fi - - pushd "${UCODETMP}" &>/dev/null || die - find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img - popd &>/dev/null || die - if [[ ! -s "${S}/amd-uc.img" ]]; then - die "Failed to create '${S}/amd-uc.img'!" - fi - else - # If this will ever happen something has changed which - # must be reviewed - die "'${S}/amd-ucode' not found!" - fi - fi - - echo "# Remove files that shall not be installed from this list." > ${PN}.conf - find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - ebegin "Removing all files not listed in config" - find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \ - | grep -Fvx -f <(grep -v '^#' ${PN}.conf \ - || die "grep failed, empty config file?") \ - | xargs -d '\n' --no-run-if-empty rm - eend $? || die - fi - - # remove empty directories, bug #396073 - find -type d -empty -delete || die -} - -src_install() { - save_config ${PN}.conf - rm ${PN}.conf || die - - if use initramfs ; then - mkdir "${ED}/boot" || die - mv "${S}"/amd-uc.img "${ED}/boot" || die - fi - - if ! ( shopt -s failglob; : * ) 2>/dev/null; then - eerror "No files to install. Check your USE flag settings" - eerror "and the list of files in your saved configuration." - die "Refusing to install an empty package" - fi - - insinto /lib/firmware/ - doins -r * -} - -pkg_preinst() { - if use savedconfig; then - ewarn "USE=savedconfig is active. You must handle file collisions manually." - fi - - # Make sure /boot is available if needed. - use initramfs && mount-boot_pkg_preinst -} - -pkg_postinst() { - elog "If you are only interested in particular firmware files, edit the saved" - elog "configfile and remove those that you do not want." - - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt 20190514; then - elog - elog 'Starting with version 20190514, installation of many firmware' - elog 'files is controlled by USE flags. Please review your USE flag' - elog 'and package.license settings if you are missing some files.' - break - fi - done - - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postinst -} - -pkg_prerm() { - # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! - use initramfs && mount-boot_pkg_prerm -} - -pkg_postrm() { - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postrm -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild new file mode 100644 index 000000000000..29a17fd934b9 --- /dev/null +++ b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild @@ -0,0 +1,333 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit mount-boot savedconfig + +if [[ ${PV} == 99999999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" +else + SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${PV}.tar.gz" + 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="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) + redistributable? ( + linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) + unknown-license? ( all-rights-reserved )" +SLOT="0" +IUSE="initramfs +redistributable savedconfig unknown-license" +RESTRICT="binchecks strip + unknown-license? ( bindist )" + +REQUIRED_USE="initramfs? ( redistributable )" + +BDEPEND="initramfs? ( app-arch/cpio )" + +#add anything else that collides to this +RDEPEND="!savedconfig? ( + redistributable? ( + !sys-firmware/alsa-firmware[alsa_cards_ca0132] + !net-dialup/ueagle-atm + !net-dialup/ueagle4-atm + !sys-block/qla-fc-firmware + !sys-firmware/iwl1000-ucode + !sys-firmware/iwl6005-ucode + !sys-firmware/iwl6030-ucode + !sys-firmware/iwl6050-ucode + !sys-firmware/iwl3160-ucode + !sys-firmware/iwl7260-ucode + !sys-firmware/iwl3160-7260-bt-ucode + ) + unknown-license? ( + !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] + ) + )" + +pkg_pretend() { + use initramfs && mount-boot_pkg_pretend +} + +src_unpack() { + if [[ ${PV} == 99999999* ]]; then + git-r3_src_unpack + else + default + # rename directory from git snapshot tarball + if [[ ${#GIT_COMMIT} -gt 8 ]]; then + mv ${PN}-*/ ${P} || die + fi + fi +} + +src_prepare() { + # source and documentation files, not to be installed + local source_files=( + README + WHENCE + "LICEN[CS]E*" + "GPL*" + configure + Makefile + check_whence.py + atusb/ChangeLog + av7110/Boot.S + av7110/Makefile + carl9170fw/ + cis/Makefile + cis/src/ + dsp56k/bootstrap.asm + dsp56k/concat-bootstrap.pl + dsp56k/Makefile + "isci/*.[ch]" + isci/Makefile + isci/README + "keyspan_pda/*.S" + keyspan_pda/Makefile + usbdux/ + ) + + # whitelist of images with a free software license + local free_software=( + # keyspan_pda (GPL-2+) + keyspan_pda/keyspan_pda.fw + keyspan_pda/xircom_pgs.fw + # dsp56k (GPL-2+) + dsp56k/bootstrap.bin + # ath9k_htc (BSD GPL-2+ MIT) + ath9k_htc/htc_7010-1.4.0.fw + ath9k_htc/htc_9271-1.4.0.fw + # pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1) + cis/LA-PCM.cis + cis/PCMLM28.cis + cis/DP83903.cis + cis/NE2K.cis + cis/tamarack.cis + cis/PE-200.cis + cis/PE520.cis + cis/3CXEM556.cis + cis/3CCFEM556.cis + cis/MT5634ZLX.cis + cis/RS-COM-2P.cis + cis/COMpad2.cis + cis/COMpad4.cis + # serial_cs (GPL-3) + cis/SW_555_SER.cis + cis/SW_7xx_SER.cis + cis/SW_8xx_SER.cis + # dvb-ttpci (GPL-2+) + av7110/bootcode.bin + # usbdux, usbduxfast, usbduxsigma (GPL-2+) + usbdux_firmware.bin + usbduxfast_firmware.bin + usbduxsigma_firmware.bin + # brcmfmac (GPL-2+) + brcm/brcmfmac4330-sdio.Prowise-PT301.txt + brcm/brcmfmac43340-sdio.meegopad-t08.txt + brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt + brcm/brcmfmac43362-sdio.lemaker,bananapro.txt + brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt + "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt" + brcm/brcmfmac43430-sdio.AP6212.txt + brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt + brcm/brcmfmac43430-sdio.MUR1DX.txt + brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt + brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt + brcm/brcmfmac4356-pcie.gpd-win-pocket.txt + # isci (GPL-2) + isci/isci_firmware.bin + # carl9170 (GPL-2+) + carl9170-1.fw + # atusb (GPL-2+) + atusb/atusb-0.2.dfu + atusb/atusb-0.3.dfu + atusb/rzusb-0.3.bin + # mlxsw_spectrum (dual BSD/GPL-2) + mellanox/mlxsw_spectrum-13.1420.122.mfa2 + mellanox/mlxsw_spectrum-13.1530.152.mfa2 + mellanox/mlxsw_spectrum-13.1620.192.mfa2 + mellanox/mlxsw_spectrum-13.1702.6.mfa2 + mellanox/mlxsw_spectrum-13.1703.4.mfa2 + mellanox/mlxsw_spectrum-13.1910.622.mfa2 + mellanox/mlxsw_spectrum-13.2000.1122.mfa2 + ) + + # blacklist of images with unknown license + local unknown_license=( + atmsar11.fw + korg/k1212.dsp + ess/maestro3_assp_kernel.fw + ess/maestro3_assp_minisrc.fw + yamaha/ds1_ctrl.fw + yamaha/ds1_dsp.fw + yamaha/ds1e_ctrl.fw + tr_smctr.bin + ttusb-budget/dspbootcode.bin + emi62/bitstream.fw + emi62/loader.fw + emi62/midi.fw + emi62/spdif.fw + ti_3410.fw + ti_5052.fw + mts_mt9234mu.fw + mts_mt9234zba.fw + whiteheat.fw + whiteheat_loader.fw + intelliport2.bin + cpia2/stv0672_vp4.bin + vicam/firmware.fw + edgeport/boot.fw + edgeport/boot2.fw + edgeport/down.fw + edgeport/down2.fw + edgeport/down3.bin + sb16/mulaw_main.csp + sb16/alaw_main.csp + sb16/ima_adpcm_init.csp + sb16/ima_adpcm_playback.csp + sb16/ima_adpcm_capture.csp + sun/cassini.bin + acenic/tg1.bin + acenic/tg2.bin + adaptec/starfire_rx.bin + adaptec/starfire_tx.bin + yam/1200.bin + yam/9600.bin + 3com/3C359.bin + ositech/Xilinx7OD.bin + qlogic/isp1000.bin + myricom/lanai.bin + yamaha/yss225_registers.bin + lgs8g75.fw + ) + + default + + # remove sources and documentation (wildcards are expanded) + rm -r ${source_files[@]} || die + rm -rf .git + + if use !unknown-license; then + # remove files in unknown_license + rm "${unknown_license[@]}" || die + fi + + if use !redistributable; then + # remove files _not_ in the free_software or unknown_license lists + # everything else is confirmed (or assumed) to be redistributable + # based on upstream acceptance policy + local IFS=$'\n' + find ! -type d -printf "%P\n" \ + | grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \ + | xargs -d '\n' rm || die + IFS=$' \t\n' + fi + + if use initramfs; then + if [[ -d "${S}/amd-ucode" ]]; then + local UCODETMP="${T}/ucode_tmp" + local UCODEDIR="${UCODETMP}/kernel/x86/microcode" + mkdir -p "${UCODEDIR}" || die + echo 1 > "${UCODETMP}/early_cpio" + + local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin" + cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode" + + if [[ ! -s "${amd_ucode_file}" ]]; then + die "Sanity check failed: '${amd_ucode_file}' is empty!" + fi + + pushd "${UCODETMP}" &>/dev/null || die + find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img + popd &>/dev/null || die + if [[ ! -s "${S}/amd-uc.img" ]]; then + die "Failed to create '${S}/amd-uc.img'!" + fi + else + # If this will ever happen something has changed which + # must be reviewed + die "'${S}/amd-ucode' not found!" + fi + fi + + echo "# Remove files that shall not be installed from this list." > ${PN}.conf + find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf + + if use savedconfig; then + restore_config ${PN}.conf + + ebegin "Removing all files not listed in config" + find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \ + | grep -Fvx -f <(grep -v '^#' ${PN}.conf \ + || die "grep failed, empty config file?") \ + | xargs -d '\n' --no-run-if-empty rm + eend $? || die + fi + + # remove empty directories, bug #396073 + find -type d -empty -delete || die +} + +src_install() { + save_config ${PN}.conf + rm ${PN}.conf || die + + if use initramfs ; then + mkdir "${ED}/boot" || die + mv "${S}"/amd-uc.img "${ED}/boot" || die + fi + + if ! ( shopt -s failglob; : * ) 2>/dev/null; then + eerror "No files to install. Check your USE flag settings" + eerror "and the list of files in your saved configuration." + die "Refusing to install an empty package" + fi + + insinto /lib/firmware/ + doins -r * +} + +pkg_preinst() { + if use savedconfig; then + ewarn "USE=savedconfig is active. You must handle file collisions manually." + fi + + # Make sure /boot is available if needed. + use initramfs && mount-boot_pkg_preinst +} + +pkg_postinst() { + elog "If you are only interested in particular firmware files, edit the saved" + elog "configfile and remove those that you do not want." + + local ver + for ver in ${REPLACING_VERSIONS}; do + if ver_test ${ver} -lt 20190514; then + elog + elog 'Starting with version 20190514, installation of many firmware' + elog 'files is controlled by USE flags. Please review your USE flag' + elog 'and package.license settings if you are missing some files.' + break + fi + done + + # Don't forget to umount /boot if it was previously mounted by us. + use initramfs && mount-boot_pkg_postinst +} + +pkg_prerm() { + # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! + use initramfs && mount-boot_pkg_prerm +} + +pkg_postrm() { + # Don't forget to umount /boot if it was previously mounted by us. + use initramfs && mount-boot_pkg_postrm +} diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index 9e0ee88c040a..589799ed3941 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -8,8 +8,7 @@ if [[ ${PV} == 99999999* ]]; then inherit git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" else - GIT_COMMIT="" - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${PV}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi @@ -33,38 +32,16 @@ BDEPEND="initramfs? ( app-arch/cpio )" RDEPEND="!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - !