From f4e1ec6438958ecffef678b61a23551dff13ff43 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Tue, 5 Mar 2019 00:23:27 +0100 Subject: sys-kernel/linux-firmware: re-release to update distfile In previous ebuild (r0), GIT_COMMIT wasn't updated. I.e. linux-firmware-20190221 was actually the same like linux-firmware-20190213. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann --- sys-kernel/linux-firmware/Manifest | 2 +- .../linux-firmware-20190221-r1.ebuild | 135 +++++++++++++++++++++ .../linux-firmware/linux-firmware-20190221.ebuild | 135 --------------------- 3 files changed, 136 insertions(+), 136 deletions(-) create mode 100644 sys-kernel/linux-firmware/linux-firmware-20190221-r1.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20190221.ebuild (limited to 'sys-kernel/linux-firmware') diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index a9ba44a83d66..9942ddcfceb3 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -4,4 +4,4 @@ DIST linux-firmware-20181218.tar.gz 174835447 BLAKE2B 8bac1dbd413c4fc5c8c07bb299 DIST linux-firmware-20190114.tar.gz 175568625 BLAKE2B 1d89ed002293343dc448acb97bf047b99752661d7a358d8ea0f8d2fcce5331af85cde0717861fc429e71aa89647189476df0c92ebfc8edb75c2954e56d8a1860 SHA512 05df281667402b3265f401b3845c4ead22521c8c82f9a48a7fb15dbfaadaacce9fb9ca0e17c521c8928e7a82a7e170cc339697b8fbae8b89798a1f0daf9846da DIST linux-firmware-20190118.tar.gz 175570644 BLAKE2B 4d1492e820c2f03ab47068be4a8f343cbee62ab18fc72849a4edfa8a0afd5f3ed131f95efa578177155d8e31b7d4283567661855ee693566710934588ef65511 SHA512 2cc06f179c4a720a43f6fbf634b169bd664ec1740cff86abc78de4f30b49e5bd280f5134975a55a2d20f442a4bd72a91cc228ad23ef8c5bc67c7a08e1c0e9658 DIST linux-firmware-20190213.tar.gz 177329601 BLAKE2B f103805a84342650cc994cfdf398a617bec083c9769d9303a274d33b91b0ab0390f92a736168e0f6b8977e7a93d4592dcdca64983617b884a6a7b64de50b7a4c SHA512 f0f56b511c02427b6923ef5ea2e3a00a42172fe52b86bcdfd170146b9496295dcb6f4a3986642674192b27fdfcb4b9961b3b45ccb29f030af76f7dcad2119485 -DIST linux-firmware-20190221.tar.gz 177329601 BLAKE2B f103805a84342650cc994cfdf398a617bec083c9769d9303a274d33b91b0ab0390f92a736168e0f6b8977e7a93d4592dcdca64983617b884a6a7b64de50b7a4c SHA512 f0f56b511c02427b6923ef5ea2e3a00a42172fe52b86bcdfd170146b9496295dcb6f4a3986642674192b27fdfcb4b9961b3b45ccb29f030af76f7dcad2119485 +DIST linux-firmware-20190221-r1.tar.gz 177469962 BLAKE2B 23b8966183249df6b13019fac89e39dd4007e4506e85e1528944a363cc21feae4f1e323271a8c3377e0a5d8e7e030513ca9286200829e0dad5d408b758444bcd SHA512 1884c9969afc3b77306bd49c8ac099bfcaa93cba2d6c7da66d22085f85fe94f58b13cdf7f0a191eab46c1832899b6d58eab41f7d0cf4769a8e7fdcdae98d1009 diff --git a/sys-kernel/linux-firmware/linux-firmware-20190221-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190221-r1.ebuild new file mode 100644 index 000000000000..44f1e8d84f0b --- /dev/null +++ b/sys-kernel/linux-firmware/linux-firmware-20190221-r1.ebuild @@ -0,0 +1,135 @@ +# 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="9ee52be785cf91fc6a3c6aa27d484873f8270b72" + SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}-r1.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-20190221.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190221.ebuild deleted file mode 100644 index ed558fb8a0c4..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20190221.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="710963fe53ee3f227556d36839df3858daf6e232" - 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." -} -- cgit v1.2.3-65-gdbad