diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2011-05-27 09:46:14 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2011-05-27 09:46:14 +0000 |
| commit | 00cd5efe825614cba320ea43b2da3ad8076a8546 (patch) | |
| tree | 01450b93ce669be9a299176e7ce393f992355a3f /eclass | |
| parent | Version bump, as requested by Marcin Miroslaw in bug #368859. The strlen bug ... (diff) | |
| download | gentoo-2-00cd5efe825614cba320ea43b2da3ad8076a8546.tar.gz gentoo-2-00cd5efe825614cba320ea43b2da3ad8076a8546.tar.bz2 gentoo-2-00cd5efe825614cba320ea43b2da3ad8076a8546.zip | |
for EAPI>=4, rely on PMS MERGE_TYPE rather than portage non-spec EMERGE_FROM; for EAPI<4, use EMERGE_FROM since it's acceptable there
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/linux-mod.eclass | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index 3fef24b079f5..435fad36599d 100644 --- a/eclass/linux-mod.eclass +++ b/eclass/linux-mod.eclass @@ -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/linux-mod.eclass,v 1.100 2011/04/24 18:55:20 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.101 2011/05/27 09:46:14 ferringb Exp $ # Author(s): John Mylchreest <johnm@gentoo.org>, # Stefan Schweizer <genstef@gentoo.org> @@ -576,8 +576,15 @@ find_module_params() { linux-mod_pkg_setup() { debug-print-function ${FUNCNAME} $* + local is_bin="${MERGE_TYPE}" + # If we are installing a binpkg, take a different path. - if [[ $EMERGE_FROM == binary ]]; then + # use MERGE_TYPE if available (eapi>=4); else use non-PMS EMERGE_FROM (eapi<4) + if has ${EAPI} 0 1 2 3; then + is_bin=${EMERGE_FROM} + fi + + if [[ ${is_bin} == binary ]]; then linux-mod_pkg_setup_binary return fi |