From c527fd1f14c27855a37f2e8ac5346ce8d940ced2 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 16 Oct 2014 03:05:19 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- .../usbutils/usbutils/Fix-NULL-pointer-crash.patch | 28 +++++++++++++++ meta/recipes-bsp/usbutils/usbutils/iconv.patch | 40 ++++++++++++++++++++++ .../usb-devices-avoid-dependency-on-bash.patch | 30 ++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch create mode 100644 meta/recipes-bsp/usbutils/usbutils/iconv.patch create mode 100644 meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch (limited to 'meta/recipes-bsp/usbutils/usbutils') diff --git a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch new file mode 100644 index 0000000000..0efdc59fc6 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch @@ -0,0 +1,28 @@ +Fix NULL pointer crash. + +Before use usbbuslist, we should check if it is valid. + +Upstream-Status: Pending +Signed-off-by: Roy.Li +--- + lsusb-t.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/lsusb-t.c b/lsusb-t.c +index f604155..583a46a 100644 +--- a/lsusb-t.c ++++ b/lsusb-t.c +@@ -643,6 +643,10 @@ static void sort_busses(void) + /* need to reverse sort bus numbers */ + struct usbbusnode *t, *p, **pp; + int swapped; ++ ++ if (!usbbuslist) ++ return; ++ + do { + p = usbbuslist; + pp = &usbbuslist; +-- +1.7.4.1 + diff --git a/meta/recipes-bsp/usbutils/usbutils/iconv.patch b/meta/recipes-bsp/usbutils/usbutils/iconv.patch new file mode 100644 index 0000000000..c557334a75 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils/iconv.patch @@ -0,0 +1,40 @@ +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 + +Index: usbutils-007/configure.ac +=================================================================== +--- usbutils-007.orig/configure.ac ++++ usbutils-007/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 + + AC_ARG_ENABLE(zlib, + AS_HELP_STRING(--disable-zlib,disable support for zlib)) +Index: usbutils-007/Makefile.am +=================================================================== +--- usbutils-007.orig/Makefile.am ++++ usbutils-007/Makefile.am +@@ -27,7 +27,7 @@ lsusb_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" + + lsusb_LDADD = \ +- $(LIBUSB_LIBS) ++ $(LIBUSB_LIBS) $(LIBICONV) + + if HAVE_ZLIB + lsusb_CPPFLAGS += -DHAVE_LIBZ diff --git a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch b/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch new file mode 100644 index 0000000000..a6b241f854 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch @@ -0,0 +1,30 @@ +From 333d5fbbc03481f1aa222bd68c2609db168ae3e0 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Thu, 26 Jul 2012 10:37:32 +0100 +Subject: [PATCH] usb-devices: avoid dependency on bash + +By virtue of having #!/bin/bash this script declared that it requires +bash, however manual examination, checkbashisms and tests with dash +and busybox show that it doesn't contain any bashisms, so change the +header to avoid the dependency. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton +--- + usb-devices | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usb-devices b/usb-devices +index b2052e2..14a5358 100755 +--- a/usb-devices ++++ b/usb-devices +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # Copyright: 2009 Greg Kroah-Hartman + # 2009 Randy Dunlap +-- +1.7.9.5 + -- cgit v1.2.3-54-g00ecf