[gentoo-commits] gentoo-x86 commit in net-wireless/iwl4965-ucode: iwl4965-ucode-228.57.2.23.ebuild ChangeLog metadata.xml iwl4965-ucode-228.57.2.21.ebuild

[Peter Volkov (pva)]

pva         09/01/22 11:57:51

  Modified:             iwl4965-ucode-228.57.2.23.ebuild ChangeLog
                        metadata.xml iwl4965-ucode-228.57.2.21.ebuild
  Log:
  Took maintainance. Added warning in stable ebuild and check kernel version in unstable for bug #235007. Thank Oisin O Malley for report and R Bar-On for solution.
  (Portage version: 2.2_rc23/cvs/Linux i686)

Revision  Changes    Path
1.2                  net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild?r1=1.1&r2=1.2

Index: iwl4965-ucode-228.57.2.23.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iwl4965-ucode-228.57.2.23.ebuild	6 Jan 2009 11:20:52 -0000	1.1
+++ iwl4965-ucode-228.57.2.23.ebuild	22 Jan 2009 11:57:51 -0000	1.2
@@ -1,12 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild,v 1.1 2009/01/06 11:20:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild,v 1.2 2009/01/22 11:57:51 pva Exp $
 
-MY_PN="iwlwifi-4965-ucode"
+inherit linux-info
+
+MY_P=iwlwifi-4965-ucode-${PV}
 
 DESCRIPTION="Intel (R) Wireless WiFi Link 4965AGN ucode"
 HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz"
 
 LICENSE="Intel"
 SLOT="1"
@@ -14,8 +16,19 @@
 IUSE=""
 
 DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+pkg_setup() {
+	if kernel_is lt 2 6 27 ; then
+		eerror "Due to ucode API change this version of ucode works only with kernels"
+		eerror ">=2.6.27. Please either upgrade your kernel or mask"
+		eerror "net-wireless/iwl4965-unicode:1. For more information take a"
+		eerror "look at bugs.gentoo.org/235007"
+		die "${PN} requires at least kernel 2.6.27."
+	fi
+}
 
 src_compile() {
 	true;
@@ -23,7 +36,6 @@
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-4965-2.ucode"
-
+	doins iwlwifi-4965-2.ucode || die
 	dodoc README* || die "dodoc failed"
 }



1.14                 net-wireless/iwl4965-ucode/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	15 Jan 2009 22:07:37 -0000	1.13
+++ ChangeLog	22 Jan 2009 11:57:51 -0000	1.14
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/iwl4965-ucode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog,v 1.13 2009/01/15 22:07:37 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog,v 1.14 2009/01/22 11:57:51 pva Exp $
+
+  22 Jan 2009; Peter Volkov <pva@g.o> metadata.xml,
+  iwl4965-ucode-228.57.2.21.ebuild, iwl4965-ucode-228.57.2.23.ebuild:
+  Took maintainance. Added warning in stable ebuild and check kernel version
+  in unstable for bug #235007. Thank Oisin O Malley for report and R Bar-On
+  for solution.
 
   15 Jan 2009; Peter Alfredsen <loki_val@g.o> metadata.xml:
   Compnerd retired.
@@ -14,7 +20,8 @@
 
   06 Jan 2009; <chainsaw@g.o> +iwl4965-ucode-228.57.2.23.ebuild:
   ABI 2 microcode version bump, as requested by Ari Entlich
-  <lmage11@××××××××.com> in bug #252642.
+  <lmage11@××××××××.com> in bug #252642. Upstream announcement:
+  http://tinyurl.com/arkfxg
 
   01 Jan 2009; <chainsaw@g.o> iwl4965-ucode-228.57.2.21.ebuild:
   Mark firmware ABI-2 stable on AMD64 for 2.6.27 as requested by Thomas Pani



1.3                  net-wireless/iwl4965-ucode/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	15 Jan 2009 22:07:37 -0000	1.2
+++ metadata.xml	22 Jan 2009 11:57:51 -0000	1.3
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mobile</herd>
+	<maintainer>
+		<email>pva@g.o</email>
+		<name>Peter Volkov</name>
+	</maintainer>
 	<longdescription lang="en">
 		Firmware image for Intel Wirless 4965 series network cards
 	</longdescription>



1.4                  net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild?r1=1.3&r2=1.4

Index: iwl4965-ucode-228.57.2.21.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iwl4965-ucode-228.57.2.21.ebuild	10 Jan 2009 16:34:54 -0000	1.3
+++ iwl4965-ucode-228.57.2.21.ebuild	22 Jan 2009 11:57:51 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild,v 1.3 2009/01/10 16:34:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild,v 1.4 2009/01/22 11:57:51 pva Exp $
 
 MY_PN="iwlwifi-4965-ucode"
 
@@ -15,7 +15,7 @@
 
 DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_PN}-${PV}
 
 src_compile() {
 	true;
@@ -23,7 +23,12 @@
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-4965-2.ucode"
-
+	doins iwlwifi-4965-2.ucode || die
 	dodoc README* || die "dodoc failed"
 }
+
+pkg_postinst() {
+	elog "This version ofucode works only with kernels >=2.6.27. In case you have"
+	elog "older kernel, please, mask net-wireless/iwl4965-unicode:1. For more"
+	elog "information take a look at bugs.gentoo.org/235007"
+}