linux-info.eclass: fix for prematurely merged patch
authorMarty E. Plummer <hanetzer@startmail.com>
Tue, 17 Jul 2018 18:06:00 +0000 (13:06 -0500)
committerUlrich Müller <ulm@gentoo.org>
Tue, 17 Jul 2018 21:20:38 +0000 (23:20 +0200)
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

index 314647660387a1f09871e164dd23c6189111d3ee..6cd64457edd2b558a2efadc23a0c0017d818a8c8 100644 (file)
@@ -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