[oe-commits] Khem Raj : rootfs.py: Check for LDCONFIGDEPEND being empty string
git at git.openembedded.org
git at git.openembedded.org
Tue Feb 18 08:39:40 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 315a71e00928fea6715087b1ce66f8a8a91d5fe0
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=315a71e00928fea6715087b1ce66f8a8a91d5fe0
Author: Khem Raj <raj.khem at gmail.com>
Date: Fri Feb 14 23:19:27 2014 -0800
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'])
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
meta/lib/oe/rootfs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index d149ca3..3bcb812 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'])
More information about the Openembedded-commits
mailing list