From: Roy Li Date: Tue, 11 Aug 2015 01:34:53 +0000 (+0800) Subject: attr: narrow fix_symlink to populate_sysroot X-Git-Tag: 2015-10~869 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6882b65489c74907709021532578270e8f7f03f0;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- 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