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 445E813832E for ; Wed, 17 Aug 2016 15:40:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F00EE0B7E; Wed, 17 Aug 2016 15:40:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38B33E0B7E for ; Wed, 17 Aug 2016 15:40:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2E79340D94 for ; Wed, 17 Aug 2016 15:40:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C67D2444 for ; Wed, 17 Aug 2016 15:40:30 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1471448364.6b5eb0fe52a49b1aa050f4b9f2e46b03f5c2940c.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 6b5eb0fe52a49b1aa050f4b9f2e46b03f5c2940c X-VCS-Branch: master Date: Wed, 17 Aug 2016 15:40:30 +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-Archives-Salt: 6449946e-8e30-4ba0-baaa-f8c602430c56 X-Archives-Hash: d3cb5fb0a2fba7e4e1e7fa4a0db7acd0 commit: 6b5eb0fe52a49b1aa050f4b9f2e46b03f5c2940c Author: Richard Yao gentoo org> AuthorDate: Wed Aug 17 14:46:35 2016 +0000 Commit: Richard Yao gentoo org> CommitDate: Wed Aug 17 15:39:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6b5eb0fe Include libgcc_s.so.1 with ZFS support The resumable send/recv work added an indirect dependency on libgcc_s.so.1, which libpthread opens via dlopen for _Unwind_Resume(). If we do not include it, we will see: libgcc_s.so.1 must be installed for pthread_cancel to work Lets include it for now. We make an effort to include only 1 version. This might not work on all architectures, but for lack of ability to test, it will need to do for now. It also will use gcc-config if it is avaliable. This also enables functions in zdb that previously did not work due to the same issue. Original-patch-by: Jason Zaman gentoo.org> Signed-off-by: Richard Yao gentoo.org> gen_initramfs.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 1fd5d2a..ea4a771 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -491,7 +491,14 @@ append_zfs(){ done # Copy binaries - copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} + # Include libgcc_s.so.1 to workaround zfsonlinux/zfs#4749 + if type gcc-config 2>&1 1>/dev/null; then + copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} \ + "/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1" + else + copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} \ + /usr/lib/gcc/*/*/libgcc_s.so.1 + fi cd "${TEMP}/initramfs-zfs-temp/" log_future_cpio_content