diff options
Diffstat (limited to 'sys-kernel')
8 files changed, 150 insertions, 164 deletions
diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog index 31ffe9b0aee3..632d18707357 100644 --- a/sys-kernel/linux-firmware/ChangeLog +++ b/sys-kernel/linux-firmware/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-kernel/linux-firmware # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.15 2011/05/31 15:45:24 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.16 2011/06/02 00:12:53 chithanh Exp $ + +*linux-firmware-20110601 (02 Jun 2011) + + 02 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + -linux-firmware-20090421.ebuild, -linux-firmware-20100930.ebuild, + -linux-firmware-20110128.ebuild, -linux-firmware-20110311.ebuild, + +linux-firmware-20110601.ebuild, linux-firmware-99999999.ebuild, + metadata.xml: + New snapshot. Update live ebuild to git-2.eclass, allow individual selection + of firmware files through savedconfig. Remove old. 31 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> linux-firmware-20110429.ebuild: diff --git a/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild b/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild deleted file mode 100644 index f82af28d4baa..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild,v 1.4 2010/05/07 18:18:21 robbat2 Exp $ - -DESCRIPTION="Linux firmware files" -HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware" -SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2" - -LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -src_unpack() { - unpack ${A} -} - -src_install() { - dodir /lib/firmware - cp -R "${S}/"* "${D}lib/firmware/" || die "Install failed!" -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20100930.ebuild b/sys-kernel/linux-firmware/linux-firmware-20100930.ebuild deleted file mode 100644 index 6cb9051cbcdc..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20100930.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20100930.ebuild,v 1.1 2010/10/20 18:24:47 scarabeus Exp $ - -DESCRIPTION="Linux firmware files" -HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware" -SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2" - -LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -src_install() { - insinto /lib/firmware - doins -r * || die -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20110128.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110128.ebuild deleted file mode 100644 index 78ac10a4e48f..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20110128.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110128.ebuild,v 1.3 2011/03/15 01:11:22 flameeyes Exp $ - -EAPI=3 - -if [[ ${PV} == 99999999* ]]; then - inherit git - SRC_URI="" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git" -else - SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2" -fi - -DESCRIPTION="Linux firmware files" -HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware" - -LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="!media-sound/alsa-firmware[alsa_cards_korg1212] - !media-sound/alsa-firmware[alsa_cards_maestro3] - !media-sound/alsa-firmware[alsa_cards_sb16] - !media-sound/alsa-firmware[alsa_cards_ymfpci] - !media-tv/cx18-firmware - !media-tv/ivtv-firmware - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] - !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] - !net-wireless/libertas-firmware - !net-wireless/i2400m-fw - !net-wireless/iwl1000-ucode - !net-wireless/iwl3945-ucode - !net-wireless/iwl4965-ucode - !net-wireless/iwl5000-ucode - !net-wireless/iwl5150-ucode - !net-wireless/iwl6000-ucode - !net-wireless/iwl6050-ucode - !net-wireless/rt61-firmware - !net-wireless/rt73-firmware - !sys-block/qla-fc-firmware - !x11-drivers/radeon-ucode" -#add anything else that collides to this - -src_install() { - insinto /lib/firmware/ - doins -r * || die "Install failed!" -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20110311.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110311.ebuild deleted file mode 100644 index b39db8acb0b9..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20110311.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110311.ebuild,v 1.2 2011/04/09 09:51:20 armin76 Exp $ - -EAPI=3 - -if [[ ${PV} == 99999999* ]]; then - inherit git - SRC_URI="" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git" -else - SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2" -fi - -DESCRIPTION="Linux firmware files" -HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware" - -LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist" -KEYWORDS="~amd64 ~arm ~x86" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="!media-sound/alsa-firmware[alsa_cards_korg1212] - !media-sound/alsa-firmware[alsa_cards_maestro3] - !media-sound/alsa-firmware[alsa_cards_sb16] - !media-sound/alsa-firmware[alsa_cards_ymfpci] - !media-tv/cx18-firmware - !media-tv/ivtv-firmware - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] - !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] - !net-wireless/libertas-firmware - !net-wireless/i2400m-fw - !net-wireless/iwl1000-ucode - !net-wireless/iwl3945-ucode - !net-wireless/iwl4965-ucode - !net-wireless/iwl5000-ucode - !net-wireless/iwl5150-ucode - !net-wireless/iwl6000-ucode - !net-wireless/iwl6050-ucode - !net-wireless/rt61-firmware - !net-wireless/rt73-firmware - !sys-block/qla-fc-firmware - !x11-drivers/radeon-ucode" -#add anything else that collides to this - -src_install() { - insinto /lib/firmware/ - doins -r * || die "Install failed!" -} diff --git a/sys-kernel/linux-firmware/linux-firmware-20110601.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110601.ebuild new file mode 100644 index 000000000000..9b858b2aefd4 --- /dev/null +++ b/sys-kernel/linux-firmware/linux-firmware-20110601.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110601.ebuild,v 1.1 2011/06/02 00:12:53 chithanh Exp $ + +EAPI=3 +inherit savedconfig + +if [[ ${PV} == 99999999* ]]; then + inherit git-2 + SRC_URI="" + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git" +else + SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2" +fi + +DESCRIPTION="Linux firmware files" +HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware" + +LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist" +KEYWORDS="~amd64 ~arm ~x86" +SLOT="0" +IUSE="savedconfig" + +DEPEND="" +RDEPEND="!savedconfig? ( + !media-sound/alsa-firmware[alsa_cards_korg1212] + !media-sound/alsa-firmware[alsa_cards_maestro3] + !media-sound/alsa-firmware[alsa_cards_sb16] + !media-sound/alsa-firmware[alsa_cards_ymfpci] + !media-tv/cx18-firmware + !media-tv/ivtv-firmware + !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] + !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] + !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] + !net-wireless/i2400m-fw + !net-wireless/iwl1000-ucode + !net-wireless/iwl3945-ucode + !net-wireless/iwl4965-ucode + !net-wireless/iwl5000-ucode + !net-wireless/iwl5150-ucode + !net-wireless/iwl6000-ucode + !net-wireless/iwl6050-ucode + !net-wireless/libertas-firmware + !net-wireless/rt61-firmware + !net-wireless/rt73-firmware + !sys-block/qla-fc-firmware + !x11-drivers/radeon-ucode + )" +#add anything else that collides to this + +src_prepare() { + echo "# Remove files that shall not be installed from this list." > ${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" + find * \( \! -type d -and \! -name ${PN}.conf \) \ + | sort ${PN}.conf ${PN}.conf - \ + | uniq -u | xargs -r rm + eend $? || die + fi +} + +src_install() { + save_config ${PN}.conf + rm ${PN}.conf || die + insinto /lib/firmware/ + doins -r * || die "Install failed!" +} + +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-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index c44d39b2751d..8ec0b990eec7 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.7 2011/03/15 01:11:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.8 2011/06/02 00:12:53 chithanh Exp $ EAPI=3 +inherit savedconfig if [[ ${PV} == 99999999* ]]; then - inherit git + inherit git-2 SRC_URI="" EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git" else @@ -18,34 +19,63 @@ HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware" LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist" KEYWORDS="" SLOT="0" -IUSE="" +IUSE="savedconfig" DEPEND="" -RDEPEND="!media-sound/alsa-firmware[alsa_cards_korg1212] - !media-sound/alsa-firmware[alsa_cards_maestro3] - !media-sound/alsa-firmware[alsa_cards_sb16] - !media-sound/alsa-firmware[alsa_cards_ymfpci] - !media-tv/cx18-firmware - !media-tv/ivtv-firmware - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] - !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] - !net-wireless/libertas-firmware - !net-wireless/i2400m-fw - !net-wireless/iwl1000-ucode - !net-wireless/iwl3945-ucode - !net-wireless/iwl4965-ucode - !net-wireless/iwl5000-ucode - !net-wireless/iwl5150-ucode - !net-wireless/iwl6000-ucode - !net-wireless/iwl6050-ucode - !net-wireless/rt61-firmware - !net-wireless/rt73-firmware - !sys-block/qla-fc-firmware - !x11-drivers/radeon-ucode" +RDEPEND="!savedconfig? ( + !media-sound/alsa-firmware[alsa_cards_korg1212] + !media-sound/alsa-firmware[alsa_cards_maestro3] + !media-sound/alsa-firmware[alsa_cards_sb16] + !media-sound/alsa-firmware[alsa_cards_ymfpci] + !media-tv/cx18-firmware + !media-tv/ivtv-firmware + !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] + !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] + !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] + !net-wireless/i2400m-fw + !net-wireless/iwl1000-ucode + !net-wireless/iwl3945-ucode + !net-wireless/iwl4965-ucode + !net-wireless/iwl5000-ucode + !net-wireless/iwl5150-ucode + !net-wireless/iwl6000-ucode + !net-wireless/iwl6050-ucode + !net-wireless/libertas-firmware + !net-wireless/rt61-firmware + !net-wireless/rt73-firmware + !sys-block/qla-fc-firmware + !x11-drivers/radeon-ucode + )" #add anything else that collides to this +src_prepare() { + echo "# Remove files that shall not be installed from this list." > ${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" + find * \( \! -type d -and \! -name ${PN}.conf \) \ + | sort ${PN}.conf ${PN}.conf - \ + | uniq -u | xargs -r rm + eend $? || die + fi +} + src_install() { + save_config ${PN}.conf + rm ${PN}.conf || die insinto /lib/firmware/ doins -r * || die "Install failed!" } + +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/metadata.xml b/sys-kernel/linux-firmware/metadata.xml index 3514433a2328..e7f764657405 100644 --- a/sys-kernel/linux-firmware/metadata.xml +++ b/sys-kernel/linux-firmware/metadata.xml @@ -10,4 +10,7 @@ <email>chithanh@gentoo.org</email> <name>Chí-Thanh Christopher Nguyễn</name> </maintainer> +<use> + <flag name='savedconfig'>Allows individual selection of firmware files</flag> +</use> </pkgmetadata> |