libusb/libusb0: Drop unneeded custom staging functions

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb b/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
index 34cc1ac50df014fc9b364b657eec6fb0afbfa209..cf6d01279b3f453290402a6c929e816899b4a9f9 100644 (file)
--- a/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
+++ b/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
@@ -15,25 +15,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \
 
 S = "${WORKDIR}/libusb-compat-0.1.0-beta2"
 
-inherit autotools pkgconfig binconfig lib_package
+inherit autotools_stage pkgconfig binconfig lib_package
 
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-build-docs"
 
 export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}"
 
-do_stage() {
-    autotools_stage_all
-    install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
-    # can we get rid of that? wouldn't a sed statement do as well?
-    sed -i 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
-
-    if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
-            install -d ${STAGING_BINDIR_CROSS}/
-        mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
-    fi
-}
-
 PACKAGES =+ "libusbpp"
 
 FILES_libusbpp = "${libdir}/libusbpp*.so.*"

diff --git a/meta/packages/libusb/libusb_0.1.12.bb b/meta/packages/libusb/libusb_0.1.12.bb
index 316e67d873c7b022841583d18d3abe1d5d2f9c50..8d34a625b848fbc33c40625a178129d84b6432ec 100644 (file)
--- a/meta/packages/libusb/libusb_0.1.12.bb
+++ b/meta/packages/libusb/libusb_0.1.12.bb
@@ -8,27 +8,13 @@ PR = "r5"
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
            file://configure_fix.patch;patch=1"
 
-inherit autotools pkgconfig binconfig lib_package
+inherit autotools_stage pkgconfig binconfig lib_package
 
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-build-docs"
 
 export CXXFLAGS += "-lstdc++"
 
-do_stage() {
-
-       autotools_stage_all
-       install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
-       # can we get rid of that? wouldn't a sed statement do as well?
-       sed -i 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
-
-       if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
-               install -d ${STAGING_BINDIR_CROSS}/
-               mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
-       fi
-
-}
-
 PACKAGES =+ "libusbpp"
 
 FILES_libusbpp = "${libdir}/libusbpp*.so.*"