diff options
| author | Mike Crowe <mac@mcrowe.com> | 2012-02-06 13:34:22 +0000 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-02-07 14:37:13 -0800 |
| commit | bf136334aecc156c73eed76562819351de368eec (patch) | |
| tree | f098bcef035914cd80f64ea75a693ce5b78db585 | |
| parent | eadcd9708a2b363295b3b8a9159972ca4100fc51 (diff) | |
| download | openembedded-core-bf136334aecc156c73eed76562819351de368eec.tar.gz openembedded-core-bf136334aecc156c73eed76562819351de368eec.tar.bz2 openembedded-core-bf136334aecc156c73eed76562819351de368eec.tar.xz openembedded-core-bf136334aecc156c73eed76562819351de368eec.zip | |
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.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
| -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 9418abf1e..5b03671de 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" |