summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/dfu-util
diff options
context:
space:
mode:
authorLi xin <lixin.fnst@cn.fujitsu.com>2016-01-03 18:07:17 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2016-01-06 13:25:50 +0100
commitc2652c90f726fa1728307afad73c3051ca7660f5 (patch)
tree7834b16362a8e41ef93c73116707574e360c6d8b /meta-oe/recipes-support/dfu-util
parent6bfa97b034228b42175f4d0d83f3f2565157d30f (diff)
downloadmeta-openembedded-c2652c90f726fa1728307afad73c3051ca7660f5.tar.gz
dfu-util: 0.7 -> 0.8
Upgrade dfu-util from 0.7 to 0.8. Modify SRC_URI,since the original one can‘t be opened. Modify 0001-configure.ac-Don-t-check-for-usbpath.patch,since the datas has been changed. Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch6
-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
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac
17index 700b556..fb58473 100644 17index 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>"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6 6
7S = "${WORKDIR}/git"
8 7
9SRC_URI = "git://gitorious.org/dfu-util/dfu-util.git \ 8SRC_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"
12SRCREV="a0a3668e0571a9b007f7d62b01e7dcfd7754ce50"
13 11
14inherit autotools pkgconfig 12inherit autotools pkgconfig
15 13
16DEPENDS = "libusb1" 14DEPENDS = "libusb1"
17 15
18SRC_URI[md5sum] = "1de724551604bce1962960b7a301cc08" 16SRC_URI[md5sum] = "fc6daf6b0ee57d7e40ffa3e8111023d1"
19SRC_URI[sha256sum] = "5d253f924fd29bc13054b664bba9aa86b865299971195969478253c1775b7e56" 17SRC_URI[sha256sum] = "55cbde9be12a212bd84bce9d1e63941d9a16139ed0d4912401367eba1502f058"