summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/attr
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-08-11 09:34:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-16 09:22:29 +0100
commit6882b65489c74907709021532578270e8f7f03f0 (patch)
tree58d04812f78bdbd3a0a0869a43c20e8cee11923b /meta/recipes-support/attr
parent4e0fb630d3bb0250ece6e2071ae49b2601ae3e57 (diff)
downloadopenembedded-core-6882b65489c74907709021532578270e8f7f03f0.tar.gz
openembedded-core-6882b65489c74907709021532578270e8f7f03f0.tar.bz2
openembedded-core-6882b65489c74907709021532578270e8f7f03f0.zip
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@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/attr')
-rw-r--r--meta/recipes-support/attr/ea-acl.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 474291a7d9..370e16f4a6 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