diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-11-13 14:38:06 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:08:21 +0000 |
| commit | 399c0fa9a831f8dbcd7ab94ac5713101d417a1ec (patch) | |
| tree | bc040a8e5a134ea97a9b7421755181f178016086 /meta/recipes-bsp | |
| parent | 1f63bd2d9f31e74da5f558ca7097a306b8b3b755 (diff) | |
| download | openembedded-core-contrib-399c0fa9a831f8dbcd7ab94ac5713101d417a1ec.tar.gz | |
usbutils: Add version 008
The latest version of usbutil (v008) uses the latest version of udev (v196 or greater)
which is only available as part of the systemd package. So add systemd as a DEPENDS and
REQUIRED_DISTRO_FEATURE.
Add v008 version of iconv.patch
COPYING file is GPLv2, but has newer formatting and address change.
(From OE-Core rev: 3d88f74833fafd5c928c64d9ecc0aa257b7bb0f6)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
| -rw-r--r-- | meta/recipes-bsp/usbutils/usbutils-008/iconv.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-bsp/usbutils/usbutils_008.bb | 28 |
2 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch b/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch new file mode 100644 index 0000000000..6455567174 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch @@ -0,0 +1,41 @@ +This patch adds support for detecting iconv support using autotools +uclibc does not have iconv implementation inside libc like glibc, therefore +the existing checks were not sufficient, it worked for glibc but not for +uclibc. The new patch portably detects the iconv support and adds the +libiconv to linker cmdline + +This patch should be submitted upstream too + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: usbutils-008/configure.ac +=================================================================== +--- usbutils-008.orig/configure.ac ++++ usbutils-008/configure.ac +@@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS + AC_SYS_LARGEFILE + + AC_CHECK_HEADERS([byteswap.h]) +-AC_CHECK_FUNCS([nl_langinfo iconv]) ++ ++AM_GNU_GETTEXT ++AM_ICONV + + PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0) + +Index: usbutils-008/Makefile.am +=================================================================== +--- usbutils-008.orig/Makefile.am ++++ usbutils-008/Makefile.am +@@ -29,7 +29,8 @@ lsusb_CPPFLAGS = \ + + lsusb_LDADD = \ + $(LIBUSB_LIBS) \ +- $(UDEV_LIBS) ++ $(UDEV_LIBS) \ ++ $(LIBICONV) + + man_MANS = \ + lsusb.8 \ diff --git a/meta/recipes-bsp/usbutils/usbutils_008.bb b/meta/recipes-bsp/usbutils/usbutils_008.bb new file mode 100644 index 0000000000..b032d4e6b3 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils_008.bb @@ -0,0 +1,28 @@ +SUMMARY = "Host side USB console utilities" +DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected to the USB bus." +HOMEPAGE = "http://www.linux-usb.org" +SECTION = "base" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libusb zlib virtual/libiconv systemd" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ + file://usb-devices-avoid-dependency-on-bash.patch \ + file://Fix-NULL-pointer-crash.patch \ + file://iconv.patch \ + " + +RC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb" +SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95" + +inherit autotools gettext pkgconfig distro_features_check +# This version of usbutils relies on the udev from systemd, so unless +# we can decouple udev from system, we require systemd for now. +REQUIRED_DISTRO_FEATURES = "systemd" + +FILES_${PN}-dev += "${datadir}/pkgconfig" + +RDEPENDS_${PN} = "libudev" +RDEPENDS_${PN}-ptest = "libboost-system libboost-thread" |