From: Xin Ouyang <xin.ouy...@windriver.com>

[ CQID: WIND00401091 ]

While using sstate or some other conditions, there may be no image
directory in the builddir, so the absolute path of libcgroup.so.1
will cause build failures.

Signed-off-by: Xin Ouyang <xin.ouy...@windriver.com>
Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
Signed-off-by: Mark Hatle <mark.ha...@windriver.com>
---
 meta/recipes-core/libcgroup/libcgroup_0.38.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/libcgroup/libcgroup_0.38.bb 
b/meta/recipes-core/libcgroup/libcgroup_0.38.bb
index fca604b..32b87e6 100644
--- a/meta/recipes-core/libcgroup/libcgroup_0.38.bb
+++ b/meta/recipes-core/libcgroup/libcgroup_0.38.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-PR = "r0"
+PR = "r1"
 
 inherit autotools pkgconfig
 
@@ -29,7 +29,8 @@ do_install_append() {
        if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
                mkdir -p ${D}/${base_libdir}/
                mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/
-               ln -sf ${D}${base_libdir}/libcgroup.so.1 
${D}${libdir}/libcgroup.so
+               rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
+               ln -sf ${rel_lib_prefix}${base_libdir}/libcgroup.so.1 
${D}${libdir}/libcgroup.so
        fi
        # pam modules in ${base_libdir}/security/ should be binary .so files, 
not symlinks.
        if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then
-- 
1.8.1.2.545.g2f19ada


_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to