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 916C81382C5 for ; Wed, 28 Apr 2021 13:30:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5297E088C; Wed, 28 Apr 2021 13:30:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B2502E088C for ; Wed, 28 Apr 2021 13:30:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5BD1E340B9C for ; Wed, 28 Apr 2021 13:30:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDC2C5C9 for ; Wed, 28 Apr 2021 13:30:54 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1619616648.df9692779fe7c9242d92ea9508312e18411a8e38.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut-crypt-ssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild X-VCS-Directories: sys-kernel/dracut-crypt-ssh/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: df9692779fe7c9242d92ea9508312e18411a8e38 X-VCS-Branch: master Date: Wed, 28 Apr 2021 13:30: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: 56fb4934-892a-400a-9025-3a560b0d43aa X-Archives-Hash: 61526311c60d728f20a84aecacfeef57 commit: df9692779fe7c9242d92ea9508312e18411a8e38 Author: Lars Wendler gentoo org> AuthorDate: Wed Apr 28 12:46:30 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Apr 28 13:30:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df969277 sys-kernel/dracut-crypt-ssh: Fixed libdir for x86 Signed-off-by: Lars Wendler gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/20573 Signed-off-by: Lars Wendler gentoo.org> sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild index a403202d190..88badd7c96a 100644 --- a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild +++ b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild @@ -27,6 +27,15 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) +src_prepare() { + default + + # Fix libdir (hard-coded to "lib64") + sed "s@/lib64/@/$(get_libdir)/@" \ + -i modules/60crypt-ssh/module-setup.sh \ + || die +} + src_configure() { tc-export CC default