summaryrefslogtreecommitdiff
path: root/meta
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-24 16:18:57 +0000
commit255079780729f0dd9df6f35302169e0c8480eced (patch)
tree92fe144a9dbefe6e94ddb8aea75e30350abf38ac /meta
parent5eb0f6e03e5a543f7bad6fcf0cab4173cc8882d8 (diff)
downloadopenembedded-core-255079780729f0dd9df6f35302169e0c8480eced.tar.gz
openembedded-core-255079780729f0dd9df6f35302169e0c8480eced.tar.bz2
openembedded-core-255079780729f0dd9df6f35302169e0c8480eced.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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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'])