From d0c32e684cc7579efed02f2b96729eefeb439f5f Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 16 Aug 2019 22:00:38 +0200 Subject: [PATCH] sys-kernel/linux-firmware: new snapshot Closes: https://bugs.gentoo.org/686296 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann --- sys-kernel/linux-firmware/Manifest | 1 + .../linux-firmware-20190815.ebuild | 352 ++++++++++++++++++ .../linux-firmware-99999999.ebuild | 4 +- 3 files changed, 354 insertions(+), 3 deletions(-) create mode 100644 sys-kernel/linux-firmware/linux-firmware-20190815.ebuild diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index 78f899746d04..d3fa92347d4e 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -5,3 +5,4 @@ DIST linux-firmware-20190620.tar.gz 190401448 BLAKE2B a31bbe2f2bf00b9b4f5dfe43f1 DIST linux-firmware-20190712.tar.gz 193523688 BLAKE2B 2c2751d41b7e17eb40092af43d9dd196ef5544ed43a77392780b77a2def50306f7479aa5b682507b29e471e9acdc446cc44e4ef2c0cceba9d116dbeea5a4d981 SHA512 db60dc1d42603c4fba663b7a7ff7fa8de66dd17d8dd99560162c7e763f73012d2e0ded0bb3827d80efa9a4eec4689c11000d44dc094a59242e62f92670b4aca0 DIST linux-firmware-20190717.tar.gz 193982388 BLAKE2B 9f3795aba9d1d4127bae4cbf758844bf2ef8dbc185858d2de9c89017b51f410d5f1267aa29b9ce9e41cabfc306a73f5c4d3658aa7929b0b2701b74b13b7af86e SHA512 f50a63ec9f28d4a6f6800559469a43986b1f66c09950f96d1c6ad1402ae5a02599c8f86468d96b014ede00a0a1a7cedf1aa28d53075308bf5d7f12a355fbbe20 DIST linux-firmware-20190726.tar.gz 195272955 BLAKE2B 0997ad87830a73909943d01a01a40b8bad06798e4f039bebee663e49ba0694de368164c596033d4dffb146b684a151cc89f98de956ec3743f0a9407097954d9f SHA512 c7503f889b9b37f18f8c4489c1c666fa49e4d6d31329f51f0b59a7ec69eeb9cbc3aa9324e09f373609df242db8f51e1890fd4a61f54bcb7731a642555fd807fe +DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703 SHA512 99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a 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 0211e6e23f26..c32364b9d6a2 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -295,9 +295,7 @@ 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 -- 2.26.2