Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 17 Jul 2018 21:22:24
Message-Id: 1531862438.a2c0712d0f17243bab0523fe7df78ce4ea145ef5.ulm@gentoo
1 commit: a2c0712d0f17243bab0523fe7df78ce4ea145ef5
2 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
3 AuthorDate: Tue Jul 17 18:06:00 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 17 21:20:38 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c0712d
7
8 linux-info.eclass: fix for prematurely merged patch
9
10 https://github.com/gentoo/gentoo/pull/9222 was merged prematurely, and
11 included the first iteration of my linux-info EAPI 7 patch, and requires
12 this patch on top to avoid a double slash.
13
14 eclass/linux-info.eclass | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
18 index 31464766038..6cd64457edd 100644
19 --- a/eclass/linux-info.eclass
20 +++ b/eclass/linux-info.eclass
21 @@ -554,7 +554,7 @@ get_version() {
22 # caught before this if they are.
23 if [[ -z ${OUTPUT_DIR} ]] ; then
24 # Try to locate a kernel that is most relevant for us.
25 - for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}/" "" ; do
26 + for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}" "" ; do
27 OUTPUT_DIR+="/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build"
28 if [[ -e ${OUTPUT_DIR} ]] ; then
29 break