]> code.ossystems Code Review - openembedded-core.git/commitdiff
libusb1: upgrade 1.0.22 -> 1.0.23
authorWang Mingyu <wangmy@cn.fujitsu.com>
Thu, 2 Apr 2020 09:16:58 +0000 (02:16 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 24 Apr 2020 13:07:54 +0000 (14:07 +0100)
no-dll.patch
removed since it is no available for 1.0.23

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-support/libusb/libusb1/no-dll.patch [deleted file]
meta/recipes-support/libusb/libusb1_1.0.23.bb [moved from meta/recipes-support/libusb/libusb1_1.0.22.bb with 88% similarity]

diff --git a/meta/recipes-support/libusb/libusb1/no-dll.patch b/meta/recipes-support/libusb/libusb1/no-dll.patch
deleted file mode 100644 (file)
index 6e6bb83..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-As all invokes all-recursive which uses sub-makes to invoke all-am, the
-resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds
-the second attempt is skipped as the target already exists, but in highly
-parallel builds it's likely that two makes will be building libusb-1.0.la at the
-same time.
-
-Solve this by removing the explicit all target, which as libusb-1.0.dll isn't
-built under Linux is redundant anyway.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/libusb/Makefile.am b/libusb/Makefile.am
-index 0cab0a0..c880213 100644
---- a/libusb/Makefile.am
-+++ b/libusb/Makefile.am
-@@ -1,2 +0,0 @@
--all: libusb-1.0.la libusb-1.0.dll
--
similarity index 88%
rename from meta/recipes-support/libusb/libusb1_1.0.22.bb
rename to meta/recipes-support/libusb/libusb1_1.0.23.bb
index 1d9d772575ac448f62c7b9d3c2dea424341ff1cb..2fd658b4ef2f9db9a90235bc2870a91ebd49a418 100644 (file)
@@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
-           file://no-dll.patch \
            file://run-ptest \
           "
 
-SRC_URI[md5sum] = "466267889daead47674df933cea9cacb"
-SRC_URI[sha256sum] = "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157"
+SRC_URI[md5sum] = "be79ed4a4a440169deec8beaac6aae33"
+SRC_URI[sha256sum] = "4fc17b2ef3502757641bf8fe2c14ad86ec86302a2b785abcb0806fd03aa1201f"
 
 S = "${WORKDIR}/libusb-${PV}"