[OE-core] [PATCH 3/6] rootfs.py: Check for LDCONFIGDEPEND being empty string

[Laurentiu Palcu]

Hi Khem,

On Mon, Feb 17, 2014 at 11:34:15AM -0800, Khem Raj wrote:
> 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) != "":
May I suggest:
           if (self.d.getVar('LDCONFIGDEPEND', True) or "") != "":
here? Otherwise, the condition will be true even if LDCONFIGDEPEND is
None.

laurentiu
>              bb.note("Executing: ldconfig -r" + self.image_rootfs + "-c new -v")
>              self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c',
>                                    'new', '-v'])
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core