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 28E8213835A for ; Fri, 15 May 2020 08:58:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 416C7E0B9D; Fri, 15 May 2020 08:58:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 283E1E0B9D for ; Fri, 15 May 2020 08:58:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAED134F476 for ; Fri, 15 May 2020 08:57:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49BB21B3 for ; Fri, 15 May 2020 08:57:54 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1589533026.bd9a21c94f79536ee7feb436db238b234b197ff7.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/lxd/lxd-4.0.1.ebuild X-VCS-Directories: app-emulation/lxd/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: bd9a21c94f79536ee7feb436db238b234b197ff7 X-VCS-Branch: master Date: Fri, 15 May 2020 08:57:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e24eaceb-a37b-4ee4-bc18-fc38b5f4993c X-Archives-Hash: 8e293de2ab0def1634eb97b6ad5b8d42 commit: bd9a21c94f79536ee7feb436db238b234b197ff7 Author: Joonas Niilola gentoo org> AuthorDate: Fri May 15 08:57:06 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri May 15 08:57:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9a21c9 app-emulation/lxd: update zfs fix line per feedback on bug 723208 - straight copypaste from the bug (I don't have zfs to test on). Closes: https://bugs.gentoo.org/723208 Signed-off-by: Joonas Niilola gentoo.org> app-emulation/lxd/lxd-4.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild index 020974b79e2..21a6fcee066 100644 --- a/app-emulation/lxd/lxd-4.0.1.ebuild +++ b/app-emulation/lxd/lxd-4.0.1.ebuild @@ -87,7 +87,7 @@ src_prepare() { Makefile || die sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die - sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die + sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die common_op eautoreconf }