diff options
Diffstat (limited to 'poky/meta/recipes-support/libusb')
-rw-r--r-- | poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch | 30 | ||||
-rw-r--r-- | poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb | 42 | ||||
-rwxr-xr-x | poky/meta/recipes-support/libusb/libusb1/run-ptest | 29 | ||||
-rw-r--r-- | poky/meta/recipes-support/libusb/libusb1_1.0.22.bb (renamed from poky/meta/recipes-support/libusb/libusb1_1.0.21.bb) | 15 |
4 files changed, 41 insertions, 75 deletions
diff --git a/poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch deleted file mode 100644 index b88440dec..000000000 --- a/poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 2 Apr 2015 19:18:45 -0700 -Subject: [PATCH] usb.h: Include sys/types.h - -We need the definitions for things like u_intX_t - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libusb/usb.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libusb/usb.h b/libusb/usb.h -index 84e730f..caffae2 100644 ---- a/libusb/usb.h -+++ b/libusb/usb.h -@@ -31,6 +31,8 @@ - - #include <dirent.h> - -+#include <sys/types.h> -+ - /* - * USB spec information - * --- -2.1.4 - diff --git a/poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb deleted file mode 100644 index 1ddbe238f..000000000 --- a/poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "libusb-0.1 compatibility layer for libusb1" -DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \ -that aims to look, feel and behave exactly like libusb-0.1" -HOMEPAGE = "http://www.libusb.org/" -BUGTRACKER = "http://www.libusb.org/report" -SECTION = "libs" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" -DEPENDS = "libusb1" - -# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), -# so here libusb-0.1 is removed completely instead of adding virtual/libusb0. -# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power -# consumption. -PROVIDES = "libusb virtual/libusb0" -BBCLASSEXTEND = "native nativesdk" - -PE = "1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ - file://0001-usb.h-Include-sys-types.h.patch \ - " - -SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4" -SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/" -UPSTREAM_CHECK_REGEX = "/libusb-compat-(?P<pver>(\d+[\.\-_]*)+)/$" - -BINCONFIG = "${bindir}/libusb-config" - -inherit autotools pkgconfig binconfig-disabled lib_package - -EXTRA_OECONF = "--libdir=${base_libdir}" - -do_install_append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi -} diff --git a/poky/meta/recipes-support/libusb/libusb1/run-ptest b/poky/meta/recipes-support/libusb/libusb1/run-ptest new file mode 100755 index 000000000..eaa47a2bc --- /dev/null +++ b/poky/meta/recipes-support/libusb/libusb1/run-ptest @@ -0,0 +1,29 @@ +#!/bin/sh + +echo +echo "---------------------------- libusb1 tests ---------------------------" +echo + +./stress | { \ +while read -r str +do + echo "$str" + if [ "${str#*Starting test run:}" != "$str" ] + then + name="${str#Starting test run: }" + name="${name%...}" + else + case "$str" in + "Success (0)") + echo "PASS: $name" + ;; + "Failure (1)" | "Error (2)") + echo "FAIL: $name" + ;; + "Skip (3)") + echo "SKIP: $name" + ;; + esac + fi +done +} diff --git a/poky/meta/recipes-support/libusb/libusb1_1.0.21.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.22.bb index 1fefd1475..0c6e116dd 100644 --- a/poky/meta/recipes-support/libusb/libusb1_1.0.21.bb +++ b/poky/meta/recipes-support/libusb/libusb1_1.0.22.bb @@ -10,14 +10,15 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ file://no-dll.patch \ + file://run-ptest \ " -SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44" -SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b" +SRC_URI[md5sum] = "466267889daead47674df933cea9cacb" +SRC_URI[sha256sum] = "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157" S = "${WORKDIR}/libusb-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest # Don't configure udev by default since it will cause a circular # dependecy with udev package, which depends on libusb @@ -30,6 +31,14 @@ do_install_append() { fi } +do_compile_ptest() { + oe_runmake -C tests stress +} + +do_install_ptest() { + install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} +} + FILES_${PN} += "${base_libdir}/*.so.*" FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" |