[oe-commits] Khem Raj : native.bbclass, package.bbclass, bitbake.conf: Make provisions for system libdir to be something else than '/lib'
git version control
git at git.openembedded.org
Mon Sep 27 22:06:17 UTC 2010
Module: openembedded.git
Branch: master
Commit: 317011719c31ffe34c3810c2d72c59adf9dafc28
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=317011719c31ffe34c3810c2d72c59adf9dafc28
Author: Khem Raj <raj.khem at gmail.com>
Date: Sat Sep 25 15:46:39 2010 -0700
native.bbclass,package.bbclass,bitbake.conf: Make provisions for system libdir to be something else than '/lib'
* Add base_libdir_native as target libdir could be different e.g. lib32
lib64
* Dont assume lib to be system libdir during packaging.
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Chris Larson <chris_larson at mentor.com>
---
classes/native.bbclass | 3 ++-
classes/package.bbclass | 3 ++-
conf/bitbake.conf | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 345bd80..dcedff2 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -62,7 +62,8 @@ export STRIP = "${HOST_PREFIX}strip"
base_prefix = "${STAGING_DIR_NATIVE}"
prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-
+libdir = ${base_prefix}${libdir_native}
+base_libdir = ${base_prefix}${base_libdir_native}
# Since we actually install these into situ there is no staging prefix
STAGING_DIR_HOST = ""
STAGING_DIR_TARGET = ""
diff --git a/classes/package.bbclass b/classes/package.bbclass
index c378133..35d9864 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -614,7 +614,8 @@ python package_do_shlibs() {
return
lib_re = re.compile("^lib.*\.so")
- libdir_re = re.compile(".*/lib$")
+ libdir = bb.data.getVar('base_libdir', d, True)
+ libdir_re = re.compile(".*%s$" % (libdir))
packages = bb.data.getVar('PACKAGES', d, True)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b099499..4e80d97 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -72,6 +72,7 @@ export oldincludedir = "${exec_prefix}/include"
base_bindir_native = "/bin"
base_sbindir_native = "/sbin"
sysconfdir_native = "/etc"
+base_libdir_native = "/lib"
prefix_native = "/usr"
bindir_native = "${prefix_native}/bin"
sbindir_native = "${prefix_native}/sbin"
More information about the Openembedded-commits
mailing list