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 55F93139694 for ; Fri, 14 Jul 2017 18:56:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC2021FC087; Fri, 14 Jul 2017 18:56:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 8A2911FC087 for ; Fri, 14 Jul 2017 18:56:06 +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 991B93418D7 for ; Fri, 14 Jul 2017 18:56:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74E473A56 for ; Fri, 14 Jul 2017 18:56:03 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1500058507.83de2d26e38c143499ca47ec3bea4ba93f2b0073.robbat2@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: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 83de2d26e38c143499ca47ec3bea4ba93f2b0073 X-VCS-Branch: master Date: Fri, 14 Jul 2017 18:56:03 +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: e8ba394e-7faf-4c48-8eed-d249acf60018 X-Archives-Hash: 8ba2be277d0c631ff7da9755ecb058d2 commit: 83de2d26e38c143499ca47ec3bea4ba93f2b0073 Author: Chris Henhawke hamiltonshells ca> AuthorDate: Fri Jul 14 18:55:07 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jul 14 18:55:07 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=83de2d26 ZFS: Ensure libgcc_s included. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=617666 Signed-off-by: Robin H. Johnson gentoo.org> gen_initramfs.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 4075f85..0e66c66 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -495,14 +495,18 @@ append_zfs(){ # Copy binaries # Include libgcc_s.so.1 to workaround zfsonlinux/zfs#4749 + local libgccpath 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 + libgccpath="/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1" + fi + if [[ ! -f ${libgccpath} ]]; then + libgccpath="/usr/lib/gcc/*/*/libgcc_s.so.1" fi + copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} ${libgccpath} + cd "${TEMP}/initramfs-zfs-temp/lib64" + ln -s "..${libgccpath}" + cd "${TEMP}/initramfs-zfs-temp/" log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \