From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- sys-kernel/linux-firmware/Manifest | 18 +- .../linux-firmware/linux-firmware-20190502.ebuild | 135 -------- .../linux-firmware/linux-firmware-20190514.ebuild | 312 ------------------ .../linux-firmware/linux-firmware-20190603.ebuild | 4 +- .../linux-firmware/linux-firmware-20190620.ebuild | 301 ------------------ .../linux-firmware/linux-firmware-20190712.ebuild | 301 ------------------ .../linux-firmware/linux-firmware-20190717.ebuild | 301 ------------------ .../linux-firmware/linux-firmware-20190815.ebuild | 352 +++++++++++++++++++++ .../linux-firmware/linux-firmware-99999999.ebuild | 67 +++- sys-kernel/linux-firmware/metadata.xml | 7 +- 10 files changed, 420 insertions(+), 1378 deletions(-) delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20190502.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20190514.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20190620.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20190712.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20190717.ebuild create mode 100644 sys-kernel/linux-firmware/linux-firmware-20190815.ebuild (limited to 'sys-kernel/linux-firmware') diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index cb8af0733378..bd3b964ee819 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -1,14 +1,6 @@ -DIST linux-firmware-20190502.tar.gz 185125493 BLAKE2B 48e60d08893688ab546d3d834490f5633c890c523890dedda75154fa041db8a4ae6663ce29485d32cf65556c91906aa8eb4f58ebbc95c34b5aeffb15c8737a98 SHA512 4dbc6548a66b5fcf4af47422004123b42f4c62088c5d97c8f24e03403d7acf729d9335addd68b383ecd9e8dc602b301534842c032a58ef920fad74f2c61d29ae -DIST linux-firmware-20190514.tar.gz 186854834 BLAKE2B cc4feeb4627fa402e445b8176557d67107701c6c0db44f5e5398b4040a0b80d40e32731ca3a31ca67de1e134e6b05f7e43ad29f5793c69e23fa220562624d53f SHA512 eff7a5b7c65b254949443b9d2943332f486c73a69baaaa8398c1298cfe1c06c9fdafa2dcfb2f9d1c02adad8b5e205f25bd61001fee99814e12e5d524179bc3e2 DIST linux-firmware-20190603.tar.gz 186855626 BLAKE2B 66e3bf709ae9a3df1ac9b7b9bd4e1fa556b07696896e7db086c7b60887a8e8854638d86ecead091d32b3d9a83adc1ab88e8b2fde730f8f97a3225492c2229512 SHA512 9027ae7f649b7e1ff15177c1edb23def93d8fe90a63a90e72e7ab98414d557c9f4545ced30363c68eb1715cd74d19c0dd9e395e82320427b4aab2432a173e62b -DIST linux-firmware-20190620.tar.gz 190401448 BLAKE2B a31bbe2f2bf00b9b4f5dfe43f1b764b1cd66e07baf12b21a9f9ab0186c6075c0e78b70b22ac0c3e0762d54dd1624c55f1ae177c445472e28be7c46f570dc015e SHA512 f09ed91c57d6b9f181131030e0af66766c0b49e06cce732744f5df44ed989b635e9a275ec5b140418586fd6fec7f3a1d703dd22b9257f4e5dc7c52f1194f75ae -DIST linux-firmware-20190712.tar.gz 193523688 BLAKE2B 2c2751d41b7e17eb40092af43d9dd196ef5544ed43a77392780b77a2def50306f7479aa5b682507b29e471e9acdc446cc44e4ef2c0cceba9d116dbeea5a4d981 SHA512 db60dc1d42603c4fba663b7a7ff7fa8de66dd17d8dd99560162c7e763f73012d2e0ded0bb3827d80efa9a4eec4689c11000d44dc094a59242e62f92670b4aca0 -DIST linux-firmware-20190717.tar.gz 193982388 BLAKE2B 9f3795aba9d1d4127bae4cbf758844bf2ef8dbc185858d2de9c89017b51f410d5f1267aa29b9ce9e41cabfc306a73f5c4d3658aa7929b0b2701b74b13b7af86e SHA512 f50a63ec9f28d4a6f6800559469a43986b1f66c09950f96d1c6ad1402ae5a02599c8f86468d96b014ede00a0a1a7cedf1aa28d53075308bf5d7f12a355fbbe20 -EBUILD linux-firmware-20190502.ebuild 3685 BLAKE2B ecada45062fb52c8263217072cdb73a91b61834e97353bd27ce8d511d1e78a9141c4534e868313027783f5912eae43871f8c5b34a458f81d2b161607f100ecbb SHA512 d4cccfcd3443d304301bfff5e213336bc8d644785a716f03bfdb5988872b4e8fc76c25afb65c192b1bcedd44ab242c90bee66b05c18aa7f4036527d2771c9f93 -EBUILD linux-firmware-20190514.ebuild 8390 BLAKE2B 704519ac691e676cdf9bddf23aadde3a69e881c80c364ad19214b1e5c0fcbf9eda6c7ce929ae66de66ab3dd542b920396042793726739ced3bc342659b8b52b5 SHA512 d3d557762026f1b3ed067bcf574a84eb26dc5b44dc08f02062a51bab966ed141054f35638c8dba385fc32adf19b27d06aabe95f799a897b977f134e87eafb42a -EBUILD linux-firmware-20190603.ebuild 8059 BLAKE2B cd13d27b29ffcc42e2e08f72c4adac47178067a4a519727164d519b784dcbdcfcea53171bcd0887774a2780b5e3337828e22a2b2f23e5a11d507753a8abe84ba SHA512 2152193c2386c1c690d52053457e93ef4c587fe9b481b633210dd8bfd0da2c51066977d818d8e053664f3bc165bf762d80a4a4c875db6c872b56e39e2bb2f218 -EBUILD linux-firmware-20190620.ebuild 8059 BLAKE2B c762f31be0d0fc7e11779fdbe7f40280a4454d09e277c78ba9a917169cdd5036799becc9d636c5640176564f27aa0480bc811e08c9785f53a957b5957a6be082 SHA512 9e7ea79989b8156ad191f9dc12dbef145cd60c6ecdc138ecc5d6afaf824d94b4948dd2c8cf4978730646f905b66edb5f5b0616f160d43ac558bd9f8f2bd68fc4 -EBUILD linux-firmware-20190712.ebuild 8059 BLAKE2B 4b9279b902e7be9baeb225cbc81638c3b8150e4c23ee8f14057fc056a38d365d1818f7c6f9ad3655c098088a03c8c7076b5391f1b0d521c46224258816970c3c SHA512 c8e24f7e28d24ed9b072f7fc6ed74420b83c9034d4f64b3d2b213746ceebcff398b3b24bf0ae8e3ef8b960bead2395216f5d59b4ef0df92bb19a1f9c27c054a1 -EBUILD linux-firmware-20190717.ebuild 8059 BLAKE2B 4e4ba2dd53b472e039883ca536bab5273c304873e3d5e3f25a3835a32c55722df7603b4d79934471648357d5afb6a61eeb1896481da449b7a8b3729e141edb62 SHA512 846746df9cd40841b55a263150b7b87592815df144581ae079b9a195b66f894a7f47921bdeaeb8fd3ebc983a4bcb409d16e40d54b05dd35d55ed006920048a67 -EBUILD linux-firmware-99999999.ebuild 8032 BLAKE2B 9f79a1d1ac8ef0e1f1049278c523e2a71aecac87e719f24565bff2aa09ff2be9d117f5c9f1945fdc045e8dd0e7f474ff17522ac409ce2c661234891bf1369be8 SHA512 f2b32b76a7f1ade6bf7064b7b72df5a00c94928502ce36b106103542443f88d83e626cdab8d0f3a8ab17ceeb5d06c8c8082c3839bd0b388b4617da6a5e5de702 -MISC metadata.xml 753 BLAKE2B b4751e5c4684a226666a406121dee19bf4a0ca53e1c895dcc8dde72e4be6885d94ed34c094f94aac063267c019e4802d21ef5b87755701b3d58f99a5e4d1bb90 SHA512 a32de22c6c7bb84459eb2aec03f72cbd4913bd1d7077cb89ed4ad6e3652c024c974ecf307939d602e457b98b89d7b93dce2a6c510a577c9d12844df6235a210d +DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703 SHA512 99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a +EBUILD linux-firmware-20190603.ebuild 8027 BLAKE2B 55e8f8436056b1db693383dc41c93b10601e000a9865b06823ce0c34743f23573f6fbf2743bc7edb9a53ad2e7f206d9e979c441e09163eb26d21d0d535258b8d SHA512 4c0149cd856aaa704f8c241e4e60cf3bbaf245555f7166bca0b65d04a321da8d891c693f11e434328994b1b893c661f8e952babe083ac92b2b8d71928a37d5b8 +EBUILD linux-firmware-20190815.ebuild 9601 BLAKE2B bf981b636bf363d63beae6bd087d76620ef5a3f0abe180ba5811008e938b206d2e3fc4a642d03e7be3db886455e563f449b1b0e0c59ba4d912e3932f83de28fe SHA512 5f4fc32272cfdb30b213efde5724969b0507d9ea6ca280757d660c29a4934376020ed0b5998ffe9f4afbcb866948dc7c2fb9088545c1a80bb406028dc74b1b5b +EBUILD linux-firmware-99999999.ebuild 9574 BLAKE2B 2b59e459fcb0056f319c4d2b7e52d7fc84e738f0dd088ca4dbdb16082ac08a38f436a45b2f819839b7b9ff360fd809348149bd90ab3626b1d06677c6aca95165 SHA512 1fd7485a9dd93cf4d04405d4e46ea6e5e4e5dae88900db2be368e500b68494c8424a176285792def0296d3573b11ac86b13e99bb0d3966f4826078046b4a3226 +MISC metadata.xml 867 BLAKE2B db510434e654367fb0ae439b1a3ca3fc170f558022f07634a534ea982f2445ff656fa618b9dac5ebb6ac2f64d9ee93dcc59525c1f3d429eda4ebce05a678298c SHA512 5429e7424fac663e3448e80dad98365239b855f09522fe7ea3cd2c731bec37fee29209cc8ead46e73ea03cd85a3e9c8fafe18ddf4a35e5bb55513d63ad5ae7ff diff --git a/sys-kernel/linux-firmware/linux-firmware-20190502.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190502.ebuild deleted file mode 100644 index dc0a935d311d..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20190502.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit savedconfig - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - GIT_COMMIT="92e17d0dd2437140fab044ae62baf69b35d7d1fa" - 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 sh 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+" -SLOT="0" -IUSE="savedconfig" - -DEPEND="" -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 - ! ${PN}.conf - find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - ebegin "Removing all files not listed in config" - - local file delete_file preserved_file preserved_files=() - - while IFS= read -r file; do - # Ignore comments. - if [[ ${file} != "#"* ]]; then - preserved_files+=("${file}") - fi - done < ${PN}.conf || die - - while IFS= read -d "" -r file; do - delete_file=true - for preserved_file in "${preserved_files[@]}"; do - if [[ "${file}" == "${preserved_file}" ]]; then - delete_file=false - fi - done - - if ${delete_file}; then - rm "${file}" || die - fi - done < <(find * \( \! -type d -and \! -name ${PN}.conf \) -print0 || die) - - eend || die - - # remove empty directories, bug #396073 - find -type d -empty -delete || die - fi -} - -src_install() { - if use !savedconfig; then - save_config ${PN}.conf - fi - rm ${PN}.conf || die - insinto /lib/firmware/ - doins -r * -} - -pkg_preinst() { - if use savedconfig; then - ewarn "USE=savedconfig is active. You must handle file collisions manually." - fi -} - -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." -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild deleted file mode 100644 index ef067f814223..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit 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="711d3297bac870af42088a467459a0634c1970ca" - 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 sh 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="+redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! ${PN}.conf - find * ! -type d ! -name ${PN}.conf >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - local file preserved_files=() remove=() - - ebegin "Removing all files not listed in config" - while IFS= read -r file; do - # Ignore comments. - if [[ ${file} != "#"* ]]; then - preserved_files+=("${file}") - fi - done < ${PN}.conf || die - - while IFS= read -d "" -r file; do - has "${file}" "${preserved_files[@]}" || remove+=("${file}") - done < <(find * ! -type d ! -name ${PN}.conf -print0 || die) - if [[ ${#remove[@]} -gt 0 ]]; then - printf "%s\0" "${remove[@]}" | xargs -0 rm || die - fi - eend 0 - fi - - # remove empty directories, bug #396073 - find -type d -empty -delete || die -} - -src_install() { - if use !savedconfig; then - save_config ${PN}.conf - fi - rm ${PN}.conf || die - - 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 -} - -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 -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20190603.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190603.ebuild index 201fc7065ce3..963f0f102bd7 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20190603.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20190603.ebuild @@ -263,9 +263,7 @@ src_prepare() { } src_install() { - if use !savedconfig; then - save_config ${PN}.conf - fi + save_config ${PN}.conf rm ${PN}.conf || die if ! ( shopt -s failglob; : * ) 2>/dev/null; then diff --git a/sys-kernel/linux-firmware/linux-firmware-20190620.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190620.ebuild deleted file mode 100644 index b4197ce2f0d9..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20190620.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit 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="7ae3a09dcc7581da3fcc6c578429b89e2764a684" - 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 sh 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="+redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! ${PN}.conf - find * ! -type d ! -name ${PN}.conf >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - ebegin "Removing all files not listed in config" - find ! -type d ! -name ${PN}.conf -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() { - if use !savedconfig; then - save_config ${PN}.conf - fi - rm ${PN}.conf || die - - 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 -} - -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 -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20190712.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190712.ebuild deleted file mode 100644 index f395cd682dee..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20190712.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit 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="d52556e4592e64023157a83fb0f483661f23ac0e" - 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 sh 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="+redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! ${PN}.conf - find * ! -type d ! -name ${PN}.conf >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - ebegin "Removing all files not listed in config" - find ! -type d ! -name ${PN}.conf -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() { - if use !savedconfig; then - save_config ${PN}.conf - fi - rm ${PN}.conf || die - - 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 -} - -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 -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20190717.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190717.ebuild deleted file mode 100644 index e2002ef04f14..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20190717.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit 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="bf13a71b18af229b4c900b321ef1f8443028ded8" - 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 sh 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="+redistributable savedconfig unknown-license" -RESTRICT="binchecks strip - unknown-license? ( bindist )" - -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !media-tv/cx18-firmware - ! ${PN}.conf - find * ! -type d ! -name ${PN}.conf >> ${PN}.conf - - if use savedconfig; then - restore_config ${PN}.conf - - ebegin "Removing all files not listed in config" - find ! -type d ! -name ${PN}.conf -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() { - if use !savedconfig; then - save_config ${PN}.conf - fi - rm ${PN}.conf || die - - 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 -} - -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 -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild new file mode 100644 index 000000000000..43b7793f2ab9 --- /dev/null +++ b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild @@ -0,0 +1,352 @@ +# Copyright 1999-2019 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 sh 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 )" + +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-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index f439b40eab43..c32364b9d6a2 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit savedconfig +inherit mount-boot savedconfig if [[ ${PV} == 99999999* ]]; then inherit git-r3 @@ -21,10 +21,13 @@ LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )" SLOT="0" -IUSE="+redistributable savedconfig unknown-license" +IUSE="initramfs +redistributable savedconfig unknown-license" RESTRICT="binchecks strip unknown-license? ( bindist )" +BDEPEND="initramfs? ( app-arch/cpio )" + +#add anything else that collides to this RDEPEND="!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] @@ -69,7 +72,9 @@ RDEPEND="!savedconfig? ( ) )" -#add anything else that collides to this +pkg_pretend() { + use initramfs && mount-boot_pkg_pretend +} src_unpack() { if [[ ${PV} == 99999999* ]]; then @@ -244,14 +249,41 @@ src_prepare() { 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 >> ${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 -printf "%P\n" \ + 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 @@ -263,11 +295,14 @@ src_prepare() { } src_install() { - if use !savedconfig; then - save_config ${PN}.conf - fi + 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." @@ -282,6 +317,9 @@ 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() { @@ -298,4 +336,17 @@ pkg_postinst() { 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/metadata.xml b/sys-kernel/linux-firmware/metadata.xml index 7370ea010ccd..b1cdaa4debb2 100644 --- a/sys-kernel/linux-firmware/metadata.xml +++ b/sys-kernel/linux-firmware/metadata.xml @@ -14,10 +14,9 @@ Gentoo Kernel Project - Install also non-free (but redistributable) - firmware files + Create and install initramfs for early microcode loading in /boot (only AMD for now) + Install also non-free (but redistributable) firmware files Allows individual selection of firmware files - Install firmware files whose license is - unknown + Install firmware files whose license is unknown -- cgit v1.2.3