diff --git a/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch index ac72be44dc..806b81188e 100644 --- a/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch +++ b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch @@ -6,32 +6,35 @@ Signed-off-by: Leonard Göhrs Update for 1.1.128 Signed-off-by: Liu Yiding + --- - CMakeLists.txt | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + CMakeLists.txt | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d6b915..f8c76ca 100644 +index 3475179..945c373 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -16,14 +16,15 @@ find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBFTDI REQUIRED libftdi1) +@@ -17,17 +17,17 @@ pkg_check_modules(LIBFTDI REQUIRED libftdi1) pkg_check_modules(LIBYAML REQUIRED yaml-0.1) + pkg_check_modules(LIBOPENSSL REQUIRED openssl) pkg_check_modules(LIBUSB REQUIRED libusb-1.0) +pkg_check_modules(LIBCURL REQUIRED libcurl) project(bcu) --include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${PROJECT_SOURCE_DIR}/libftdi/src ${LIBYAML_INCLUDEDIR}) -+include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${LIBYAML_INCLUDEDIR}) +-include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${PROJECT_SOURCE_DIR}/libftdi/src ${LIBYAML_INCLUDEDIR} ${PROJECT_SOURCE_DIR}/libcurl/include) ++include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${LIBYAML_INCLUDEDIR} ${LIBCURL_INCLUDE_DIRS}) include_directories(${PROJECT_SOURCE_DIR}) message("operation system is ${CMAKE_SYSTEM}") if (LINUX) - add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_ftdi_eeprom.c) + add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c) - link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS}) +- target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${PROJECT_SOURCE_DIR}/libcurl/build.bcu/lib/libcurl.a -lpthread -lssl -lcrypto -lm) +- execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR} +- COMMAND ${PROJECT_SOURCE_DIR}/build_libs.sh ${PROJECT_SOURCE_DIR}) + link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS} ${LIBCURL_LIBRARY_DIRS}) - target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} -lpthread -lm -ldl) - execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR} ) ++ target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${LIBCURL_LIBRARIES} -lpthread -lm) ++ execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR}) install(TARGETS bcu DESTINATION bin) --- -2.43.0 - + elseif (MACOS) + add_executable(bcu_mac bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c) diff --git a/meta-oe/recipes-support/bcu/bcu_1.1.128.bb b/meta-oe/recipes-support/bcu/bcu_1.2.1.bb similarity index 73% rename from meta-oe/recipes-support/bcu/bcu_1.1.128.bb rename to meta-oe/recipes-support/bcu/bcu_1.2.1.bb index 2b2e5e7fa0..19ea077e90 100644 --- a/meta-oe/recipes-support/bcu/bcu_1.1.128.bb +++ b/meta-oe/recipes-support/bcu/bcu_1.2.1.bb @@ -9,14 +9,17 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6" -SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master;tag=${BPN}_${PV} \ +SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;nobranch=1;tag=${BPN}_${PV} \ file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \ " -SRCREV = "e7027dcb867dae7aebc8fd0a78ab13f05a4557f2" +SRCREV = "1c79dcf115bcf2c8ad632dadbc749c5e25c52cb1" DEPENDS = "curl libyaml libusb1 openssl libftdi" inherit cmake pkgconfig +# CMakeLists.txt still declares cmake_minimum_required(VERSION 3.4) +EXTRA_OECMAKE += "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + BBCLASSEXTEND = "native nativesdk"