summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-03-01 02:53:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-02 22:39:44 +0000
commit5f6169348bf7c30de7306688d679f5d71134ca09 (patch)
tree157e68aceee1de449d074335b8147c9682bc6788
parentc89b777c355b55761e294d122235a274bba6c07f (diff)
downloadpoky-5f6169348bf7c30de7306688d679f5d71134ca09.tar.gz
usbutils: Fix for new eudev implementation
usbutils was only compatible with systemds udev, since we now provide a udev alternative compatible with upstream systemds udev, we can now use the newer version of usbutils along with it too. (From OE-Core rev: 93ff871ec1141d2840ffd4a6b8617023fae3d23f) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/usbutils/usbutils-008/iconv.patch41
-rw-r--r--meta/recipes-bsp/usbutils/usbutils/iconv.patch29
-rw-r--r--meta/recipes-bsp/usbutils/usbutils_007.bb31
-rw-r--r--meta/recipes-bsp/usbutils/usbutils_008.bb5
4 files changed, 16 insertions, 90 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch b/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch
deleted file mode 100644
index 6455567174..0000000000
--- a/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1This patch adds support for detecting iconv support using autotools
2uclibc does not have iconv implementation inside libc like glibc, therefore
3the existing checks were not sufficient, it worked for glibc but not for
4uclibc. The new patch portably detects the iconv support and adds the
5libiconv to linker cmdline
6
7This patch should be submitted upstream too
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13Index: usbutils-008/configure.ac
14===================================================================
15--- usbutils-008.orig/configure.ac
16+++ usbutils-008/configure.ac
17@@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS
18 AC_SYS_LARGEFILE
19
20 AC_CHECK_HEADERS([byteswap.h])
21-AC_CHECK_FUNCS([nl_langinfo iconv])
22+
23+AM_GNU_GETTEXT
24+AM_ICONV
25
26 PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0)
27
28Index: usbutils-008/Makefile.am
29===================================================================
30--- usbutils-008.orig/Makefile.am
31+++ usbutils-008/Makefile.am
32@@ -29,7 +29,8 @@ lsusb_CPPFLAGS = \
33
34 lsusb_LDADD = \
35 $(LIBUSB_LIBS) \
36- $(UDEV_LIBS)
37+ $(UDEV_LIBS) \
38+ $(LIBICONV)
39
40 man_MANS = \
41 lsusb.8 \
diff --git a/meta/recipes-bsp/usbutils/usbutils/iconv.patch b/meta/recipes-bsp/usbutils/usbutils/iconv.patch
index c557334a75..6455567174 100644
--- a/meta/recipes-bsp/usbutils/usbutils/iconv.patch
+++ b/meta/recipes-bsp/usbutils/usbutils/iconv.patch
@@ -10,10 +10,10 @@ Upstream-Status: Pending
10 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 12
13Index: usbutils-007/configure.ac 13Index: usbutils-008/configure.ac
14=================================================================== 14===================================================================
15--- usbutils-007.orig/configure.ac 15--- usbutils-008.orig/configure.ac
16+++ usbutils-007/configure.ac 16+++ usbutils-008/configure.ac
17@@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS 17@@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS
18 AC_SYS_LARGEFILE 18 AC_SYS_LARGEFILE
19 19
@@ -23,18 +23,19 @@ Index: usbutils-007/configure.ac
23+AM_GNU_GETTEXT 23+AM_GNU_GETTEXT
24+AM_ICONV 24+AM_ICONV
25 25
26 AC_ARG_ENABLE(zlib, 26 PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0)
27 AS_HELP_STRING(--disable-zlib,disable support for zlib)) 27
28Index: usbutils-007/Makefile.am 28Index: usbutils-008/Makefile.am
29=================================================================== 29===================================================================
30--- usbutils-007.orig/Makefile.am 30--- usbutils-008.orig/Makefile.am
31+++ usbutils-007/Makefile.am 31+++ usbutils-008/Makefile.am
32@@ -27,7 +27,7 @@ lsusb_CPPFLAGS = \ 32@@ -29,7 +29,8 @@ lsusb_CPPFLAGS = \
33 -DDATADIR=\"$(datadir)\"
34 33
35 lsusb_LDADD = \ 34 lsusb_LDADD = \
36- $(LIBUSB_LIBS) 35 $(LIBUSB_LIBS) \
37+ $(LIBUSB_LIBS) $(LIBICONV) 36- $(UDEV_LIBS)
37+ $(UDEV_LIBS) \
38+ $(LIBICONV)
38 39
39 if HAVE_ZLIB 40 man_MANS = \
40 lsusb_CPPFLAGS += -DHAVE_LIBZ 41 lsusb.8 \
diff --git a/meta/recipes-bsp/usbutils/usbutils_007.bb b/meta/recipes-bsp/usbutils/usbutils_007.bb
deleted file mode 100644
index b93b2bd9e5..0000000000
--- a/meta/recipes-bsp/usbutils/usbutils_007.bb
+++ /dev/null
@@ -1,31 +0,0 @@
1SUMMARY = "Host side USB console utilities"
2DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected to the USB bus."
3HOMEPAGE = "http://www.linux-usb.org"
4SECTION = "base"
5
6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8
9DEPENDS = "libusb zlib virtual/libiconv"
10
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
12 file://usb-devices-avoid-dependency-on-bash.patch \
13 file://Fix-NULL-pointer-crash.patch \
14 file://iconv.patch \
15 "
16
17SRC_URI[md5sum] = "be6c42294be5c940f208190d3479d50c"
18SRC_URI[sha256sum] = "e65c234cadf7c81b6b1567c440e3b9b31b44f51c27df3e45741b88848d8b37d3"
19
20inherit autotools gettext pkgconfig
21
22do_install_append() {
23 # We only need the compressed copy, remove the uncompressed version
24 rm -f ${D}${datadir}/usb.ids
25}
26
27PACKAGES += "${PN}-ids"
28FILES_${PN}-dev += "${datadir}/pkgconfig"
29FILES_${PN}-ids = "${datadir}/usb*"
30
31RDEPENDS_${PN} = "${PN}-ids"
diff --git a/meta/recipes-bsp/usbutils/usbutils_008.bb b/meta/recipes-bsp/usbutils/usbutils_008.bb
index 0f2d8d47c4..75312c3aa2 100644
--- a/meta/recipes-bsp/usbutils/usbutils_008.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_008.bb
@@ -6,7 +6,7 @@ SECTION = "base"
6LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8 8
9DEPENDS = "libusb zlib virtual/libiconv systemd" 9DEPENDS = "libusb zlib virtual/libiconv udev"
10 10
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ 11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
12 file://usb-devices-avoid-dependency-on-bash.patch \ 12 file://usb-devices-avoid-dependency-on-bash.patch \
@@ -18,9 +18,6 @@ SRC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb"
18SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95" 18SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95"
19 19
20inherit autotools gettext pkgconfig distro_features_check 20inherit autotools gettext pkgconfig distro_features_check
21# This version of usbutils relies on the udev from systemd, so unless
22# we can decouple udev from system, we require systemd for now.
23REQUIRED_DISTRO_FEATURES = "systemd"
24 21
25FILES_${PN}-dev += "${datadir}/pkgconfig" 22FILES_${PN}-dev += "${datadir}/pkgconfig"
26 23