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

[Peter Volkov (pva)]

pva         09/01/22 18:20:25

  Modified:             iwl4965-ucode-228.57.2.23.ebuild ChangeLog
                        iwl4965-ucode-228.57.2.21.ebuild
  Log:
  As it was suggested by PaX Team in bug #246045 die was bad idea. So merely warn user instead.
  (Portage version: 2.2_rc23/cvs/Linux i686)

Revision  Changes    Path
1.3                  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.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild?rev=1.3&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.2&r2=1.3

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iwl4965-ucode-228.57.2.23.ebuild	22 Jan 2009 11:57:51 -0000	1.2
+++ iwl4965-ucode-228.57.2.23.ebuild	22 Jan 2009 18:20:25 -0000	1.3
@@ -1,8 +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.23.ebuild,v 1.2 2009/01/22 11:57:51 pva Exp $
-
-inherit linux-info
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild,v 1.3 2009/01/22 18:20:25 pva Exp $
 
 MY_P=iwlwifi-4965-ucode-${PV}
 
@@ -20,16 +18,6 @@
 
 S=${WORKDIR}/${MY_P}
 
-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;
 }
@@ -39,3 +27,10 @@
 	doins iwlwifi-4965-2.ucode || die
 	dodoc README* || die "dodoc failed"
 }
+
+pkg_postinst() {
+	elog "Due to ucode API change this version of ucode works only with kernels"
+	elog ">=2.6.27. If you need ucode for older versions please install it with"
+	elog "emerge net-wireless/iwl4965-unicode:0"
+	elog "For more information take a look at bugs.gentoo.org/235007"
+}



1.15                 net-wireless/iwl4965-ucode/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	22 Jan 2009 11:57:51 -0000	1.14
+++ ChangeLog	22 Jan 2009 18:20:25 -0000	1.15
@@ -1,6 +1,11 @@
 # 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.14 2009/01/22 11:57:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog,v 1.15 2009/01/22 18:20:25 pva Exp $
+
+  22 Jan 2009; Peter Volkov <pva@g.o>
+  iwl4965-ucode-228.57.2.21.ebuild, iwl4965-ucode-228.57.2.23.ebuild:
+  As it was suggested by PaX Team in bug #246045 die was bad idea. So merely
+  warn user instead.
 
   22 Jan 2009; Peter Volkov <pva@g.o> metadata.xml,
   iwl4965-ucode-228.57.2.21.ebuild, iwl4965-ucode-228.57.2.23.ebuild:



1.5                  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.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild?rev=1.5&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.4&r2=1.5

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iwl4965-ucode-228.57.2.21.ebuild	22 Jan 2009 11:57:51 -0000	1.4
+++ iwl4965-ucode-228.57.2.21.ebuild	22 Jan 2009 18:20:25 -0000	1.5
@@ -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.4 2009/01/22 11:57:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild,v 1.5 2009/01/22 18:20:25 pva Exp $
 
 MY_PN="iwlwifi-4965-ucode"
 
@@ -28,7 +28,8 @@
 }
 
 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"
+	elog "Due to ucode API change this version of ucode works only with kernels"
+	elog ">=2.6.27. If you need ucode for older versions please install it with"
+	elog "emerge net-wireless/iwl4965-unicode:0"
+	elog "For more information take a look at bugs.gentoo.org/235007"
 }