| Submitter | Mike Crowe |
|---|---|
| Date | Feb. 6, 2012, 1:33 p.m. |
| Message ID | <1328535211-24985-1-git-send-email-mac@mcrowe.com> |
| Download | mbox | patch |
| Permalink | /patch/20779/ |
| State | Accepted |
| Commit | 2ada7f7a0fa8a76a9ef7b45b0e0ced78757d9021 |
| Headers | show |
Comments
On 02/06/2012 05:33 AM, Mike Crowe wrote: > ${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> > --- > meta/recipes-support/libusb/libusb1_1.0.8.bb | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-support/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb > index 8873de7..e45a9d9 100644 > --- a/meta/recipes-support/libusb/libusb1_1.0.8.bb > +++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb > @@ -6,7 +6,7 @@ SECTION = "libs" > LICENSE = "LGPLv2.1+" > LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" > > -PR = "r2" > +PR = "r3" > > SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" > > @@ -20,7 +20,9 @@ EXTRA_OECONF = "--libdir=${base_libdir}" > > do_install_append() { > install -d ${D}${libdir} > - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} > + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then > + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} > + fi > } > > FILES_${PN} += "${base_libdir}/*.so.*" Merged all 3 of this series into OE-core Thanks Sau!
Patch
diff --git a/meta/recipes-support/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb index 8873de7..e45a9d9 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.8.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb @@ -6,7 +6,7 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" @@ -20,7 +20,9 @@ EXTRA_OECONF = "--libdir=${base_libdir}" do_install_append() { install -d ${D}${libdir} - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi } FILES_${PN} += "${base_libdir}/*.so.*"
${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> --- meta/recipes-support/libusb/libusb1_1.0.8.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)