diff options
author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2013-01-26 13:28:30 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-08 14:50:38 +0000 |
commit | 9a7b076176e6404bc68fb741086574a5b8662e65 (patch) | |
tree | 825b921eddd20a0fe8055ea8dcda0f5555e83cf4 | |
parent | 20d88ff7e241db443091223515cb2195e9ad7abd (diff) | |
download | ast2050-yocto-poky-9a7b076176e6404bc68fb741086574a5b8662e65.zip ast2050-yocto-poky-9a7b076176e6404bc68fb741086574a5b8662e65.tar.gz |
libcgroup: fix failure for absolute path
[ 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.
(From OE-Core rev: 0b58d98567a1c0531ad8396c4464402da21a9665)
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/libcgroup/libcgroup_0.38.bb | 5 |
1 files 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 |