mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 20:07:25 +00:00
bcu: upgrade 1.1.115 -> 1.1.128
1. Changelog: Support i.MX952 15x15 EVK with Power group updated. 2. Update 0001-CMakeLists-do-not-use-vendored-libcurl.patch for 1.1.128 Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,45 +1,37 @@
|
|||||||
From 678c32f867931fd9f410b6e46ea8d101714c7ed5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= <l.goehrs@pengutronix.de>
|
|
||||||
Date: Tue, 6 May 2025 07:45:36 +0200
|
|
||||||
Subject: [PATCH] CMakeLists: do not use vendored libcurl
|
Subject: [PATCH] CMakeLists: do not use vendored libcurl
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [upstream ticket https://github.com/nxp-imx/bcu/issues/17]
|
Upstream-Status: Inappropriate [upstream ticket https://github.com/nxp-imx/bcu/issues/17]
|
||||||
|
|
||||||
Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
|
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 | 10 +++++-----
|
CMakeLists.txt | 5 +++--
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 42158a2..ac840fc 100644
|
index 0d6b915..f8c76ca 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -17,17 +17,17 @@ pkg_check_modules(LIBFTDI REQUIRED libftdi1)
|
@@ -16,14 +16,15 @@ find_package(PkgConfig REQUIRED)
|
||||||
|
pkg_check_modules(LIBFTDI REQUIRED libftdi1)
|
||||||
pkg_check_modules(LIBYAML REQUIRED yaml-0.1)
|
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(LIBUSB REQUIRED libusb-1.0)
|
||||||
+pkg_check_modules(LIBCURL REQUIRED libcurl)
|
+pkg_check_modules(LIBCURL REQUIRED libcurl)
|
||||||
project(bcu)
|
project(bcu)
|
||||||
-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 ${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 ${LIBYAML_INCLUDEDIR})
|
||||||
include_directories(${PROJECT_SOURCE_DIR})
|
include_directories(${PROJECT_SOURCE_DIR})
|
||||||
|
|
||||||
message("operation system is ${CMAKE_SYSTEM}")
|
message("operation system is ${CMAKE_SYSTEM}")
|
||||||
if (LINUX)
|
if (LINUX)
|
||||||
add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c)
|
add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_ftdi_eeprom.c)
|
||||||
- link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS})
|
- 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 -ldl)
|
|
||||||
- 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})
|
+ link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS} ${LIBCURL_LIBRARY_DIRS})
|
||||||
+ target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${LIBCURL_LIBRARIES} -lpthread -lssl -lcrypto -lm -ldl)
|
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})
|
execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR} )
|
||||||
install(TARGETS bcu DESTINATION bin)
|
install(TARGETS bcu DESTINATION bin)
|
||||||
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)
|
|
||||||
--
|
--
|
||||||
2.39.5
|
2.43.0
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -9,10 +9,10 @@ SECTION = "devel"
|
|||||||
LICENSE = "BSD-3-Clause"
|
LICENSE = "BSD-3-Clause"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master \
|
SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master;tag=${BPN}_${PV} \
|
||||||
file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \
|
file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "f081c69c26e330cf03ec790051c415c4716509d9"
|
SRCREV = "e7027dcb867dae7aebc8fd0a78ab13f05a4557f2"
|
||||||
|
|
||||||
|
|
||||||
DEPENDS = "curl libyaml libusb1 openssl libftdi"
|
DEPENDS = "curl libyaml libusb1 openssl libftdi"
|
||||||
Reference in New Issue
Block a user