diff options
| -rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb (renamed from meta-oe/recipes-support/dfu-util/dfu-util-native_0.8.bb) | 7 | ||||
| -rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch (renamed from meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch) | 6 | ||||
| -rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch | 38 | ||||
| -rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb | 17 | ||||
| -rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb | 14 |
5 files changed, 19 insertions, 63 deletions
diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.8.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb index 8be9d850e0..7a7a662ab3 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.8.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb @@ -1,19 +1,16 @@ require dfu-util_${PV}.bb inherit native deploy -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" DEPENDS = "libusb1-native" -FILESPATH =. "${FILE_DIRNAME}/${BPN}-${PV}:" -SRC_URI += "file://0002-Revert-Makefile.am-Drop-static-dfu-util.patch" +SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch" +do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" do_deploy() { install -d ${DEPLOY_DIR_TOOLS} install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV} rm -f ${DEPLOY_DIR_TOOLS}/dfu-util ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util - } - addtask deploy before do_package after do_install 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/0001-Revert-Makefile.am-Drop-static-dfu-util.patch index 7bd965b0fd..1c6ad0807e 100644 --- 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/0001-Revert-Makefile.am-Drop-static-dfu-util.patch @@ -1,7 +1,7 @@ -From 7d613b28c1b48b5cc3a0882d24e0ac938faff4c2 Mon Sep 17 00:00:00 2001 +From c2aab3b9ae1febcb6b4c6561a59df1930a57b394 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" +Subject: [PATCH] Revert "Makefile.am: Drop static dfu-util" This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071. @@ -12,7 +12,7 @@ Signed-off-by: Martin JaMa Jansa <Martin.Jansa@gmail.com> 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index a1dcc7a..bb71e02 100644 +index f5a43b8..6a3757e 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AS_IF([test x$native_libusb = xno], [ 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 deleted file mode 100644 index bab4a71341..0000000000 --- a/meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e1811274b61db0f5ca55c50ec96d799e2d85fa06 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 8622114..a1dcc7a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,14 +20,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 sysexits.h]) -+AC_CHECK_HEADERS([windows.h sysexits.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST --- -2.7.2 - diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb deleted file mode 100644 index 51f4ae1e10..0000000000 --- a/meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "USB Device Firmware Upgrade utility" -SECTION = "devel" -AUTHOR = "Harald Welte <laforge@openmoko.org>" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - - -SRC_URI = "http://dfu-util.gnumonks.org/releases/${BP}.tar.gz \ - file://0001-configure.ac-Don-t-check-for-usbpath.patch \ -" - -inherit autotools pkgconfig - -DEPENDS = "libusb1" - -SRC_URI[md5sum] = "fc6daf6b0ee57d7e40ffa3e8111023d1" -SRC_URI[sha256sum] = "55cbde9be12a212bd84bce9d1e63941d9a16139ed0d4912401367eba1502f058" diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb new file mode 100644 index 0000000000..01bca22949 --- /dev/null +++ b/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "USB Device Firmware Upgrade utility" +SECTION = "devel" +AUTHOR = "Harald Welte <laforge@openmoko.org>" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "http://dfu-util.gnumonks.org/releases/${BP}.tar.gz" + +inherit autotools pkgconfig + +DEPENDS = "libusb1" + +SRC_URI[md5sum] = "233bb1e08ef4b405062445d84e28fde6" +SRC_URI[sha256sum] = "36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833" |