From 5526c9160e2b03b3ece41955b34485b7dbeba7fd Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 25 Oct 2022 11:18:42 +0300 Subject: uuu: Upgrade 1.4.165 -> 1.4.243 Besides bumping uuu version, remove the upstreamed patch 0001-remove-unnecessary-libzip-dependency.patch. Relevant changes: - ed48c51 zstd ZSTD_getFrameContentSize can return decompress size - d539877 Create SCR-mfgtools.txt - 716ff99 Update README.md for zstd - 3064151 Fix ZSTD stopping - 294ab5c fix fail open file begin with > in script - 4bf291e fix build failure at windows - e44daeb fix warning at trans.cpp and usbhotplug.cpp - ce351f0 fix warning at sdp.cpp - 2b6a003 fix warning at cmd.cpp - a035798 fix build warning at buffer.cpp - 4ae411a Fixed build warning at fastboot.cpp - 420676d Improve error message after code consolidate - 07f4c12 Fixed bz2 decompress fail at 26% for a specific file - 0a13d1c Fix #328 Current Directory not appending - 9569f6c Fix Http Loading - 52ab1b0 Fixes logical issue with patch 219cf39 - 8119b5d Merge branch 'master' of github.com:NXPmicro/mfgtools - 832a5f7 Fix #326 Skipping First Character - 219cf39 Fix #326 Skipping First Character - 3903471 Generalized FSCompressStream checks - 6358a51 Shows loading progress for single thread BZ2 - 162152b Consolidate Reload Function for File Types - eef4e5d Fix #325 appending header twice issue - 70d1e85 Automatically decompress ZSTD file from -b - e6e5f70 fix crc command -format - c1f969e Add async for zstd - 49626b7 add async support for gz - cfe0786 try to fix MacOS build failure at appveyor - 2adf07b try to fix macos build - 4a20bcf Revert "Try fix macOS build after zstd patch" - e2cf6b3 try fix macOS build after zstd patch - f260d8d Merge branch 'master' of github.com:NXPmicro/mfgtools - b09bd71 Try fix macOS build after zstd patch - 8daa734 Try fix macos build after zstd patch - f8944ac Update Ubuntu to 18.04 - 02cb3cb try to fix linux build appveyor - 531b751 Try to fix mac build appveyor - 91f8a20 Try to fix Linux Build fail at appveyor - 496f1c1 Added libzstd-dev to snap - 3547764 better fix appveryor vs build problem - 210927e test build environment - 94f1e51 try to fix appveyor build problem - 30e5d57 try to fix zstd build error at appveyor - f3a1bfb Update README.md - ce97c4a fix build error after add zstd lib - f9763f9 zstd decompression - 36ceb0d Add zstd library into uuu - c7fe0b6 Fix error message - 6841102 Show CRC check progress - d63bdc6 implements crc check for images - 005ff6f Fix crash when download bz2 from http - 1dc59a1 Fix uuu_version in generated uuu.inputlog in shell mode - f4578c3 Fix argument names in print_cfg() - f8a783a Fix crash when download speed slower than decompress speed and need resize buffer - c34886a Merge branch 'master' of github.com:codeauroraforum/mfgtools - bdb4cb3 Specify 'ios::binary' in ofstream initialization - 5d232b2 Add i.MX93 support - e56424c consolidated libusb_init and libusb_deinit into CAutoDeInit - 411f78f Fixed 314 Corrupt image with larger transfer sizes at sdp(s) - bf0ed17 fixed missed true at else branch at built-in script - 5397913 Added CAutoDeInit to call libusb_exit() automatically - 8027907 Replaced all libusb_get_device_list calls with CAutoList objects - 49afb54 can't call libusb_exit at uuu_for_each_devices - 919a464 fixed missed call libusb_free_device_list at look_for_match_device - f34ea63 Fixed invalid progress percentage in verbose mode - a561ed7 Add NXP FB/FBK/SDPV device PID - d7d3af2 Fixed QSPI flashing script - 64ca58f Fix cmake warning related to uuu tool - f666874 Add zlib1g-dev to fix snap build failure - 87a99ff Fix invalid test on fastboot_bytes on lst script - 662689d ubuntu 16 still use old libusb version - 922029b Fix depracated method TLSv1_2_client_method - 70662de Remove depracated function libusb_set_debug - c232c46 Remove dependences from fastboot_bytes that is specific to freescale uboot - cfb7262 fix #297 print error when run quit cmd in shell mode - 9afe083 remove unnecessary libzip dependency - 0e14621 Fix #180 support check getval return value Signed-off-by: Oleksandr Suvorov --- ...0001-remove-unnecessary-libzip-dependency.patch | 135 --------------------- recipes-devtools/uuu/uuu_git.bb | 6 +- 2 files changed, 2 insertions(+), 139 deletions(-) delete mode 100644 recipes-devtools/uuu/files/0001-remove-unnecessary-libzip-dependency.patch (limited to 'recipes-devtools') diff --git a/recipes-devtools/uuu/files/0001-remove-unnecessary-libzip-dependency.patch b/recipes-devtools/uuu/files/0001-remove-unnecessary-libzip-dependency.patch deleted file mode 100644 index 52a6b880..00000000 --- a/recipes-devtools/uuu/files/0001-remove-unnecessary-libzip-dependency.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 96ed03b04cb9a94043e44c5f5caa8825a0e89f3a Mon Sep 17 00:00:00 2001 -From: Rasmus Villemoes -Date: Wed, 13 Oct 2021 10:18:50 +0200 -Subject: [PATCH] remove unnecessary libzip dependency - -It seems that the libzip dependency has been added by mistake. See -full analysis in https://github.com/NXPmicro/mfgtools/issues/294 . - -Signed-off-by: Rasmus Villemoes -Upstream-Status: Backport [https://github.com/NXPmicro/mfgtools/pull/295] ---- - .travis.yml | 1 - - README.md | 4 ++-- - appveyor.yml | 4 ++-- - libuuu/CMakeLists.txt | 1 - - snap/snapcraft.yaml | 2 -- - uuu/CMakeLists.txt | 5 ++--- - 6 files changed, 6 insertions(+), 11 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 9138aff..1d2d235 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -33,7 +33,6 @@ addons: - packages: - - cmake - - libusb -- - libzip - - openssl - - pkg-config - -diff --git a/README.md b/README.md -index 20c3f97..6910276 100644 ---- a/README.md -+++ b/README.md -@@ -68,7 +68,7 @@ Note that, since uuu is an OSI compliant Open Source project, you are entitled t - ## Linux - - `git clone https://github.com/NXPmicro/mfgtools.git` - - `cd mfgtools` --- `sudo apt-get install libusb-1.0-0-dev libzip-dev libbz2-dev pkg-config cmake libssl-dev g++` -+- `sudo apt-get install libusb-1.0-0-dev libbz2-dev pkg-config cmake libssl-dev g++` - - `cmake . && make` - - The above commands build mfgtools in source. To build it out of source -@@ -83,7 +83,7 @@ For cmake prior 3.13: - ## macOS - - `git clone https://github.com/NXPmicro/mfgtools.git` - - `cd mfgtools` --- `brew install cmake libusb libzip openssl pkg-config` -+- `brew install cmake libusb openssl pkg-config` - - `cmake -DOPENSSL_ROOT_DIR=$(brew --prefix)/opt/openssl . && make` - - Note that we assume [brew](https://brew.sh) is installed and can be used to resolve dependencies as shown above. The remaining dependency `libbz2` can be resolved via the XCode supplied libraries. -diff --git a/appveyor.yml b/appveyor.yml -index 9e1c74a..e679f84 100644 ---- a/appveyor.yml -+++ b/appveyor.yml -@@ -28,11 +28,11 @@ install: - - - cmd: cd .. - --- sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = "macOS" ]; then brew install libusb libzip pkg-config; fi -+- sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = "macOS" ]; then brew install libusb pkg-config; fi - - - sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" != "macOS" ]; then sudo apt-get update; fi - --- sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" != "macOS" ]; then sudo DEBIAN_FRONTEND=noninteractive apt-get --yes --force-yes install libusb-1.0-0-dev libzip-dev libbz2-dev asciidoc rename; fi -+- sh: if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" != "macOS" ]; then sudo DEBIAN_FRONTEND=noninteractive apt-get --yes --force-yes install libusb-1.0-0-dev libbz2-dev asciidoc rename; fi - - build_script: - -diff --git a/libuuu/CMakeLists.txt b/libuuu/CMakeLists.txt -index f4390a7..2ace072 100644 ---- a/libuuu/CMakeLists.txt -+++ b/libuuu/CMakeLists.txt -@@ -7,7 +7,6 @@ set(CMAKE_SKIP_RPATH ON) - find_package(BZip2 REQUIRED) - find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBUSB REQUIRED libusb-1.0>=1.0.16) --pkg_check_modules(LIBZIP REQUIRED libzip) - find_package(Threads) - - if (STATIC) -diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml -index 09b9065..8a98cca 100644 ---- a/snap/snapcraft.yaml -+++ b/snap/snapcraft.yaml -@@ -103,14 +103,12 @@ parts: - - libbz2-dev - - libusb-1.0-0-dev - - libssl-dev -- - libzip-dev - - pkg-config - plugin: cmake - stage-packages: - - libbz2-1.0 - - libusb-1.0-0 - - libssl1.0.0 -- - libzip4 - filesets: - docs-copyright: - - usr/share/doc/*/copyright -diff --git a/uuu/CMakeLists.txt b/uuu/CMakeLists.txt -index b57a67e..ab78529 100644 ---- a/uuu/CMakeLists.txt -+++ b/uuu/CMakeLists.txt -@@ -6,7 +6,6 @@ set(CMAKE_SKIP_RPATH ON) - - find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBUSB REQUIRED libusb-1.0>=1.0.16) --pkg_check_modules(LIBZIP REQUIRED libzip) - pkg_check_modules(LIBZ REQUIRED zlib) - find_package(Threads) - -@@ -34,7 +33,7 @@ set(LSTS - nand_burn_loader.lst - ) - --link_directories(${CMAKE_CURRENT_SOURCE_DIR}/libuuu ${LIBUSB_LIBRARY_DIRS} ${LIBZIP_LIBRARY_DIRS} ${LIBZ_LIBRARY_DIRS}) -+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/libuuu ${LIBUSB_LIBRARY_DIRS} ${LIBZ_LIBRARY_DIRS}) - - set(CLIST_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/gen_txt_include.sh) - set(generated_files_dir "${CMAKE_BINARY_DIR}/uuu/gen") -@@ -70,7 +69,7 @@ set(SOURCES - ) - - add_executable(uuu ${SOURCES}) --target_link_libraries(uuu uuc_s ${OPENSSL_LIBRARIES} ${LIBUSB_LIBRARIES} ${LIBZIP_LIBRARIES} ${LIBZ_LIBRARIES} dl bz2) -+target_link_libraries(uuu uuc_s ${OPENSSL_LIBRARIES} ${LIBUSB_LIBRARIES} ${LIBZ_LIBRARIES} dl bz2) - - install(TARGETS uuu DESTINATION bin) - target_compile_definitions(uuu --- -2.31.1 - diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb index caa349b2..08fa51c2 100644 --- a/recipes-devtools/uuu/uuu_git.bb +++ b/recipes-devtools/uuu/uuu_git.bb @@ -3,10 +3,8 @@ DESCRIPTION = "Image deploy tool for i.MX chips" HOMEPAGE = "https://github.com/NXPmicro/mfgtools" SRC_URI = "git://github.com/NXPmicro/mfgtools.git;protocol=https;branch=master" -SRCREV = "e10b0260076e0119c259f7f44447904f14109ba2" -PV = "1.4.165" - -SRC_URI += "file://0001-remove-unnecessary-libzip-dependency.patch" +SRCREV = "ed48c514ee4c1ea4562c875877b180a87474f895" +PV = "1.4.243" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5" -- cgit v1.2.3-54-g00ecf