From ceab255164f47e73e903f59e2a9041a77b68c7c4 Mon Sep 17 00:00:00 2001 From: magicWenli <48174882+magicwenli@users.noreply.github.com> Date: Thu, 11 Apr 2024 17:23:14 +0800 Subject: [PATCH 1/3] serial: Fix empty package and use shared lib instead of static lib. see also: https://docs.yoctoproject.org/pipermail/yocto/2015-January/022921.html --- ...01-build-shared-lib-and-skip-example.patch | 41 +++++++++++++++++++ .../recipes-support/serial/serial_1.2.1.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta-oe/recipes-support/serial/serial/0001-build-shared-lib-and-skip-example.patch diff --git a/meta-oe/recipes-support/serial/serial/0001-build-shared-lib-and-skip-example.patch b/meta-oe/recipes-support/serial/serial/0001-build-shared-lib-and-skip-example.patch new file mode 100644 index 00000000000..96d35967f7c --- /dev/null +++ b/meta-oe/recipes-support/serial/serial/0001-build-shared-lib-and-skip-example.patch @@ -0,0 +1,41 @@ +From 1798dc93ab65be94e14faad33a19cab051eef788 Mon Sep 17 00:00:00 2001 +From: yangxuenian +Date: Thu, 11 Apr 2024 16:36:29 +0800 +Subject: [PATCH] build shared lib and skip example + +--- + CMakeLists.txt | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a72acb8..89abeda 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,7 +45,7 @@ else() + endif() + + ## Add serial library +-add_library(${PROJECT_NAME} ${serial_SRCS}) ++add_library(${PROJECT_NAME} SHARED ${serial_SRCS}) + if(APPLE) + target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY}) + elseif(UNIX) +@@ -55,9 +55,15 @@ else() + endif() + + ## Uncomment for example +-add_executable(serial_example examples/serial_example.cc) +-add_dependencies(serial_example ${PROJECT_NAME}) +-target_link_libraries(serial_example ${PROJECT_NAME}) ++#add_executable(serial_example examples/serial_example.cc) ++#add_dependencies(serial_example ${PROJECT_NAME}) ++#target_link_libraries(serial_example ${PROJECT_NAME}) ++ ++set (SERIAL_VERSION_MAJOR 1) ++set (SERIAL_VERSION_MINOR 0) ++set (SERIAL_VERSION_PATCH 0) ++set (SERIAL_VERSION_STRING ${SERIAL_VERSION_MAJOR}.${SERIAL_VERSION_MINOR}.${SERIAL_VERSION_PATCH}) ++set_target_properties (${PROJECT_NAME} PROPERTIES VERSION ${SERIAL_VERSION_STRING} SOVERSION ${SERIAL_VERSION_MAJOR}) + + ## Include headers + include_directories(include) diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb index 8c1fb063b3e..44fd1c454cf 100644 --- a/meta-oe/recipes-support/serial/serial_1.2.1.bb +++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=53;endline=62;md5=049c68d559533f9 SRC_URI = " \ git://github.com/wjwwood/${BPN}.git;protocol=https;branch=main \ file://Findcatkin.cmake \ + file://0001-build-shared-lib-and-skip-example.patch \ " SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96" From c3aeeacab3a215a8eae0ddcd8d43a50082a380d3 Mon Sep 17 00:00:00 2001 From: magicWenli <48174882+magicwenli@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:05:00 +0800 Subject: [PATCH 2/3] Sync patch and append Upstream-Status label --- ...-for-shared-lib-and-comment-example.patch} | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) rename meta-oe/recipes-support/serial/serial/{0001-build-shared-lib-and-skip-example.patch => 0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch} (50%) diff --git a/meta-oe/recipes-support/serial/serial/0001-build-shared-lib-and-skip-example.patch b/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch similarity index 50% rename from meta-oe/recipes-support/serial/serial/0001-build-shared-lib-and-skip-example.patch rename to meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch index 96d35967f7c..6d1225c89ef 100644 --- a/meta-oe/recipes-support/serial/serial/0001-build-shared-lib-and-skip-example.patch +++ b/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch @@ -1,41 +1,51 @@ -From 1798dc93ab65be94e14faad33a19cab051eef788 Mon Sep 17 00:00:00 2001 -From: yangxuenian -Date: Thu, 11 Apr 2024 16:36:29 +0800 -Subject: [PATCH] build shared lib and skip example +From 23ae981ba46f6d5af03b12083ad32de9c1f148b2 Mon Sep 17 00:00:00 2001 +From: magicWenli <48174882+magicwenli@users.noreply.github.com> +Date: Fri, 12 Apr 2024 07:52:53 +0000 +Subject: [PATCH] Add SOVERSION for shared lib, and comment example by default +Upstream-Status: Pending --- CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a72acb8..89abeda 100644 +index 4927020..9935d39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -45,7 +45,7 @@ else() +@@ -1,5 +1,8 @@ + cmake_minimum_required(VERSION 2.8.3) + project(serial) ++set (SERIAL_VERSION_MAJOR 1) ++set (SERIAL_VERSION_MINOR 2) ++set (SERIAL_VERSION_PATCH 1) + + # Find catkin + find_package(catkin REQUIRED) +@@ -47,7 +50,7 @@ else() endif() ## Add serial library -add_library(${PROJECT_NAME} ${serial_SRCS}) +add_library(${PROJECT_NAME} SHARED ${serial_SRCS}) if(APPLE) - target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY}) elseif(UNIX) -@@ -55,9 +55,15 @@ else() +@@ -57,9 +60,12 @@ else() endif() ## Uncomment for example -add_executable(serial_example examples/serial_example.cc) -add_dependencies(serial_example ${PROJECT_NAME}) -target_link_libraries(serial_example ${PROJECT_NAME}) -+#add_executable(serial_example examples/serial_example.cc) -+#add_dependencies(serial_example ${PROJECT_NAME}) -+#target_link_libraries(serial_example ${PROJECT_NAME}) ++# add_executable(serial_example examples/serial_example.cc) ++# add_dependencies(serial_example ${PROJECT_NAME}) ++# target_link_libraries(serial_example ${PROJECT_NAME}) + -+set (SERIAL_VERSION_MAJOR 1) -+set (SERIAL_VERSION_MINOR 0) -+set (SERIAL_VERSION_PATCH 0) +set (SERIAL_VERSION_STRING ${SERIAL_VERSION_MAJOR}.${SERIAL_VERSION_MINOR}.${SERIAL_VERSION_PATCH}) +set_target_properties (${PROJECT_NAME} PROPERTIES VERSION ${SERIAL_VERSION_STRING} SOVERSION ${SERIAL_VERSION_MAJOR}) ## Include headers include_directories(include) +-- +2.44.0 + From 7ae554fe82e22291cb37b1b24e8ddba1d70102f7 Mon Sep 17 00:00:00 2001 From: magicWenli <48174882+magicwenli@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:06:18 +0800 Subject: [PATCH 3/3] Sync patch and append Upstream-Status label --- meta-oe/recipes-support/serial/serial_1.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb index 44fd1c454cf..f42d0f3516a 100644 --- a/meta-oe/recipes-support/serial/serial_1.2.1.bb +++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=53;endline=62;md5=049c68d559533f9 SRC_URI = " \ git://github.com/wjwwood/${BPN}.git;protocol=https;branch=main \ file://Findcatkin.cmake \ - file://0001-build-shared-lib-and-skip-example.patch \ + file://0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch \ " SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96"