summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libcap/libcap.inc
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2012-02-06 13:34:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-08 00:50:24 +0000
commit5a33401b84d656dde2c15417d5bcb3d13fc1a050 (patch)
tree0c6b5ef83627cc12aa0a22e36f252d99e598e788 /meta/recipes-support/libcap/libcap.inc
parentf2b55ac3912562ccb1271c528106485394574898 (diff)
downloadpoky-5a33401b84d656dde2c15417d5bcb3d13fc1a050.tar.gz
libcap: Cope with ${libdir} and ${base_libdir} being the same
${libdir} and ${base_libdir} may be the same. If they are don't try and move files onto themselves. (From OE-Core rev: bf136334aecc156c73eed76562819351de368eec) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap/libcap.inc')
-rw-r--r--meta/recipes-support/libcap/libcap.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 9418abf1e2..5b03671de8 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -12,6 +12,8 @@ DEPENDS_virtclass-native = "perl-native-runtime"
12 12
13SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/libcap2/${BPN}-${PV}.tar.bz2" 13SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/libcap2/${BPN}-${PV}.tar.bz2"
14 14
15PR = "r1"
16
15inherit lib_package 17inherit lib_package
16 18
17do_configure() { 19do_configure() {
@@ -47,8 +49,10 @@ do_install() {
47do_install_append() { 49do_install_append() {
48 # Move the library to base_libdir 50 # Move the library to base_libdir
49 install -d ${D}${base_libdir} 51 install -d ${D}${base_libdir}
50 mv ${D}${libdir}/* ${D}${base_libdir} 52 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
51 rmdir ${D}${libdir} 53 mv ${D}${libdir}/* ${D}${base_libdir}
54 rmdir ${D}${libdir}
55 fi
52} 56}
53 57
54FILES_${PN}-dev += "${base_libdir}/*.so" 58FILES_${PN}-dev += "${base_libdir}/*.so"