/[gentoo-x86]/eclass/linux-mod.eclass
Gentoo

Diff of /eclass/linux-mod.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.100 Revision 1.102
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.100 2011/04/24 18:55:20 ulm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.102 2011/06/01 06:51:30 robbat2 Exp $
4 4
5# Author(s): John Mylchreest <johnm@gentoo.org>, 5# Author(s): John Mylchreest <johnm@gentoo.org>,
6# Stefan Schweizer <genstef@gentoo.org> 6# Stefan Schweizer <genstef@gentoo.org>
7# Maintainer: kernel-misc@gentoo.org 7# Maintainer: kernel-misc@gentoo.org
8# 8#
193 # if we haven't determined the version yet, we need too. 193 # if we haven't determined the version yet, we need too.
194 get_version; 194 get_version;
195 195
196 # if the kernel version is greater than 2.6.6 then we should use 196 # if the kernel version is greater than 2.6.6 then we should use
197 # M= instead of SUBDIRS= 197 # M= instead of SUBDIRS=
198 [ ${KV_MAJOR} -eq 3 ] && return 0
198 [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \ 199 [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \
199 return 0 || return 1 200 return 0 || return 1
200} 201}
201 202
202# @FUNCTION: convert_to_m 203# @FUNCTION: convert_to_m
326# @DESCRIPTION: 327# @DESCRIPTION:
327# It sets the KV_OBJ variable. 328# It sets the KV_OBJ variable.
328set_kvobj() { 329set_kvobj() {
329 debug-print-function ${FUNCNAME} $* 330 debug-print-function ${FUNCNAME} $*
330 331
331 if kernel_is 2 6 332 if kernel_is ge 2 6
332 then 333 then
333 KV_OBJ="ko" 334 KV_OBJ="ko"
334 else 335 else
335 KV_OBJ="o" 336 KV_OBJ="o"
336 fi 337 fi
574# configured, verifies that the sources are prepared, verifies that the modules support is builtin 575# configured, verifies that the sources are prepared, verifies that the modules support is builtin
575# in the kernel and sets the object extension KV_OBJ. 576# in the kernel and sets the object extension KV_OBJ.
576linux-mod_pkg_setup() { 577linux-mod_pkg_setup() {
577 debug-print-function ${FUNCNAME} $* 578 debug-print-function ${FUNCNAME} $*
578 579
580 local is_bin="${MERGE_TYPE}"
581
579 # If we are installing a binpkg, take a different path. 582 # If we are installing a binpkg, take a different path.
583 # use MERGE_TYPE if available (eapi>=4); else use non-PMS EMERGE_FROM (eapi<4)
584 if has ${EAPI} 0 1 2 3; then
585 is_bin=${EMERGE_FROM}
586 fi
587
580 if [[ $EMERGE_FROM == binary ]]; then 588 if [[ ${is_bin} == binary ]]; then
581 linux-mod_pkg_setup_binary 589 linux-mod_pkg_setup_binary
582 return 590 return
583 fi 591 fi
584 592
585 linux-info_pkg_setup; 593 linux-info_pkg_setup;

Legend:
Removed from v.1.100  
changed lines
  Added in v.1.102

  ViewVC Help
Powered by ViewVC 1.1.20