From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB26D138334 for ; Tue, 17 Jul 2018 18:07:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61D13E0869; Tue, 17 Jul 2018 18:07:28 +0000 (UTC) Received: from mx-out1.startmail.com (mx-out1.startmail.com [145.131.90.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4EA5E0801 for ; Tue, 17 Jul 2018 18:07:27 +0000 (UTC) Date: Tue, 17 Jul 2018 13:06:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1531850846; bh=OmrpUzeEFu783e7IVlMekPfjqXi04sO+Qt925L3AtQk=; h=Date:From:To:Subject:References:In-Reply-To:From; b=AcsGvlpAEmAvpXofrc7h01L+4xUYPHeBGDfHbY6MkXQQCzjjtwNYj6xI5zJceGy+b kAHnSs6qFyj0B9pK5olsNkzS5LA+mzjTVAy/oeQGfiA6F0NLHhe8P9opsyrsVdAWBo 83AKxW3giIG8eufxcX/lO3xN5mOPh+NjkcOo7PljoheCq7PmcAXXoxZpdulFR9RLjz bEmrYKOz0rtHtrtwNiz1wyKWhHyer4ndWEOiLQJAWGsfw7Ye9CFjPcJABx+IEc5Jjm YpwTmbGzdsvBcSPITnVCS+MKVfexA7xnnXr1CTU0Q4soyYKWyAhg4vyjZJnLiuoqDh lvzJ10QvnWo9Q== From: "Marty E. Plummer" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] linux-info.eclass: fix for prematurely merged patch Message-ID: <20180717180559.wcm4bk73qbap4c6r@proprietary-killer> References: <20180713235723.32617-1-hanetzer@startmail.com> <23369.38518.32731.496320@a1i15.kph.uni-mainz.de> <20180714075237.35rqkf5tg5homkz3@proprietary-killer> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180714075237.35rqkf5tg5homkz3@proprietary-killer> X-Archives-Salt: 319b8da5-b150-4f53-8aca-d092e542312c X-Archives-Hash: 5e5ae4a465ff53583b47662fa14fb6da 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