From patchwork Mon Jul 16 15:47:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 02/30] package install failure on systems without /sbin/ldconfig Date: Mon, 16 Jul 2012 15:47:08 -0000 From: Saul Wold X-Patchwork-Id: 32109 Message-Id: <3f85ab6d0d05a4e34fe73fa343d2b3b942fc69b7.1342453118.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Amy Fong 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 Signed-off-by: Saul Wold --- 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)