1 |
vapier 13/09/29 02:36:17 |
2 |
|
3 |
Modified: linux-info.eclass |
4 |
Log: |
5 |
get_version: do not parse KBUILD_OUTPUT in the cases where we do not use it as reported by Doug Anderson from ChromiumOS |
6 |
|
7 |
Revision Changes Path |
8 |
1.101 eclass/linux-info.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.101&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.101&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?r1=1.100&r2=1.101 |
13 |
|
14 |
Index: linux-info.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v |
17 |
retrieving revision 1.100 |
18 |
retrieving revision 1.101 |
19 |
diff -u -r1.100 -r1.101 |
20 |
--- linux-info.eclass 10 Feb 2013 07:53:31 -0000 1.100 |
21 |
+++ linux-info.eclass 29 Sep 2013 02:36:17 -0000 1.101 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2013 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.100 2013/02/10 07:53:31 vapier Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.101 2013/09/29 02:36:17 vapier Exp $ |
27 |
|
28 |
# @ECLASS: linux-info.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -429,7 +429,7 @@ |
31 |
# KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the |
32 |
# symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build). |
33 |
get_version() { |
34 |
- local kbuild_output mkfunc tmplocal |
35 |
+ local mkfunc tmplocal |
36 |
|
37 |
# no need to execute this twice assuming KV_FULL is populated. |
38 |
# we can force by unsetting KV_FULL |
39 |
@@ -497,8 +497,9 @@ |
40 |
mkfunc="$(get_makefile_extract_function "${KERNEL_MAKEFILE}")" |
41 |
|
42 |
# And if we didn't pass it, we can take a nosey in the Makefile |
43 |
- kbuild_output="$(${mkfunc} KBUILD_OUTPUT ${KERNEL_MAKEFILE})" |
44 |
- OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}" |
45 |
+ if [[ -z ${OUTPUT_DIR} ]]; then |
46 |
+ OUTPUT_DIR=$(${mkfunc} KBUILD_OUTPUT "${KERNEL_MAKEFILE}") |
47 |
+ fi |
48 |
|
49 |
# And contrary to existing functions I feel we shouldn't trust the |
50 |
# directory name to find version information as this seems insane. |