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:24:54 +0100
commit97105c4b2945770d8afde690f4ebe4a72990f471 (patch)
treec843a74a8afd3386cefc1af478acfd03b7dc592e /meta/recipes-support/attr
parent07cbc407d84f2f8f5fee430902039aa7cef65db4 (diff)
downloadpoky-97105c4b2945770d8afde690f4ebe4a72990f471.tar.gz
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 (From OE-Core rev: 6882b65489c74907709021532578270e8f7f03f0) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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
27EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}" 27EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}"
28 28
29fix_symlink () { 29fix_symlink () {
30 if [ "${BB_CURRENTTASK}" != "populate_sysroot" -a "${BB_CURRENTTASK}" != "populate_sysroot_setscene" ]
31 then
32 return
33 fi
34
30 if test "${libdir}" = "${base_libdir}" ; then 35 if test "${libdir}" = "${base_libdir}" ; then
31 return 36 return
32 fi 37 fi