diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2014-02-14 23:19:27 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-18 08:37:03 +0000 |
| commit | 315a71e00928fea6715087b1ce66f8a8a91d5fe0 (patch) | |
| tree | b0acfcde50dbdee7a57cc05ef8ff77aa1988d6a9 /meta/lib | |
| parent | 875df27e56b82fcf970410b6d78e3672471c336a (diff) | |
| download | openembedded-core-contrib-315a71e00928fea6715087b1ce66f8a8a91d5fe0.tar.gz | |
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@gmail.com>
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 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']) |