diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-03 16:48:10 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-05 12:02:42 +0200 |
commit | d87b8e43d6316d77479ce838111cd9f77f4bf419 (patch) | |
tree | 8448055d01cac2d2e537a6177add90a27aeb2d38 /meta-oe/recipes-support/dfu-util/dfu-util | |
parent | 33cf1670425ea9d7667f1cc358a86568846b3648 (diff) | |
download | meta-openembedded-contrib-d87b8e43d6316d77479ce838111cd9f77f4bf419.tar.gz |
dfu-util-native: upgrade to 0.7 and drop 0.4
* fold .inc file into .bb
* add usbpath patch from 0.4 to 0.7, otherwise dfu-util fails to build
when built after usbpath recipe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/dfu-util/dfu-util')
3 files changed, 105 insertions, 12 deletions
diff --git a/meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch b/meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch new file mode 100644 index 0000000000..a583c333d7 --- /dev/null +++ b/meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch @@ -0,0 +1,38 @@ +From 63f6f6882f3813ab22c62806feeab942579a2acf Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 3 Aug 2014 17:50:06 +0200 +Subject: [PATCH 1/2] configure.ac: Don't check for usbpath + +* otherwise it fails to build with -lusb + | main.o: In function `resolve_device_path': + | dfu-util/0.7-r0/dfu-util-0.7/src/main.c:371: undefined reference to `usb_path2devnum' + | collect2: error: ld returned 1 exit status + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 700b556..fb58473 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,14 +22,13 @@ AS_IF([test x$native_libusb = xno], [ + PKG_CHECK_MODULES([USB], [libusb-1.0 >= 1.0.0],, + AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) + ]) +-AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb) + + LIBS="$LIBS $USB_LIBS" + CFLAGS="$CFLAGS $USB_CFLAGS" + + # Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS([usbpath.h windows.h]) ++AC_CHECK_HEADERS([windows.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +-- +2.0.2 + diff --git a/meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch b/meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch new file mode 100644 index 0000000000..de17808e12 --- /dev/null +++ b/meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch @@ -0,0 +1,67 @@ +From 440a026379ff111aaa8314db1c29ffae8f482824 Mon Sep 17 00:00:00 2001 +From: Martin JaMa Jansa <Martin.Jansa@gmail.com> +Date: Thu, 11 Aug 2011 11:19:52 +0200 +Subject: [PATCH 2/2] Revert "Makefile.am: Drop static dfu-util" + +This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071. + +Signed-off-by: Martin JaMa Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 2 +- + src/Makefile.am | 20 +++++++++++++++++++- + 2 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fb58473..09b9e5a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,7 +23,7 @@ AS_IF([test x$native_libusb = xno], [ + AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) + ]) + +-LIBS="$LIBS $USB_LIBS" ++LIBS="$LIBS $USB_LIBS -lpthread" + CFLAGS="$CFLAGS $USB_CFLAGS" + + # Checks for header files. +diff --git a/src/Makefile.am b/src/Makefile.am +index 99df307..28d53f7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,6 +1,6 @@ + AM_CFLAGS = -Wall + +-bin_PROGRAMS = dfu-util dfu-suffix ++bin_PROGRAMS = dfu-util dfu-util_static dfu-suffix + dfu_util_SOURCES = main.c \ + portable.h \ + dfu_load.c \ +@@ -17,6 +17,24 @@ dfu_util_SOURCES = main.c \ + quirks.c \ + quirks.h + ++dfu_util_static_SOURCES = main.c \ ++ portable.h \ ++ dfu_load.c \ ++ dfu_load.h \ ++ dfuse.c \ ++ dfuse.h \ ++ dfuse_mem.c \ ++ dfuse_mem.h \ ++ dfu.c \ ++ dfu.h \ ++ usb_dfu.h \ ++ dfu_file.c \ ++ dfu_file.h \ ++ quirks.c \ ++ quirks.h ++ ++dfu_util_static_LDFLAGS = -static ++ + dfu_suffix_SOURCES = suffix.c \ + dfu_file.h \ + dfu_file.c \ +-- +2.0.2 + diff --git a/meta-oe/recipes-support/dfu-util/dfu-util/configure.patch b/meta-oe/recipes-support/dfu-util/dfu-util/configure.patch deleted file mode 100644 index c83d510c17..0000000000 --- a/meta-oe/recipes-support/dfu-util/dfu-util/configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr dfu-util-0.4.orig/configure.ac dfu-util-0.4/configure.ac ---- dfu-util-0.4.orig/configure.ac 2014-07-18 08:18:45.407552416 +0200 -+++ dfu-util-0.4/configure.ac 2014-07-18 20:05:11.934894143 +0200 -@@ -4,7 +4,7 @@ - AC_PREREQ(2.59) - AC_INIT([dfu-util],[0.4]) - AC_CONFIG_AUX_DIR(m4) --AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -+AM_INIT_AUTOMAKE([foreign]) - AM_CONFIG_HEADER([config.h]) - - # Test for new silent rules and enable only if they are available |