diff options
author | Amy Fong <amy.fong@windriver.com> | 2012-07-09 14:50:17 -0400 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2012-07-16 08:31:40 -0700 |
commit | 3f85ab6d0d05a4e34fe73fa343d2b3b942fc69b7 (patch) | |
tree | b50a5798b639df6d3ed9a92bed417d2498fa46d8 /meta | |
parent | 3fec966531059b4b21f40be3b22a60edf88c5190 (diff) | |
download | openembedded-core-3f85ab6d0d05a4e34fe73fa343d2b3b942fc69b7.tar.gz openembedded-core-3f85ab6d0d05a4e34fe73fa343d2b3b942fc69b7.tar.bz2 openembedded-core-3f85ab6d0d05a4e34fe73fa343d2b3b942fc69b7.zip |
package install failure on systems without /sbin/ldconfig
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@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | 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 e6856cdf87..ec7de2c36e 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) |