From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 18 Feb 2014 08:44:49 +0000 (+0000)
Subject: lib/oe/rootfs: Fix LDCONFIGDEPEND check
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61890967ed21bf047dd0e80a00012d6478372fa7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 2b2915e4707..be0afa6d747 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'])