summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-02-03 22:56:13 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-02-03 22:56:13 +0000
commitcd48fe5def56ce4fe1fdc8fd33acd3cb3ebc08f5 (patch)
treeb15e5baf84e9d2c59e7560a61686c5d391617a00 /sys-kernel/linux-firmware
parentMarking mindterm-3.4 ppc for bug 397173 (diff)
downloadhistorical-cd48fe5def56ce4fe1fdc8fd33acd3cb3ebc08f5.tar.gz
historical-cd48fe5def56ce4fe1fdc8fd33acd3cb3ebc08f5.tar.bz2
historical-cd48fe5def56ce4fe1fdc8fd33acd3cb3ebc08f5.zip
New snapshot. Update download locations. Avoid installing empty directories, bug #396073.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel/linux-firmware')
-rw-r--r--sys-kernel/linux-firmware/ChangeLog10
-rw-r--r--sys-kernel/linux-firmware/Manifest10
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20110731.ebuild6
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20110818.ebuild6
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20120125.ebuild98
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-99999999.ebuild20
6 files changed, 135 insertions, 15 deletions
diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index 2dbfd6bb03c3..3772187cbabd 100644
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-kernel/linux-firmware
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.31 2012/02/02 13:15:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.32 2012/02/03 22:56:13 chithanh Exp $
+
+*linux-firmware-20120125 (03 Feb 2012)
+
+ 03 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ linux-firmware-20110731.ebuild, linux-firmware-20110818.ebuild,
+ +linux-firmware-20120125.ebuild, linux-firmware-99999999.ebuild:
+ New snapshot. Update download locations. Avoid installing empty directories,
+ bug #396073.
02 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
linux-firmware-99999999.ebuild:
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 40b0ef84efaf..aefa14bbbba5 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,7 +1,9 @@
DIST linux-firmware-20110731.tar.bz2 15251521 RMD160 18be95d4e230726c02764d6ee5b12dc546c72922 SHA1 57df268331586c10531ec2249b85ccedd114e98b SHA256 f7e122642b99727db63ec6cf2fb64037e7e49a2e5db59a62cdba444a273905d3
DIST linux-firmware-20110818.tar.bz2 16023823 RMD160 ff8f4f7fbfc3f9608d44d72bbc5f544f562e1a2d SHA1 4279c2937f7fc834441a3e78e286e6688c873c99 SHA256 4cf4ac66e2b3cff7550857ec7fa52d9d274c0000b2486b701d16f6e9cc57795d
-EBUILD linux-firmware-20110731.ebuild 2530 RMD160 d40bbff018d65d4c182a51e213a3e3589e104e24 SHA1 8810c34d6e617049d9bbabb91f082597285f9a5b SHA256 46fac00b23062f1d09a28d78e7da5fa6417c2e240c7fefeb374d3186d62c9bb8
-EBUILD linux-firmware-20110818.ebuild 2533 RMD160 98f77dea5b626ddfc7dd453bd9c78db356e5c1f3 SHA1 d294d67e7cf92da6963ad00e59f1e3936d89d767 SHA256 9ecf15661ec1dcb5df70c2f9146ecd01143138cf1e30297c2dd9cb6ce5166116
-EBUILD linux-firmware-99999999.ebuild 2495 RMD160 a4a107abf992cb093d4a855c92fcf379fa859521 SHA1 25e362a051ab72410952b1c775336fa1e518e82b SHA256 91a7e7aad14a51110486f5e45a2089076f7097721f2858aeb3d1a442afa62533
-MISC ChangeLog 5729 RMD160 04bf2b4f2334d1ce3f03b11e1907049dd128c301 SHA1 925fa861de806c9ca463a7824728dac69b262e38 SHA256 21858af8fa5a5e75fcaa7b1e497f319b80df4bbad74f0f7ce483ab2360187b30
+DIST linux-firmware-20120125.tar.gz 22407395 RMD160 930b8efa5ad05b93fbe79ade2c4e894ed819344b SHA1 84dadf2ab0ca26cb603da850ce0a113129f98a5a SHA256 be15aefa80668288fc1202f32f4be06fcc751eed5cceeaaeb65b6de1c71761aa
+EBUILD linux-firmware-20110731.ebuild 2495 RMD160 f1e66ee401ae68c5fa330bd64de78122a11f72e2 SHA1 c98665c0d8a87508ae11ed9ad7fd9d8315f6a8af SHA256 23ea2524aef8e9df7f6c83a393ffdb4a1110eac328d19a8f978da8a312ad6985
+EBUILD linux-firmware-20110818.ebuild 2498 RMD160 740465e4e94ffdae4c876e92fec18f2054134abc SHA1 0843986c4ed2c6d0b0103e9c22eb534c55802d99 SHA256 0e5395052a65b2b567b3b0045b4e241f70a019b45356addaeb9e49524adfa78f
+EBUILD linux-firmware-20120125.ebuild 2728 RMD160 36a0fd96ce55cce53de739766e8f55455ef56284 SHA1 a6e7386f34b6dc339eb47b3bcb1dfab192be983a SHA256 a36da346a44d4e7c2ac84f0e3b09a5854c9ad6245d3742381cd427f98f3f5487
+EBUILD linux-firmware-99999999.ebuild 2713 RMD160 2080d3e3be6e23d86732bc0aef0d9587388a24be SHA1 57aaa745f55059a2a3fe13b746b7895a630f6278 SHA256 a99850eb579a1bc0924bbfc8a8c2a361d38c610fb8a481ed2e58df75ecca8f2e
+MISC ChangeLog 6066 RMD160 dbdfc2affd812198263316d911c350cc84ac7b8c SHA1 b3df4b7a988590acaae834b2f950c2b4affdfec1 SHA256 2c7005646b789a425822d6deee9ff93a4a1977a2d6bc6663068697e83f927912
MISC metadata.xml 454 RMD160 486442b015182f3a69ac3420ee1fa8af56ca3938 SHA1 c9bbe5d0d641c8545d6f93be32e0fbb4751bc49e SHA256 981ce29c1ab948ee695b585601283674cb5079e054457829d9da06620e199f14
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
index f384f18f0da7..04d61a4b15a4 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild,v 1.6 2011/11/01 14:40:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild,v 1.7 2012/02/03 22:56:13 chithanh Exp $
EAPI=3
inherit savedconfig
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
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"
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
index 1dff65b7a84c..0354bf4dc5cc 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild,v 1.3 2011/11/01 14:40:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild,v 1.4 2012/02/03 22:56:13 chithanh Exp $
EAPI=3
inherit savedconfig
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
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"
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild
new file mode 100644
index 000000000000..a0b7bafc0ba0
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild,v 1.1 2012/02/03 22:56:13 chithanh Exp $
+
+EAPI=4
+inherit savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+ inherit git-2
+ SRC_URI=""
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.gz"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+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-dialup/ueagle-atm
+ !net-dialup/ueagle4-atm
+ !net-wireless/ar9271-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/iwl6005-ucode
+ !net-wireless/iwl6030-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_unpack() {
+ if [[ ${PV} == 99999999* ]]; then
+ git-2_src_unpack
+ else
+ default
+ # rename directory from git snapshot tarball
+ mv ${PN}-*/ ${P} || die
+ fi
+}
+
+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
+ # remove empty directories, bug #396073
+ find -type d -empty -delete || die
+ fi
+}
+
+src_install() {
+ save_config ${PN}.conf
+ 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-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index b8b463b10721..62b4a31a7a0e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 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.13 2012/02/02 13:15:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.14 2012/02/03 22:56:13 chithanh Exp $
-EAPI=3
+EAPI=4
inherit savedconfig
if [[ ${PV} == 99999999* ]]; then
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
SRC_URI=""
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
else
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ SRC_URI="mirror://gentoo/${P}.tar.gz"
fi
DESCRIPTION="Linux firmware files"
@@ -53,6 +53,16 @@ RDEPEND="!savedconfig? (
)"
#add anything else that collides to this
+src_unpack() {
+ if [[ ${PV} == 99999999* ]]; then
+ git-2_src_unpack
+ else
+ default
+ # rename directory from git snapshot tarball
+ mv ${PN}-*/ ${P} || die
+ fi
+}
+
src_prepare() {
echo "# Remove files that shall not be installed from this list." > ${PN}.conf
find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
@@ -64,6 +74,8 @@ src_prepare() {
| sort ${PN}.conf ${PN}.conf - \
| uniq -u | xargs -r rm
eend $? || die
+ # remove empty directories, bug #396073
+ find -type d -empty -delete || die
fi
}
@@ -71,7 +83,7 @@ src_install() {
save_config ${PN}.conf
rm ${PN}.conf || die
insinto /lib/firmware/
- doins -r * || die "Install failed!"
+ doins -r *
}
pkg_preinst() {