public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Mark Hatle <mark.hatle@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH 09/11] libcgroup: fix failure for absolute path
Date: Thu, 7 Feb 2013 17:59:30 -0600	[thread overview]
Message-ID: <3941d7b99bde353d55fe32ffd37e1684fd63b471.1360270256.git.mark.hatle@windriver.com> (raw)
In-Reply-To: <cover.1360270255.git.mark.hatle@windriver.com>

From: Xin Ouyang <Xin.Ouyang@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.Ouyang@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@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




  parent reply	other threads:[~2013-02-07 23:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-07 23:59 [PATCH 00/11] Various fixes for master Mark Hatle
2013-02-07 23:59 ` [PATCH 01/11] populate_sdk_base.bbclass: add execution permission for self-extracting archive Mark Hatle
2013-02-07 23:59 ` [PATCH 02/11] ghostscript: add pregenerated objarch for mipsel/mips64/mips64el Mark Hatle
2013-02-07 23:59 ` [PATCH 03/11] libart-lgpl: add art_config for mips64/mips64el Mark Hatle
2013-02-07 23:59 ` [PATCH 04/11] openssl: Add mips64 configure support Mark Hatle
2013-02-07 23:59 ` [PATCH 05/11] ghostscript: fix endianness detection Mark Hatle
2013-02-07 23:59 ` [PATCH 06/11] eglibc-nativesdk: Fix buffer overrun with a relocated SDK Mark Hatle
2013-02-07 23:59 ` [PATCH 07/11] coreutils: remove dependency on coreutils-native Mark Hatle
2013-02-07 23:59 ` [PATCH 08/11] rt-tests: fix cyclictest reported 1 sec latencies Mark Hatle
2013-02-07 23:59 ` Mark Hatle [this message]
2013-02-07 23:59 ` [PATCH 10/11] initscripts: Add status function to /etc/init.d/functions Mark Hatle
2013-02-07 23:59 ` [PATCH 11/11] udev: Add start/stop/status/restart support to init script Mark Hatle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3941d7b99bde353d55fe32ffd37e1684fd63b471.1360270256.git.mark.hatle@windriver.com \
    --to=mark.hatle@windriver.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox