Gentoo Archives: gentoo-dev

From: "Marty E. Plummer" <hanetzer@×××××××××.com>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH] linux-info.eclass: fix for prematurely merged patch
Date: Tue, 17 Jul 2018 18:07:37
Message-Id: 20180717180559.wcm4bk73qbap4c6r@proprietary-killer
In Reply to: [gentoo-dev] [PATCH v2] linux-info.eclass: account for lack of trailing slash by "Marty E. Plummer"
1 https://github.com/gentoo/gentoo/pull/9222 was merged prematurely, and
2 included the first iteration of my linux-info EAPI 7 patch, and requires
3 this patch on top to avoid a double slash.
4 ---
5 eclass/linux-info.eclass | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
9 index 31464766038..6cd64457edd 100644
10 --- a/eclass/linux-info.eclass
11 +++ b/eclass/linux-info.eclass
12 @@ -554,7 +554,7 @@ get_version() {
13 # caught before this if they are.
14 if [[ -z ${OUTPUT_DIR} ]] ; then
15 # Try to locate a kernel that is most relevant for us.
16 - for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}/" "" ; do
17 + for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}" "" ; do
18 OUTPUT_DIR+="/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build"
19 if [[ -e ${OUTPUT_DIR} ]] ; then
20 break
21 --
22 2.18.0