diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2015-05-14 19:26:29 +0000 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2015-05-14 19:26:29 +0000 |
| commit | 51ff84c98f87dfea90809efa67a4c4d43f41f33a (patch) | |
| tree | 2a5b32de76d6639fed254a1508a40810fc612a43 /eclass | |
| parent | Restore version that was accidentally removed. (diff) | |
| download | historical-51ff84c98f87dfea90809efa67a4c4d43f41f33a.tar.gz historical-51ff84c98f87dfea90809efa67a4c4d43f41f33a.tar.bz2 historical-51ff84c98f87dfea90809efa67a4c4d43f41f33a.zip | |
Add back the deblob script functionality to the eclass.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c3b75e43f17e..a94d884f0311 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1614 2015/05/12 15:15:31 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1615 2015/05/14 19:26:29 mpagano Exp $ + + 14 May 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass: + Add back the deblob script functionality to the eclass. 12 May 2015; Bernard Cafarelli <voyageur@gentoo.org> webapp.eclass: Drop elog in webapp_serverowned, discussed with blueness in bug #542024 diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 10df8cd01710..bb74af8e289d 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.303 2015/04/29 00:07:30 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.304 2015/05/14 19:26:29 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -56,6 +56,8 @@ # K_DEBLOB_AVAILABLE - A value of "0" will disable all of the optional deblob # code. If empty, will be set to "1" if deblobbing is # possible. Test ONLY for "1". +# K_DEBLOB_TAG - This will be the version of deblob script. It's a upstream SVN tag +# such asw -gnu or -gnu1. # K_PREDEBLOBBED - This kernel was already deblobbed elsewhere. # If false, either optional deblobbing will be available # or the license will note the inclusion of freedist @@ -476,15 +478,18 @@ if [[ ${ETYPE} == sources ]]; then DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}" fi + # deblob svn tag, default is -gnu, to change, use K_DEBLOB_TAG in ebuild + K_DEBLOB_TAG=${K_DEBLOB_TAG:--gnu} DEBLOB_A="deblob-${DEBLOB_PV}" DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}" - DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/" - DEBLOB_URI_PATH="download/releases/LATEST-${DEBLOB_PV}.N" + DEBLOB_HOMEPAGE="http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags" + DEBLOB_URI_PATH="${DEBLOB_PV}${K_DEBLOB_TAG}" if ! has "${EAPI:-0}" 0 1 ; then DEBLOB_CHECK_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/deblob-check -> ${DEBLOB_CHECK_A}" else DEBLOB_CHECK_URI="mirror://gentoo/${DEBLOB_CHECK_A}" fi + DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}" HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}" |