[OE-core] [CONSOLIDATED PULL 02/30] package install failure on systems without /sbin/ldconfig
Saul Wold
sgw at linux.intel.com
Mon Jul 16 15:47:08 UTC 2012
From: Amy Fong <amy.fong at windriver.com>
Package install failures due to issues in post install rules.
package_do_shlibs only looks for libraries in a directory "lib", this should be
modified to the variable baselib.
ldconfig_postinst_fragment failure observed on systems without /sbin/ldconfig
[ -x /sbin/ldconfig ] && /sbin/ldconfig
results in the post install rule returning a failure. Modify to
if [ -x /sbin/ldconfig ]; then /sbin/ldconfig; fi
Signed-off-by: Amy Fong <amy.fong at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/package.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e6856cd..ec7de2c 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1141,7 +1141,7 @@ emit_pkgdata[dirs] = "${PKGDESTWORK}/runtime"
ldconfig_postinst_fragment() {
if [ x"$D" = "x" ]; then
- [ -x /sbin/ldconfig ] && /sbin/ldconfig
+ if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi
fi
}
@@ -1251,7 +1251,7 @@ python package_do_shlibs() {
return
lib_re = re.compile("^.*\.so")
- libdir_re = re.compile(".*/lib$")
+ libdir_re = re.compile(".*/%s$" % d.getVar('baselib', True))
packages = d.getVar('PACKAGES', True)
targetos = d.getVar('TARGET_OS', True)
--
1.7.7.6
More information about the Openembedded-core
mailing list