summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-18 08:44:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-25 08:01:09 +0000
commit61890967ed21bf047dd0e80a00012d6478372fa7 (patch)
treeaf2eefd71c95e5458b7d74d9099d7001606e4567
parenta1faa7df2a0972fa631d3aee98c59f6b0e8eb43c (diff)
downloadpoky-61890967ed21bf047dd0e80a00012d6478372fa7.tar.gz
poky-61890967ed21bf047dd0e80a00012d6478372fa7.tar.bz2
poky-61890967ed21bf047dd0e80a00012d6478372fa7.zip
lib/oe/rootfs: Fix LDCONFIGDEPEND check
We shouldn't be running this if it expands to None or "" or False so update the code accordingly. (From OE-Core rev: 255079780729f0dd9df6f35302169e0c8480eced) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 2b2915e470..be0afa6d74 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -187,7 +187,7 @@ class Rootfs(object):
self._handle_intercept_failure(registered_pkgs)
def _run_ldconfig(self):
- if self.d.getVar('LDCONFIGDEPEND', True) != "":
+ if self.d.getVar('LDCONFIGDEPEND', True):
bb.note("Executing: ldconfig -r" + self.image_rootfs + "-c new -v")
self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c',
'new', '-v'])