From b1c2b57b3eaf1d96985b60746555fd4d69bbed1c Mon Sep 17 00:00:00 2001 From: Amy Fong Date: Mon, 9 Jul 2012 14:50:17 -0400 Subject: 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 (From OE-Core rev: 3f85ab6d0d05a4e34fe73fa343d2b3b942fc69b7) Signed-off-by: Amy Fong Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') 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) -- cgit v1.2.3-54-g00ecf