]> code.ossystems Code Review - openembedded-core.git/commitdiff
attr: narrow fix_symlink to populate_sysroot
authorRoy Li <rongqing.li@windriver.com>
Tue, 11 Aug 2015 01:34:53 +0000 (09:34 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 16 Aug 2015 08:22:29 +0000 (09:22 +0100)
fix_symlink will be called many times, like populate_sysroot and populate_lic;
which maybe lead to rpm-native building failure, due to the below error:
".../usr/lib/libacl.so: No such file or directory"
since after acl/attr finished populate_sysroot task, rpm start to be compiled
but acl/attr populate_lic, which run fix_symlink, maybe remove the
.../usr/lib/libacl.so

In fact, fix_symlink only needs to be called after populate_sysroot

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-support/attr/ea-acl.inc

index 474291a7d9cba537faf620a720053b019c48ae1d..370e16f4a6ff77266743c288a38ec9c8c210ba81 100644 (file)
@@ -27,6 +27,11 @@ LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NL
 EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}"
 
 fix_symlink () {
+       if [ "${BB_CURRENTTASK}" != "populate_sysroot" -a "${BB_CURRENTTASK}" != "populate_sysroot_setscene" ]
+       then
+               return
+       fi
+
        if test "${libdir}" = "${base_libdir}" ; then
                return
        fi