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 1OgLp5-0006l3-6H for garchives@archives.gentoo.org; Tue, 03 Aug 2010 18:02:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA7AEE0849 for ; Tue, 3 Aug 2010 18:02:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9D1CDE0882 for ; Tue, 3 Aug 2010 17:22:15 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09FE11B4010 for ; Tue, 3 Aug 2010 17:22:15 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 544) id 2502D2CE15; Tue, 3 Aug 2010 17:22:14 +0000 (UTC) From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@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: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: <20100803172214.2502D2CE15@corvid.gentoo.org> Date: Tue, 3 Aug 2010 17:22:14 +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: a8e625b6-a524-463e-9035-c8b2e54484d9 X-Archives-Hash: 5311a1c56e4d5d98f0f7bd26a6012ef8 robbat2 10/08/03 17:22:14 Modified: kernel-2.eclass Log: kernel-2 deblob support for 2.6.35; bug #324505: deblob-check usage. Revision Changes Path 1.239 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.ec= lass?rev=3D1.239&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.ec= lass?rev=3D1.239&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.ec= lass?r1=3D1.238&r2=3D1.239 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.238 retrieving revision 1.239 diff -p -w -b -B -u -u -r1.238 -r1.239 --- kernel-2.eclass 30 Jul 2010 00:44:59 -0000 1.238 +++ kernel-2.eclass 3 Aug 2010 17:22:13 -0000 1.239 @@ -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/eclass/kernel-2.eclass,v 1.238 2010/0= 7/30 00:44:59 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.239 2010/0= 8/03 17:22:13 robbat2 Exp $ =20 # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -86,7 +86,7 @@ HOMEPAGE=3D"http://www.kernel.org/ http:// =20 # This is the latest KV_PATCH of the deblob tool available from the # libre-sources upstream. -[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=3D34 +[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=3D35 =20 # No need to run scanelf/strip on kernel sources/headers (bug #134453). RESTRICT=3D"binchecks strip" @@ -338,12 +338,21 @@ if [[ ${ETYPE} =3D=3D sources ]]; then =20 DEBLOB_PV=3D"${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" DEBLOB_A=3D"deblob-${DEBLOB_PV}" + DEBLOB_CHECK_A=3D"deblob-check-${DEBLOB_PV}" DEBLOB_HOMEPAGE=3D"http://www.fsfla.org/svnwiki/selibre/linux-libre/" + DEBLOB_URI_PATH=3D"download/releases/LATEST-${DEBLOB_PV}.N" + if ! has "${EAPI:-0}" 0 1 ; then + DEBLOB_CHECK_URI=3D"${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/deblob-che= ck -> ${DEBLOB_CHECK_A}" + else + DEBLOB_CHECK_URI=3D"mirror://gentoo/${DEBLOB_CHECK_A}" + fi + DEBLOB_URI=3D"${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}" HOMEPAGE=3D"${HOMEPAGE} ${DEBLOB_HOMEPAGE}" =09 KERNEL_URI=3D"${KERNEL_URI} deblob? ( - ${DEBLOB_HOMEPAGE}/download/releases/LATEST-${DEBLOB_PV}.N/${DEBLOB= _A} + ${DEBLOB_URI} + ${DEBLOB_CHECK_URI} )" else # We have no way to deblob older kernels, so just mark them as @@ -1125,8 +1134,9 @@ kernel-2_src_unpack() { fi =20 if [[ $K_DEBLOB_AVAILABLE =3D=3D 1 ]] && use deblob ; then - cp "${DISTDIR}/${DEBLOB_A}" "${T}" - chmod +x "${T}/${DEBLOB_A}" + cp "${DISTDIR}/${DEBLOB_A}" "${T}" || die "cp ${DEBLOB_A} failed" + cp "${DISTDIR}/${DEBLOB_CHECK_A}" "${T}/deblob-check" || die "cp ${DEB= LOB_CHECK_A} failed" + chmod +x "${T}/${DEBLOB_A}" "${T}/deblob-check" || die "chmod deblob s= cripts failed" fi } =20