From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Fri, 9 Jun 2006 13:22:57 +0000 (+0000)
Subject: Added fix for bug #134843 from Thomas Raschbacher <lordvan@gentoo.org> for evms and... 
X-Git-Tag: v3.4.10.902~350
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1b29a86b5b25a88e0af4cdfeb5b601cdfbbe9cf;p=genkernel.git

Added fix for bug #134843 from Thomas Raschbacher <lordvan@gentoo.org> for evms and later glibc versions.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@402 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5b73454..a7e9806 100644
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -254,16 +254,31 @@ create_evms2_cpio(){
 		then
 			print_info 1 '		EVMS2: Adding support...'	
 			mkdir -p ${TEMP}/initramfs-evms2-temp/lib
-			cp -a /lib/ld-* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libpthread* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libevms*so* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/evms "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/evms/* "${TEMP}/initramfs-evms2-temp/lib/evms" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /etc/evms.conf "${TEMP}/initramfs-evms2-temp/etc" || gen_die 'Could not copy files for EVMS2!'
-			cp /sbin/evms_activate "${TEMP}/initramfs-evms2-temp/sbin/evms_activate" || gen_die 'Could not copy over evms_activate!'
+			cp -a /lib/ld-* "${TEMP}/initramfs-evms2-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			if [ -n "`ls /lib/libgcc_s*`" ]
+			then
+				cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms2-temp/lib" \
+					|| gen_die 'Could not copy files for EVMS2!'
+			fi
+			cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms2-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms2-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/libpthread* "${TEMP}/initramfs-evms2-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms2-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/libevms*so* "${TEMP}/initramfs-evms2-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/evms "${TEMP}/initramfs-evms2-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/evms/* "${TEMP}/initramfs-evms2-temp/lib/evms" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /etc/evms.conf "${TEMP}/initramfs-evms2-temp/etc" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp /sbin/evms_activate "${TEMP}/initramfs-evms2-temp/sbin" \
+				|| gen_die 'Could not copy over evms_activate!'
 
 			# Fix EVMS2 complaining that it can't find the swap utilities.
 			# These are not required in the initramfs
@@ -273,7 +288,8 @@ create_evms2_cpio(){
 			done
 		fi
 		cd "${TEMP}/initramfs-evms2-temp/"
-		find . -print | cpio --quiet -o -H newc | gzip -9 > ${CACHE_CPIO_DIR}/initramfs-evms2.cpio.gz
+		find . -print | cpio --quiet -o -H newc \
+			| gzip -9 > ${CACHE_CPIO_DIR}/initramfs-evms2.cpio.gz
 		rm -r "${TEMP}/initramfs-evms2-temp/"
 	fi	
 }
diff --git a/gen_initrd.sh b/gen_initrd.sh
index ad8e88e..59a944b 100644
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -184,16 +184,32 @@ create_base_initrd_sys() {
 			mkdir -p ${TEMP}/initrd-temp/lib
 			mkdir -p ${TEMP}/initrd-temp/sbin
 			mkdir -p ${TEMP}/initrd-temp/etc
-			cp -a /lib/ld-* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libc-* /lib/libc.* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libpthread* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libuuid*so* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/libevms*so* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/evms "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /lib/evms/* "${TEMP}/initrd-temp/lib/evms" || gen_die 'Could not copy files for EVMS2!'
-			cp -a /etc/evms.conf "${TEMP}/initrd-temp/etc" || gen_die 'Could not copy files for EVMS2!'
-			cp /sbin/evms_activate "${TEMP}/initrd-temp/sbin/evms_activate" || gen_die 'Could not copy over evms_activate!'
+			mkdir -p ${TEMP}/initrd-temp/bin
+			cp -a /lib/ld-* "${TEMP}/initrd-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			if [ -n "`ls /lib/libgcc_s*`" ]
+			then
+				cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms2-temp/lib" \
+					|| gen_die 'Could not copy files for EVMS2!'
+			fi
+			cp -a /lib/libc-* /lib/libc.* "${TEMP}/initrd-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initrd-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/libpthread* "${TEMP}/initrd-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/libuuid*so* "${TEMP}/initrd-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/libevms*so* "${TEMP}/initrd-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/evms "${TEMP}/initrd-temp/lib" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /lib/evms/* "${TEMP}/initrd-temp/lib/evms" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp -a /etc/evms.conf "${TEMP}/initrd-temp/etc" \
+				|| gen_die 'Could not copy files for EVMS2!'
+			cp /sbin/evms_activate "${TEMP}/initrd-temp/sbin" \
+				|| gen_die 'Could not copy over evms_activate!'
 			# Fix EVMS2 complaining that it cant find the swap utilities.
 			# These are not required in the initrd
 			for swap_libs in "${TEMP}/initrd-temp/lib/evms/*/swap*.so"