mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-14 03:57:15 +00:00
bcu: upgrade 1.1.128 -> 1.2.1
Rework 0001-CMakeLists-do-not-use-vendored-libcurl.patch: 1.2.1 builds a static libcurl from the bundled sources via build_libs.sh at configure time; link the system libcurl through pkg-config instead. CMakeLists.txt declares cmake_minimum_required(VERSION 3.4), which CMake 4 rejects, so set CMAKE_POLICY_VERSION_MINIMUM. The bcu_1.2.1 tag points to a commit that is not on master or any other branch, so fetch it by tag alone. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
2 files changed
+21
-15
No files matched your search
@@ -6,32 +6,35 @@ Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
|
||||
|
||||
Update for 1.1.128
|
||||
Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
|
||||
|
||||
---
|
||||
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)
|
||||
+5
-2
@@ -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"
|
||||
Reference in new issue
Block a user