public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marty E. Plummer" <hanetzer@startmail.com>
To: gentoo-dev@lists.gentoo.org
Subject: [gentoo-dev] [PATCH] linux-info.eclass: fix for prematurely merged patch
Date: Tue, 17 Jul 2018 13:06:00 -0500	[thread overview]
Message-ID: <20180717180559.wcm4bk73qbap4c6r@proprietary-killer> (raw)
In-Reply-To: <20180714075237.35rqkf5tg5homkz3@proprietary-killer>

https://github.com/gentoo/gentoo/pull/9222 was merged prematurely, and
included the first iteration of my linux-info EAPI 7 patch, and requires
this patch on top to avoid a double slash.
---
 eclass/linux-info.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 31464766038..6cd64457edd 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -554,7 +554,7 @@ get_version() {
 	# 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 "${SYSROOT}" "${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
-- 
2.18.0



      reply	other threads:[~2018-07-17 18:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-13 23:57 [gentoo-dev] [PATCH] linux-info.eclass: account for lack of trailing slash Marty E. Plummer
2018-07-14  6:21 ` Ulrich Mueller
2018-07-14  7:46   ` Marty E. Plummer
2018-07-14  7:52   ` [gentoo-dev] [PATCH v2] " Marty E. Plummer
2018-07-17 18:06     ` Marty E. Plummer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180717180559.wcm4bk73qbap4c6r@proprietary-killer \
    --to=hanetzer@startmail.com \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox