summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-02-14 23:19:27 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-18 08:38:52 +0000
commitf9b100e79c72ef5d67484aff7fc1182f0c2eeebb (patch)
tree07b48fb6aa905d1c3ce2e537dcadff97d2aaa56e
parent2e7dd298b17446708fa77a80e6ed2460ed98b059 (diff)
downloadpoky-f9b100e79c72ef5d67484aff7fc1182f0c2eeebb.tar.gz
poky-f9b100e79c72ef5d67484aff7fc1182f0c2eeebb.tar.bz2
poky-f9b100e79c72ef5d67484aff7fc1182f0c2eeebb.zip
rootfs.py: Check for LDCONFIGDEPEND being empty string
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']) (From OE-Core rev: 315a71e00928fea6715087b1ce66f8a8a91d5fe0) Signed-off-by: Khem Raj <raj.khem@gmail.com> 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 d149ca3eff..3bcb812e5f 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -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'])