diff options
author | Mike Crowe <mac@mcrowe.com> | 2012-02-06 13:34:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-08 00:50:24 +0000 |
commit | 5a33401b84d656dde2c15417d5bcb3d13fc1a050 (patch) | |
tree | 0c6b5ef83627cc12aa0a22e36f252d99e598e788 /meta/recipes-support/libcap | |
parent | f2b55ac3912562ccb1271c528106485394574898 (diff) | |
download | openembedded-core-contrib-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')
-rw-r--r-- | meta/recipes-support/libcap/libcap.inc | 8 |
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" SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/libcap2/${BPN}-${PV}.tar.bz2" +PR = "r1" + inherit lib_package do_configure() { @@ -47,8 +49,10 @@ do_install() { do_install_append() { # Move the library to base_libdir install -d ${D}${base_libdir} - mv ${D}${libdir}/* ${D}${base_libdir} - rmdir ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${libdir}/* ${D}${base_libdir} + rmdir ${D}${libdir} + fi } FILES_${PN}-dev += "${base_libdir}/*.so" |