]> code.ossystems Code Review - openembedded-core.git/commitdiff
rootfs.py: Check for LDCONFIGDEPEND being empty string
authorKhem Raj <raj.khem@gmail.com>
Sat, 15 Feb 2014 07:19:27 +0000 (23:19 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 18 Feb 2014 08:37:03 +0000 (08:37 +0000)
We override LDCONFIGDEPEND to be empty string for uclibc
however the current check is for it being None as a result
the function is still executed but ldconfig-native is not
built as dependency for rootfs when building with uclibc

Fixes errors like below

File:
'/home/kraj/work/angstrom-repo/sources/openembedded-core/meta/lib/oe/rootfs.py',
lineno: 191, function: _run_ldconfig
     0187:    def _run_ldconfig(self):
     0188:        if self.d.getVar('LDCONFIGDEPEND', True) is not None:
     0189:            bb.note("Executing: ldconfig -r" +
self.image_rootfs + "-c new -v")
     0190:            self._exec_shell_cmd(['ldconfig', '-r',
self.image_rootfs, '-c',
 *** 0191:                                  'new', '-v'])

Signed-off-by: Khem Raj <raj.khem@gmail.com>
meta/lib/oe/rootfs.py

index d149ca3eff634e5a36a1de66ded9a79dee92654c..3bcb812e5fe9b63c062d509361d7b3e53deebb2d 100644 (file)
@@ -185,7 +185,7 @@ class Rootfs(object):
                         self._handle_intercept_failure(registered_pkgs)
 
     def _run_ldconfig(self):
-        if self.d.getVar('LDCONFIGDEPEND', True) is not None:
+        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'])