Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 617666 | Differences between
and this patch

Collapse All | Expand All

(-)gen_initramfs.sh (-5 / +9 lines)
Lines 495-507 Link Here
495
495
496
	# Copy binaries
496
	# Copy binaries
497
	# Include libgcc_s.so.1 to workaround zfsonlinux/zfs#4749
497
	# Include libgcc_s.so.1 to workaround zfsonlinux/zfs#4749
498
	local libgccpath
498
	if type gcc-config 2>&1 1>/dev/null; then
499
	if type gcc-config 2>&1 1>/dev/null; then
499
		copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} \
500
		libgccpath="/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1"
500
			"/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1"
501
	else
502
		copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} \
503
			/usr/lib/gcc/*/*/libgcc_s.so.1
504
	fi
501
	fi
502
	if [[ ! -f ${libgccpath} ]]; then
503
		libgccpath="/usr/lib/gcc/*/*/libgcc_s.so.1"
504
	fi
505
506
	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} ${libgccpath}
507
	cd "${TEMP}/initramfs-zfs-temp/lib64"
508
	ln -s "..${libgccpath}"
505
509
506
	cd "${TEMP}/initramfs-zfs-temp/"
510
	cd "${TEMP}/initramfs-zfs-temp/"
507
	log_future_cpio_content
511
	log_future_cpio_content

Return to bug 617666