[oe-commits] Roy Li : attr: narrow fix_symlink to populate_sysroot

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 6882b65489c74907709021532578270e8f7f03f0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6882b65489c74907709021532578270e8f7f03f0

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Aug 11 09:34:53 2015 +0800

attr: narrow fix_symlink to populate_sysroot

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 at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-support/attr/ea-acl.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 474291a..370e16f 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -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