From 9e1869d867c32e440ece38af4a329bc839d5e2e3 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Mon, 6 Feb 2012 13:34:22 +0000 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- meta/recipes-support/libcap/libcap.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 9418abf..5b03671 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" -- 2.7.4