diff options
| author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-04-02 02:16:58 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-24 14:10:08 +0100 |
| commit | 37605f613f7415d7b22beca554fcb6a9ea4a5ebc (patch) | |
| tree | d8c3c36071ae4dddd099585552a24d97a47920ae | |
| parent | a2bfc86aaf7c5fe432f5f4f8f320337dd8936f20 (diff) | |
| download | poky-37605f613f7415d7b22beca554fcb6a9ea4a5ebc.tar.gz | |
libusb1: upgrade 1.0.22 -> 1.0.23
no-dll.patch
removed since it is no available for 1.0.23
(From OE-Core rev: 5d55b5e3c5b41929e348a2c9ab69ce0ba774f0cb)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/libusb/libusb1/no-dll.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-support/libusb/libusb1_1.0.23.bb (renamed from meta/recipes-support/libusb/libusb1_1.0.22.bb) | 5 |
2 files changed, 2 insertions, 22 deletions
diff --git a/meta/recipes-support/libusb/libusb1/no-dll.patch b/meta/recipes-support/libusb/libusb1/no-dll.patch deleted file mode 100644 index 6e6bb83d1f..0000000000 --- a/meta/recipes-support/libusb/libusb1/no-dll.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | As all invokes all-recursive which uses sub-makes to invoke all-am, the | ||
| 2 | resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds | ||
| 3 | the second attempt is skipped as the target already exists, but in highly | ||
| 4 | parallel builds it's likely that two makes will be building libusb-1.0.la at the | ||
| 5 | same time. | ||
| 6 | |||
| 7 | Solve this by removing the explicit all target, which as libusb-1.0.dll isn't | ||
| 8 | built under Linux is redundant anyway. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 12 | |||
| 13 | diff --git a/libusb/Makefile.am b/libusb/Makefile.am | ||
| 14 | index 0cab0a0..c880213 100644 | ||
| 15 | --- a/libusb/Makefile.am | ||
| 16 | +++ b/libusb/Makefile.am | ||
| 17 | @@ -1,2 +0,0 @@ | ||
| 18 | -all: libusb-1.0.la libusb-1.0.dll | ||
| 19 | - | ||
diff --git a/meta/recipes-support/libusb/libusb1_1.0.22.bb b/meta/recipes-support/libusb/libusb1_1.0.23.bb index 1d9d772575..2fd658b4ef 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.22.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.23.bb | |||
| @@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | |||
| 9 | BBCLASSEXTEND = "native nativesdk" | 9 | BBCLASSEXTEND = "native nativesdk" |
| 10 | 10 | ||
| 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ |
| 12 | file://no-dll.patch \ | ||
| 13 | file://run-ptest \ | 12 | file://run-ptest \ |
| 14 | " | 13 | " |
| 15 | 14 | ||
| 16 | SRC_URI[md5sum] = "466267889daead47674df933cea9cacb" | 15 | SRC_URI[md5sum] = "be79ed4a4a440169deec8beaac6aae33" |
| 17 | SRC_URI[sha256sum] = "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157" | 16 | SRC_URI[sha256sum] = "4fc17b2ef3502757641bf8fe2c14ad86ec86302a2b785abcb0806fd03aa1201f" |
| 18 | 17 | ||
| 19 | S = "${WORKDIR}/libusb-${PV}" | 18 | S = "${WORKDIR}/libusb-${PV}" |
| 20 | 19 | ||
