diff options
| author |   Richard Yao <ryao@gentoo.org> | 2016-08-17 22:46:35 +0800 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2016-08-17 11:39:24 -0400 |
| commit | 6b5eb0fe52a49b1aa050f4b9f2e46b03f5c2940c (patch) | |
| tree | 11089bfcfb03a73aa53062f381e33d45e2665a19 | |
| parent | Bump version to 3.5.0.4 (diff) | |
| download | genkernel-6b5eb0fe52a49b1aa050f4b9f2e46b03f5c2940c.tar.gz genkernel-6b5eb0fe52a49b1aa050f4b9f2e46b03f5c2940c.tar.bz2 genkernel-6b5eb0fe52a49b1aa050f4b9f2e46b03f5c2940c.zip | |
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 <perfinion@gentoo.org>
Signed-off-by: Richard Yao <ryao@gentoo.org>
| -rwxr-xr-x | gen_initramfs.sh | 9 |
1 files changed, 8 insertions, 1 deletions
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 |