From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 90403138334 for ; Tue, 24 Sep 2019 13:47:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70A30E0934; Tue, 24 Sep 2019 13:47:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 440CBE0934 for ; Tue, 24 Sep 2019 13:47:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B139534B515 for ; Tue, 24 Sep 2019 13:47:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 835077E7 for ; Tue, 24 Sep 2019 13:47:11 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1569332823.466bf51933ca73108cd859fdf646997718462e26.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/linux-firmware/Manifest sys-kernel/linux-firmware/linux-firmware-20190923.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 466bf51933ca73108cd859fdf646997718462e26 X-VCS-Branch: master Date: Tue, 24 Sep 2019 13:47:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 868b2b7e-fc9f-46d9-a7dc-cbebe1d113c6 X-Archives-Hash: 6df591d705b051f6dca4046067e74d6a commit: 466bf51933ca73108cd859fdf646997718462e26 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Sep 24 13:45:37 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Sep 24 13:47:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466bf519 sys-kernel/linux-firmware: new snapshot Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> sys-kernel/linux-firmware/Manifest | 1 + .../linux-firmware/linux-firmware-20190923.ebuild | 354 +++++++++++++++++++++ 2 files changed, 355 insertions(+) diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index 54e888f2217..48339588557 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -1,3 +1,4 @@ DIST linux-firmware-20190603.tar.gz 186855626 BLAKE2B 66e3bf709ae9a3df1ac9b7b9bd4e1fa556b07696896e7db086c7b60887a8e8854638d86ecead091d32b3d9a83adc1ab88e8b2fde730f8f97a3225492c2229512 SHA512 9027ae7f649b7e1ff15177c1edb23def93d8fe90a63a90e72e7ab98414d557c9f4545ced30363c68eb1715cd74d19c0dd9e395e82320427b4aab2432a173e62b DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703 SHA512 99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a DIST linux-firmware-20190904.tar.gz 196829538 BLAKE2B b45b03b26908fab0602ad7e6ff8b5a2028b56a2d4d200de6fda332e9f589e6fa898cfc5eb7a28b585b1eadefb3bc7a06e5e5685928f2a087ddba39b792ff9ca2 SHA512 5469754181b3ddbe7233958d517d845c1220890758769995f90605e2f70cd34ed29d1904e8b0388293515191795deef8be1f457f9cb196c9cf01a65707534aff +DIST linux-firmware-20190923.tar.gz 198130120 BLAKE2B 21f337e8ef693513b5569ab67bf3ae2323f2c9109ce3fc7d6d0d071974dc8c53301eb21e0b1c279753e867873e4bb04274c0b2b5bfb1160aeaff2f2c92d7f26c SHA512 1421f283602fe889b6fba5d84eab1199c63c597a4fb487583bee188cfa01c7d41bde4ac53eee992a6aa1bb95a77126eee786f96fb682cd7992c5ec581601db54 diff --git a/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild new file mode 100644 index 00000000000..fddfa4cd585 --- /dev/null +++ b/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild @@ -0,0 +1,354 @@ +# 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="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 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 )" + +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 +}