diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-18 08:44:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-25 08:01:09 +0000 |
commit | 61890967ed21bf047dd0e80a00012d6478372fa7 (patch) | |
tree | af2eefd71c95e5458b7d74d9099d7001606e4567 /meta/lib | |
parent | a1faa7df2a0972fa631d3aee98c59f6b0e8eb43c (diff) | |
download | poky-61890967ed21bf047dd0e80a00012d6478372fa7.tar.gz |
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>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
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): | |||
187 | self._handle_intercept_failure(registered_pkgs) | 187 | self._handle_intercept_failure(registered_pkgs) |
188 | 188 | ||
189 | def _run_ldconfig(self): | 189 | def _run_ldconfig(self): |
190 | if self.d.getVar('LDCONFIGDEPEND', True) != "": | 190 | if self.d.getVar('LDCONFIGDEPEND', True): |
191 | bb.note("Executing: ldconfig -r" + self.image_rootfs + "-c new -v") | 191 | bb.note("Executing: ldconfig -r" + self.image_rootfs + "-c new -v") |
192 | self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c', | 192 | self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c', |
193 | 'new', '-v']) | 193 | 'new', '-v']) |