[gentoo-commits] gentoo-x86 commit in eclass: linux-info.eclass

2015-06-02 Thread Mike Frysinger (vapier) 
vapier  15/06/02 07:39:52

  Modified: linux-info.eclass
  Log:
  fix typo in SYSROOT var pointed out by Michał Górny

Revision  ChangesPath
1.107eclass/linux-info.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.107view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.107content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?r1=1.106r2=1.107

Index: linux-info.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- linux-info.eclass   2 Jun 2015 04:27:35 -   1.106
+++ linux-info.eclass   2 Jun 2015 07:39:52 -   1.107
@@ -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/linux-info.eclass,v 1.106 2015/06/02 
04:27:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.107 2015/06/02 
07:39:52 vapier Exp $
 
 # @ECLASS: linux-info.eclass
 # @MAINTAINER:
@@ -531,7 +531,7 @@
# caught before this if they are.
if [[ -z ${OUTPUT_DIR} ]] ; then
# Try to locate a kernel that is most relevant for us.
-   for OUTPUT_DIR in ${SYROOT} ${ROOT}  ; do
+   for OUTPUT_DIR in ${SYSROOT} ${ROOT}  ; do

OUTPUT_DIR+=/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build
if [[ -e ${OUTPUT_DIR} ]] ; then
break

[gentoo-commits] gentoo-x86 commit in eclass: linux-info.eclass

2015-06-01 Thread Mike Frysinger (vapier) 
vapier  15/06/02 04:27:35

  Modified: linux-info.eclass
  Log:
  fix looking up output dir when cross-compiling (fix by Nam Nguyen from 
Chromium OS)

Revision  ChangesPath
1.106eclass/linux-info.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.106view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.106content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?r1=1.105r2=1.106

Index: linux-info.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- linux-info.eclass   9 May 2015 08:03:40 -   1.105
+++ linux-info.eclass   2 Jun 2015 04:27:35 -   1.106
@@ -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/linux-info.eclass,v 1.105 2015/05/09 
08:03:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.106 2015/06/02 
04:27:35 vapier Exp $
 
 # @ECLASS: linux-info.eclass
 # @MAINTAINER:
@@ -529,7 +529,15 @@
# but before we do this, we need to find if we use a different object 
directory.
# This *WILL* break if the user is using localversions, but we assume 
it was
# caught before this if they are.
-   
OUTPUT_DIR=${OUTPUT_DIR:-/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build}
+   if [[ -z ${OUTPUT_DIR} ]] ; then
+   # Try to locate a kernel that is most relevant for us.
+   for OUTPUT_DIR in ${SYROOT} ${ROOT}  ; do
+   
OUTPUT_DIR+=/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build
+   if [[ -e ${OUTPUT_DIR} ]] ; then
+   break
+   fi
+   done
+   fi
 
[ -h ${OUTPUT_DIR} ]  KV_OUT_DIR=$(readlink -f ${OUTPUT_DIR})
[ -d ${OUTPUT_DIR} ]  KV_OUT_DIR=${OUTPUT_DIR}

[gentoo-commits] gentoo-x86 commit in eclass: linux-info.eclass

2015-05-09 Thread Ulrich Mueller (ulm) 
ulm 15/05/09 08:03:40

  Modified: linux-info.eclass
  Log:
  Update a comment.

Revision  ChangesPath
1.105eclass/linux-info.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.105view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.105content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?r1=1.104r2=1.105

Index: linux-info.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- linux-info.eclass   28 Jun 2014 07:54:27 -  1.104
+++ linux-info.eclass   9 May 2015 08:03:40 -   1.105
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.104 2014/06/28 
07:54:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.105 2015/05/09 
08:03:40 ulm Exp $
 
 # @ECLASS: linux-info.eclass
 # @MAINTAINER:
@@ -599,7 +599,7 @@
return $?
else
# This handles a variety of weird kernel versions.  Make sure 
to update
-   # tests/linux-info:get_running_version.sh if you want to change 
this.
+   # tests/linux-info_get_running_version.sh if you want to change 
this.
local kv_full=${KV_FULL//[-+_]*}
KV_MAJOR=$(get_version_component_range 1 ${kv_full})
KV_MINOR=$(get_version_component_range 2 ${kv_full})

[gentoo-commits] gentoo-x86 commit in eclass: linux-info.eclass

2014-06-28 Thread Robin H. Johnson (robbat2) 
robbat2 14/06/28 07:54:27

  Modified: linux-info.eclass
  Log:
  ChangeLog

Revision  ChangesPath
1.104eclass/linux-info.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.104view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.104content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?r1=1.103r2=1.104

Index: linux-info.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -p -w -b -B -u -u -r1.103 -r1.104
--- linux-info.eclass   21 Mar 2014 22:03:00 -  1.103
+++ linux-info.eclass   28 Jun 2014 07:54:27 -  1.104
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.103 2014/03/21 
22:03:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.104 2014/06/28 
07:54:27 robbat2 Exp $
 
 # @ECLASS: linux-info.eclass
 # @MAINTAINER:
@@ -164,7 +164,7 @@ qeerror() { qout eerror ${@} ; }
 # done by including the configfile, and printing the variable with Make.
 # It WILL break if your makefile has missing dependencies!
 getfilevar() {
-   local ERROR basefname basedname myARCH=${ARCH}
+   local ERROR basefname basedname myARCH=${ARCH} M=${S}
ERROR=0
 
[ -z ${1} ]  ERROR=1
@@ -182,8 +182,11 @@ getfilevar() {
 
# We use nonfatal because we want the caller to take care of 
things #373151
[[ ${EAPI:-0} == [0123] ]]  nonfatal() { $@; }
+   case ${EBUILD_PHASE_FUNC} in
+   pkg_info|pkg_nofetch|pkg_pretend) M=${T} ;;
+   esac
echo -e e:\\n\\t@echo \$(${1})\\ninclude ${basefname} | \
-   nonfatal emake -C ${basedname} M=${S} 
${BUILD_FIXES} -s -f - 2/dev/null
+   nonfatal emake -C ${basedname} M=${M} 
${BUILD_FIXES} -s -f - 2/dev/null
 
ARCH=${myARCH}
fi