From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QCt5u-0001Bf-N8 for garchives@archives.gentoo.org; Thu, 21 Apr 2011 12:34:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A6CA1C026; Thu, 21 Apr 2011 12:34:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CF6271C026 for ; Thu, 21 Apr 2011 12:34:41 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 418E11B406A for ; Thu, 21 Apr 2011 12:34:41 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2195) id D5B7B20054; Thu, 21 Apr 2011 12:34:39 +0000 (UTC) From: "Mike Pagano (mpagano)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mpagano@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: kernel-2.eclass X-VCS-Directories: eclass X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano Content-Type: text/plain; charset=utf8 Message-Id: <20110421123439.D5B7B20054@flycatcher.gentoo.org> Date: Thu, 21 Apr 2011 12:34:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6cbd0f72c0350c381b3bc69cf117c87b mpagano 11/04/21 12:34:39 Modified: kernel-2.eclass Log: deblob fix for bug #359865 thanks too Johnny Revision Changes Path 1.250 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.ec= lass?rev=3D1.250&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.ec= lass?rev=3D1.250&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.ec= lass?r1=3D1.249&r2=3D1.250 Index: kernel-2.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- kernel-2.eclass 14 Apr 2011 06:10:32 -0000 1.249 +++ kernel-2.eclass 21 Apr 2011 12:34:39 -0000 1.250 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.249 2011/0= 4/14 06:10:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.250 2011/0= 4/21 12:34:39 mpagano Exp $ =20 # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -332,11 +332,11 @@ =20 # Bug #266157, deblob for libre support if [[ -z ${K_PREDEBLOBBED} ]] ; then - if [[ -z ${K_DEBLOB_AVAILABLE} ]] ; then - kernel_is ge 2 6 27 && \ + # Bug #359865, force a call to detect_version if needed + kernel_is ge 2 6 27 && \ + [[ -z "${K_DEBLOB_AVAILABLE}" ]] && \ kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ - K_DEBLOB_AVAILABLE=3D1 - fi + K_DEBLOB_AVAILABLE=3D1 if [[ ${K_DEBLOB_AVAILABLE} =3D=3D "1" ]] ; then IUSE=3D"${IUSE} deblob" # Reflect that kernels contain firmware blobs unless otherwise