diff options
| -rw-r--r-- | recipes-extended/dlt-daemon/dlt-daemon-2.9.0/fix-in-build-builds.patch | 148 | ||||
| -rw-r--r-- | recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb | 3 |
2 files changed, 150 insertions, 1 deletions
diff --git a/recipes-extended/dlt-daemon/dlt-daemon-2.9.0/fix-in-build-builds.patch b/recipes-extended/dlt-daemon/dlt-daemon-2.9.0/fix-in-build-builds.patch new file mode 100644 index 0000000..b944d14 --- /dev/null +++ b/recipes-extended/dlt-daemon/dlt-daemon-2.9.0/fix-in-build-builds.patch @@ -0,0 +1,148 @@ +Index: git/src/adaptor/CMakeLists.txt +=================================================================== +--- git.orig/src/adaptor/CMakeLists.txt 2013-06-11 17:27:50.367489635 +0300 ++++ git/src/adaptor/CMakeLists.txt 2013-06-11 17:27:57.735489371 +0300 +@@ -14,12 +14,12 @@ + # @licence end@ + ######## + +-set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin) ++set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin.c) + add_executable(dlt-adaptor-stdin ${dlt_adaptor_stdin_SRCS}) + target_link_libraries(dlt-adaptor-stdin dlt) + set_target_properties(dlt-adaptor-stdin PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_adaptor_udp_SRCS dlt-adaptor-udp) ++set(dlt_adaptor_udp_SRCS dlt-adaptor-udp.c) + add_executable(dlt-adaptor-udp ${dlt_adaptor_udp_SRCS}) + target_link_libraries(dlt-adaptor-udp dlt) + set_target_properties(dlt-adaptor-udp PROPERTIES LINKER_LANGUAGE C) +Index: git/src/system/CMakeLists.txt +=================================================================== +--- git.orig/src/system/CMakeLists.txt 2013-06-11 17:23:40.467498576 +0300 ++++ git/src/system/CMakeLists.txt 2013-06-11 17:24:04.311497723 +0300 +@@ -18,9 +18,9 @@ + message( STATUS "Added ${systemd_SRCS} to dlt-system") + endif(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD) + +-set(dlt_system_SRCS dlt-system dlt-system-options dlt-system-process-handling +- dlt-system-filetransfer dlt-system-logfile dlt-system-processes dlt-system-shell +- dlt-system-syslog dlt-system-watchdog) ++set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handling.c ++ dlt-system-filetransfer.c dlt-system-logfile.c dlt-system-processes.c dlt-system-shell.c ++ dlt-system-syslog.c dlt-system-watchdog.c) + add_executable(dlt-system ${dlt_system_SRCS} ${systemd_SRCS}) + target_link_libraries(dlt-system dlt z) + set_target_properties(dlt-system PROPERTIES LINKER_LANGUAGE C) +Index: git/src/tests/CMakeLists.txt +=================================================================== +--- git.orig/src/tests/CMakeLists.txt 2013-06-11 17:22:05.139501987 +0300 ++++ git/src/tests/CMakeLists.txt 2013-06-11 17:22:30.711501072 +0300 +@@ -13,42 +13,42 @@ + # + # @licence end@ + ######## +-set(dlt_test_multi_process_SRCS dlt-test-multi-process) ++set(dlt_test_multi_process_SRCS dlt-test-multi-process.c) + add_executable(dlt-test-multi-process ${dlt_test_multi_process_SRCS}) + target_link_libraries(dlt-test-multi-process dlt) + set_target_properties(dlt-test-multi-process PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_test_multi_process_client_SRCS dlt-test-multi-process-client) ++set(dlt_test_multi_process_client_SRCS dlt-test-multi-process-client.c) + add_executable(dlt-test-multi-process-client ${dlt_test_multi_process_client_SRCS}) + target_link_libraries(dlt-test-multi-process-client dlt) + set_target_properties(dlt-test-multi-process-client PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_test_user_SRCS dlt-test-user) ++set(dlt_test_user_SRCS dlt-test-user.c) + add_executable(dlt-test-user ${dlt_test_user_SRCS}) + target_link_libraries(dlt-test-user dlt) + set_target_properties(dlt-test-user PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_test_client_SRCS dlt-test-client) ++set(dlt_test_client_SRCS dlt-test-client.c) + add_executable(dlt-test-client ${dlt_test_client_SRCS}) + target_link_libraries(dlt-test-client dlt) + set_target_properties(dlt-test-client PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_test_stress_user_SRCS dlt-test-stress-user) ++set(dlt_test_stress_user_SRCS dlt-test-stress-user.c) + add_executable(dlt-test-stress-user ${dlt_test_stress_user_SRCS}) + target_link_libraries(dlt-test-stress-user dlt) + set_target_properties(dlt-test-stress-user PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_test_stress_client_SRCS dlt-test-stress-client) ++set(dlt_test_stress_client_SRCS dlt-test-stress-client.c) + add_executable(dlt-test-stress-client ${dlt_test_stress_client_SRCS}) + target_link_libraries(dlt-test-stress-client dlt) + set_target_properties(dlt-test-stress-client PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_test_stress_SRCS dlt-test-stress) ++set(dlt_test_stress_SRCS dlt-test-stress.c) + add_executable(dlt-test-stress ${dlt_test_stress_SRCS}) + target_link_libraries(dlt-test-stress dlt) + set_target_properties(dlt-test-stress PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_test_filetransfer_SRCS dlt-test-filetransfer) ++set(dlt_test_filetransfer_SRCS dlt-test-filetransfer.c) + add_executable(dlt-test-filetransfer ${dlt_test_filetransfer_SRCS}) + target_link_libraries(dlt-test-filetransfer dlt) + set_target_properties(dlt-test-filetransfer PROPERTIES LINKER_LANGUAGE C) +Index: git/src/console/CMakeLists.txt +=================================================================== +--- git.orig/src/console/CMakeLists.txt 2013-06-11 17:31:00.443482834 +0300 ++++ git/src/console/CMakeLists.txt 2013-06-11 17:31:04.923482670 +0300 +@@ -14,12 +14,12 @@ + # @licence end@ + ######## + +-set(dlt_convert_SRCS dlt-convert) ++set(dlt_convert_SRCS dlt-convert.c) + add_executable(dlt-convert ${dlt_convert_SRCS} ${dlt_most_SRCS}) + target_link_libraries(dlt-convert dlt ${EXPAT_LIBRARIES}) + set_target_properties(dlt-convert PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_receive_SRCS dlt-receive) ++set(dlt_receive_SRCS dlt-receive.c) + add_executable(dlt-receive ${dlt_receive_SRCS} ${dlt_most_SRCS}) + target_link_libraries(dlt-receive dlt ${EXPAT_LIBRARIES}) + set_target_properties(dlt-receive PROPERTIES LINKER_LANGUAGE C) +Index: git/src/daemon/CMakeLists.txt +=================================================================== +--- git.orig/src/daemon/CMakeLists.txt 2013-06-11 17:31:18.475482188 +0300 ++++ git/src/daemon/CMakeLists.txt 2013-06-11 17:31:32.359481692 +0300 +@@ -19,7 +19,7 @@ + message( STATUS "Added ${systemd_SRCS} to dlt-daemon") + endif(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD) + +-set(dlt_daemon_SRCS dlt-daemon dlt_daemon_common ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_offline_trace.c) ++set(dlt_daemon_SRCS dlt-daemon.c dlt_daemon_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_offline_trace.c) + add_executable(dlt-daemon ${dlt_daemon_SRCS} ${systemd_SRCS}) + target_link_libraries(dlt-daemon rt ${CMAKE_THREAD_LIBS_INIT}) + +Index: git/src/examples/CMakeLists.txt +=================================================================== +--- git.orig/src/examples/CMakeLists.txt 2013-06-11 17:31:46.547481184 +0300 ++++ git/src/examples/CMakeLists.txt 2013-06-11 17:31:55.447480864 +0300 +@@ -14,17 +14,17 @@ + # @licence end@ + ######## + +-set(dlt_example_user_SRCS dlt-example-user) ++set(dlt_example_user_SRCS dlt-example-user.c) + add_executable(dlt-example-user ${dlt_example_user_SRCS}) + target_link_libraries(dlt-example-user dlt) + set_target_properties(dlt-example-user PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_example_user_func_SRCS dlt-example-user-func) ++set(dlt_example_user_func_SRCS dlt-example-user-func.c) + add_executable(dlt-example-user-func ${dlt_example_user_func_SRCS}) + target_link_libraries(dlt-example-user-func dlt) + set_target_properties(dlt-example-user-func PROPERTIES LINKER_LANGUAGE C) + +-set(dlt_example_filetransfer_SRCS dlt-example-filetransfer) ++set(dlt_example_filetransfer_SRCS dlt-example-filetransfer.c) + add_executable( dlt-example-filetransfer ${dlt_example_filetransfer_SRCS}) + target_link_libraries(dlt-example-filetransfer dlt ) + set_target_properties(dlt-example-filetransfer PROPERTIES LINKER_LANGUAGE C) diff --git a/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb b/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb index 58447e8..8889333 100644 --- a/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb +++ b/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb @@ -11,7 +11,7 @@ DESCRIPTION = "This component provides a standardised log and trace interface, b HOMEPAGE = "https://www.genivi.org/" SECTION = "console/utils" -PR = "r1" +PR = "r2" inherit gzipnative @@ -25,6 +25,7 @@ DEPENDS = "zlib" SRC_URI = "git://git.projects.genivi.org/${PN}.git;protocol=git;tag=v${PV} \ file://systemd_service_installation.patch \ + file://fix-in-build-builds.patch \ " S = "${WORKDIR}/git" |