[OE-core] [CONSOLIDATED PULL 11/14] image-mklibs.bbclass: Utilize ${base_libdir} instead of static /lib

Saul Wold sgw at linux.intel.com
Fri Aug 5 15:28:01 UTC 2011


From: Kumar Gala <galak at kernel.crashing.org>

We might redefine ${base_libdir} from being set to just /lib.

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---
 meta/classes/image-mklibs.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass
index d6630c4..69dac2f 100644
--- a/meta/classes/image-mklibs.bbclass
+++ b/meta/classes/image-mklibs.bbclass
@@ -17,19 +17,19 @@ mklibs_optimize_image_doit() {
 
 	case ${TARGET_ARCH} in
 		powerpc | mips | microblaze )
-			dynamic_loader="/lib/ld.so.1"
+			dynamic_loader="${base_libdir}/ld.so.1"
 			;;
 		powerpc64)
 			dynamic_loader="${base_libdir}/ld64.so.1"
 			;;
 		x86_64)
-			dynamic_loader="/lib/ld-linux-x86-64.so.2"
+			dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2"
 			;;
 		i586 )
-			dynamic_loader="/lib/ld-linux.so.2"
+			dynamic_loader="${base_libdir}/ld-linux.so.2"
 			;;
 		arm )
-			dynamic_loader="/lib/ld-linux.so.3"
+			dynamic_loader="${base_libdir}/ld-linux.so.3"
 			;;
 		* )
 			dynamic_loader="/unknown_dynamic_linker"
-- 
1.7.3.4





More information about the Openembedded-core mailing list