summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2012-07-09 14:50:17 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:53 +0100
commitb1c2b57b3eaf1d96985b60746555fd4d69bbed1c (patch)
tree80bde6f00ff6b79f9d0dada92ebf6c8214c55d08 /meta
parent1f7f9258c4c37e4c54854dcc6b4ba7a4a2828efd (diff)
downloadpoky-b1c2b57b3eaf1d96985b60746555fd4d69bbed1c.tar.gz
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 <amy.fong@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass4
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"
1141 1141
1142ldconfig_postinst_fragment() { 1142ldconfig_postinst_fragment() {
1143if [ x"$D" = "x" ]; then 1143if [ x"$D" = "x" ]; then
1144 [ -x /sbin/ldconfig ] && /sbin/ldconfig 1144 if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi
1145fi 1145fi
1146} 1146}
1147 1147
@@ -1251,7 +1251,7 @@ python package_do_shlibs() {
1251 return 1251 return
1252 1252
1253 lib_re = re.compile("^.*\.so") 1253 lib_re = re.compile("^.*\.so")
1254 libdir_re = re.compile(".*/lib$") 1254 libdir_re = re.compile(".*/%s$" % d.getVar('baselib', True))
1255 1255
1256 packages = d.getVar('PACKAGES', True) 1256 packages = d.getVar('PACKAGES', True)
1257 targetos = d.getVar('TARGET_OS', True) 1257 targetos = d.getVar('TARGET_OS', True)