From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../0001-usb.h-Include-sys-types.h.patch | 30 ++++++++++++++++ .../recipes-support/libusb/libusb-compat_0.1.5.bb | 42 ++++++++++++++++++++++ .../recipes-support/libusb/libusb1/no-dll.patch | 19 ++++++++++ poky/meta/recipes-support/libusb/libusb1_1.0.21.bb | 35 ++++++++++++++++++ 4 files changed, 126 insertions(+) create mode 100644 poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch create mode 100644 poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb create mode 100644 poky/meta/recipes-support/libusb/libusb1/no-dll.patch create mode 100644 poky/meta/recipes-support/libusb/libusb1_1.0.21.bb (limited to 'poky/meta/recipes-support/libusb') 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 new file mode 100644 index 000000000..b88440dec --- /dev/null +++ b/poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch @@ -0,0 +1,30 @@ +From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 + ++#include ++ + /* + * 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 new file mode 100644 index 000000000..1ddbe238f --- /dev/null +++ b/poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb @@ -0,0 +1,42 @@ +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(\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/no-dll.patch b/poky/meta/recipes-support/libusb/libusb1/no-dll.patch new file mode 100644 index 000000000..6e6bb83d1 --- /dev/null +++ b/poky/meta/recipes-support/libusb/libusb1/no-dll.patch @@ -0,0 +1,19 @@ +As all invokes all-recursive which uses sub-makes to invoke all-am, the +resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds +the second attempt is skipped as the target already exists, but in highly +parallel builds it's likely that two makes will be building libusb-1.0.la at the +same time. + +Solve this by removing the explicit all target, which as libusb-1.0.dll isn't +built under Linux is redundant anyway. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/libusb/Makefile.am b/libusb/Makefile.am +index 0cab0a0..c880213 100644 +--- a/libusb/Makefile.am ++++ b/libusb/Makefile.am +@@ -1,2 +0,0 @@ +-all: libusb-1.0.la libusb-1.0.dll +- diff --git a/poky/meta/recipes-support/libusb/libusb1_1.0.21.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.21.bb new file mode 100644 index 000000000..1fefd1475 --- /dev/null +++ b/poky/meta/recipes-support/libusb/libusb1_1.0.21.bb @@ -0,0 +1,35 @@ +SUMMARY = "Userspace library to access USB (version 1.0)" +HOMEPAGE = "http://libusb.sf.net" +BUGTRACKER = "http://www.libusb.org/report" +SECTION = "libs" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ + file://no-dll.patch \ + " + +SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44" +SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b" + +S = "${WORKDIR}/libusb-${PV}" + +inherit autotools pkgconfig + +# Don't configure udev by default since it will cause a circular +# dependecy with udev package, which depends on libusb +EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev" + +do_install_append() { + install -d ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi +} + +FILES_${PN} += "${base_libdir}/*.so.*" + +FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" -- cgit v1.2.3