diff options
Diffstat (limited to 'meta-oe/recipes-support/dfu-util')
-rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util-native_0.8.bb (renamed from meta-oe/recipes-support/dfu-util/dfu-util-native_0.7.bb) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch | 6 | ||||
-rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb (renamed from meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb) | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.7.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.8.bb index 8be9d850e..8be9d850e 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.7.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.8.bb | |||
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 index a583c333d..0d48a764d 100644 --- 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 | |||
@@ -5,7 +5,7 @@ Subject: [PATCH 1/2] configure.ac: Don't check for usbpath | |||
5 | 5 | ||
6 | * otherwise it fails to build with -lusb | 6 | * otherwise it fails to build with -lusb |
7 | | main.o: In function `resolve_device_path': | 7 | | main.o: In function `resolve_device_path': |
8 | | dfu-util/0.7-r0/dfu-util-0.7/src/main.c:371: undefined reference to `usb_path2devnum' | 8 | | dfu-util/0.8-r0/dfu-util-0.8/src/main.c:371: undefined reference to `usb_path2devnum' |
9 | | collect2: error: ld returned 1 exit status | 9 | | collect2: error: ld returned 1 exit status |
10 | 10 | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
@@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac | |||
17 | index 700b556..fb58473 100644 | 17 | index 700b556..fb58473 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -22,14 +22,13 @@ AS_IF([test x$native_libusb = xno], [ | 20 | @@ -20,14 +20,13 @@ AS_IF([test x$native_libusb = xno], [ |
21 | PKG_CHECK_MODULES([USB], [libusb-1.0 >= 1.0.0],, | 21 | PKG_CHECK_MODULES([USB], [libusb-1.0 >= 1.0.0],, |
22 | AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) | 22 | AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) |
23 | ]) | 23 | ]) |
@@ -28,7 +28,7 @@ index 700b556..fb58473 100644 | |||
28 | 28 | ||
29 | # Checks for header files. | 29 | # Checks for header files. |
30 | AC_HEADER_STDC | 30 | AC_HEADER_STDC |
31 | -AC_CHECK_HEADERS([usbpath.h windows.h]) | 31 | -AC_CHECK_HEADERS([usbpath.h windows.h sysexits.h]) |
32 | +AC_CHECK_HEADERS([windows.h]) | 32 | +AC_CHECK_HEADERS([windows.h]) |
33 | 33 | ||
34 | # Checks for typedefs, structures, and compiler characteristics. | 34 | # Checks for typedefs, structures, and compiler characteristics. |
diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb index 7f06f8f6a..51d00c6db 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb | |||
@@ -4,16 +4,14 @@ AUTHOR = "Harald Welte <laforge@openmoko.org>" | |||
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
6 | 6 | ||
7 | S = "${WORKDIR}/git" | ||
8 | 7 | ||
9 | SRC_URI = "git://gitorious.org/dfu-util/dfu-util.git \ | 8 | SRC_URI = "http://dfu-util.gnumonks.org/releases/${PN}-${PV}.tar.gz \ |
10 | file://0001-configure.ac-Don-t-check-for-usbpath.patch \ | 9 | file://0001-configure.ac-Don-t-check-for-usbpath.patch \ |
11 | " | 10 | " |
12 | SRCREV="a0a3668e0571a9b007f7d62b01e7dcfd7754ce50" | ||
13 | 11 | ||
14 | inherit autotools pkgconfig | 12 | inherit autotools pkgconfig |
15 | 13 | ||
16 | DEPENDS = "libusb1" | 14 | DEPENDS = "libusb1" |
17 | 15 | ||
18 | SRC_URI[md5sum] = "1de724551604bce1962960b7a301cc08" | 16 | SRC_URI[md5sum] = "fc6daf6b0ee57d7e40ffa3e8111023d1" |
19 | SRC_URI[sha256sum] = "5d253f924fd29bc13054b664bba9aa86b865299971195969478253c1775b7e56" | 17 | SRC_URI[sha256sum] = "55cbde9be12a212bd84bce9d1e63941d9a16139ed0d4912401367eba1502f058" |