diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-06-09 22:57:23 +0200 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-06-11 13:53:50 +0000 |
commit | 644a2d10516118f9a3bb3ae1c7392e9cf38bc650 (patch) | |
tree | 92923deb9221ac97df0a248a2b65a03fa0578378 /recipes-extended/dlt-daemon | |
parent | 3f479f2489be1f038b2ce2b51117d8b3a0dfa9e4 (diff) |
Changes to support the switch to pipewire
This moves all soundmanager components off into meta-agl-devel/meta-audio-soundmanager-framework .
Soundmanager is not supported in HH.
Furthermore, I simplified the image and packagegroup recipes.
Feature templates were modified to reflect the change as well.
Bug-AGL: SPEC-2473
Change-Id: I48b437fb2ed727ed362d92af56596096df62dd8d
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-extended/dlt-daemon')
6 files changed, 0 insertions, 339 deletions
diff --git a/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch b/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch deleted file mode 100644 index 5bf6bf88e..000000000 --- a/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8080b7395c1638baee60fb3c46667f21e00b87fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Erik=20Bot=C3=B6?= <erik.boto@pelagicore.com> -Date: Fri, 4 Apr 2014 10:59:18 +0200 -Subject: [PATCH 1/4] Fix build with systemd >= 209 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [Configuration Specific] -Signed-off-by: Erik Botö <erik.boto@pelagicore.com> ---- - src/system/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt -index ce87914..1d0d224 100644 ---- a/src/system/CMakeLists.txt -+++ b/src/system/CMakeLists.txt -@@ -23,7 +23,7 @@ set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handlin - dlt-system-syslog.c dlt-system-watchdog.c dlt-system-journal.c) - add_executable(dlt-system ${dlt_system_SRCS} ${systemd_SRCS}) - if(WITH_SYSTEMD_JOURNAL) -- target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd-journal systemd-id128) -+ target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd) - else(WITH_SYSTEMD_JOURNAL) - target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES}) - endif(WITH_SYSTEMD_JOURNAL) --- -1.9.3 - diff --git a/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch b/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch deleted file mode 100644 index 168847990..000000000 --- a/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch +++ /dev/null @@ -1,81 +0,0 @@ -From bcca4c99394ba422d03a5e76f2a0023ef248824a Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei.gherzan@windriver.com> -Date: Tue, 18 Nov 2014 15:47:22 +0100 -Subject: [PATCH 2/4] Don't execute processes as a specific user. - -Upstream-Status: Inappropriate [Configuration Specific] -Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> ---- - systemd/dlt-adaptor-udp.service.cmake | 1 - - systemd/dlt-example-user.service.cmake | 1 - - systemd/dlt-receive.service.cmake | 1 - - systemd/dlt-system.service.cmake | 1 - - systemd/dlt.service.cmake | 1 - - 5 files changed, 5 deletions(-) - -diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake -index 8dac1f2..ecf9f9e 100644 ---- a/systemd/dlt-adaptor-udp.service.cmake -+++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -21,9 +21,8 @@ Wants=dlt.service - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ - LimitCORE=infinity - - [Install] --WantedBy=multi-user.target -\ No newline at end of file -+WantedBy=multi-user.target -diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake -index b665742..35009b0 100644 ---- a/systemd/dlt-example-user.service.cmake -+++ b/systemd/dlt-example-user.service.cmake -@@ -21,6 +21,5 @@ Wants=dlt.service - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" --LimitCORE=infinity -\ No newline at end of file -+LimitCORE=infinity -diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake -index c07d447..8f88f00 100644 ---- a/systemd/dlt-receive.service.cmake -+++ b/systemd/dlt-receive.service.cmake -@@ -22,6 +22,5 @@ Wants=dlt.service - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost --LimitCORE=infinity -\ No newline at end of file -+LimitCORE=infinity -diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake -index 0e91f42..1a5b913 100755 ---- a/systemd/dlt-system.service.cmake -+++ b/systemd/dlt-system.service.cmake -@@ -22,7 +22,6 @@ Wants=dlt.service - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main -diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake -index 0b3ee2c..e4753a2 100755 ---- a/systemd/dlt.service.cmake -+++ b/systemd/dlt.service.cmake -@@ -21,7 +21,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) - - [Service] - Type=simple --User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main diff --git a/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch b/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch deleted file mode 100644 index 691a50027..000000000 --- a/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 6804c68ed61f4436818c58cb0abe1c21b4d48aea Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei.gherzan@windriver.com> -Date: Tue, 18 Nov 2014 15:48:50 +0100 -Subject: [PATCH 3/4] systemd/*: unit type should be in lowercase, so use - Type=simple - -Upstream-Status: Submitted [http://lists.genivi.org/pipermail/genivi-diagnostic-log-and-trace/2014-October/000546.html] -Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> ---- - systemd/dlt-adaptor-udp.service.cmake | 2 +- - systemd/dlt-dbus.service.cmake | 2 +- - systemd/dlt-example-user.service.cmake | 2 +- - systemd/dlt-receive.service.cmake | 2 +- - systemd/dlt-system.service.cmake | 2 +- - systemd/dlt.service.cmake | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake -index f446757..81a7158 100644 ---- a/systemd/dlt-adaptor-udp.service.cmake -+++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -19,7 +19,7 @@ Description=GENIVI DLT adaptor stdin. Adaptor for forwarding received UDP messag - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ - LimitCORE=infinity - -diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake -index d1e3b12..75dcdc3 100755 ---- a/systemd/dlt-dbus.service.cmake -+++ b/systemd/dlt-dbus.service.cmake -@@ -20,7 +20,7 @@ Documentation=man:dlt-dbus(1) man:dlt-dbus.conf(5) - Wants=dlt.service
-
- [Service]
--Type=Simple
-+Type=simple
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
-diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake -index b67a83c..fe9c567 100644 ---- a/systemd/dlt-example-user.service.cmake -+++ b/systemd/dlt-example-user.service.cmake -@@ -19,6 +19,6 @@ Description=GENIVI DLT example user. Generate DLT messages and store them to fil - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" - LimitCORE=infinity -\ No newline at end of file -diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake -index 4bbdfc2..3b47dd3 100644 ---- a/systemd/dlt-receive.service.cmake -+++ b/systemd/dlt-receive.service.cmake -@@ -20,6 +20,6 @@ Documentation=man:dlt-receive(1) - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost - LimitCORE=infinity -\ No newline at end of file -diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake -index 7ec995c..d4a4c96 100755 ---- a/systemd/dlt-system.service.cmake -+++ b/systemd/dlt-system.service.cmake -@@ -20,7 +20,7 @@ Documentation=man:dlt-system(1) man:dlt-system.conf(5) - Wants=dlt.service
-
- [Service]
--Type=Simple
-+Type=simple
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
-diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake -index 7bb05bc..5386ffd 100755 ---- a/systemd/dlt.service.cmake -+++ b/systemd/dlt.service.cmake -@@ -19,7 +19,7 @@ Description=GENIVI DLT logging daemon - Documentation=man:dlt-daemon(1) man:dlt.conf(5) - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main --- -1.9.3 - diff --git a/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch b/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch deleted file mode 100644 index 685dfcddc..000000000 --- a/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9a5e655cf57301008cd61d53c8a410a7f397e650 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei.gherzan@windriver.com> -Date: Tue, 18 Nov 2014 15:51:30 +0100 -Subject: [PATCH 4/4] Modify systemd config directory - -Upstream-Status: Inappropriate [Configuration Specific] -Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> ---- - systemd/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e6b44a2..0e885bf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -175,7 +175,7 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL) - - set( systemd_SRCS ${CMAKE_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c) - -- set(SYSTEMD_UNITDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" CACHE PATH -+ set(SYSTEMD_UNITDIR "/lib/systemd/system" CACHE PATH - "Set directory to install systemd unit files") - - add_subdirectory( systemd ) diff --git a/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb deleted file mode 100644 index b521bca91..000000000 --- a/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Diagnostic Log and Trace" -DESCRIPTION = "This component provides a standardised log and trace interface, \ -based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ -This component can be used by GENIVI components and other applications as \ -logging facility providing: \ -- the DLT shared library \ -- the DLT daemon, including startup scripts \ -- the DLT daemon adaptors- the DLT client console utilities \ -- the DLT test applications" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "console/utils" -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \ - file://MPL.txt;md5=ccdb2761cef70c8b2612624c323f89dc" - -DEPENDS = "dbus zlib pigz-native" -do_unpack[depends] += "pigz-native:do_populate_sysroot" - -# FIX ME -# This should be TAG = "v${PV}" but yocto doesn't support lightweight tags for now -# https://bugzilla.yoctoproject.org/show_bug.cgi?id=6881 -TAG = "b8b3ea3a31f7deb681941a19878c82e7b7350ae7" -BRANCH = "v2.11.x" -SRC_URI = "git://git.projects.genivi.org/${PN}.git;branch=${BRANCH};tag=${TAG} \ - file://0001-Fix-build-with-systemd-209.patch \ - file://0002-Don-t-execute-processes-as-a-specific-user.patch \ - file://0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch \ - file://0004-Modify-systemd-config-directory.patch" -S = "${WORKDIR}/git" - -inherit autotools gettext cmake systemd - -# -fPIC is needed to prevent relocation errors when we compile gtest with -# Yocto security flags. See this issue for more details: -# -# https://github.com/google/googletest/issues/854 -# -# If that issue is fixed, we can probably remove the manual -fPIC flags here. -OECMAKE_C_FLAGS += "-fPIC" -OECMAKE_CXX_FLAGS += "-fPIC" - -PACKAGES += "${PN}-systemd" -SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dlt-system.service dlt.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" -SYSTEMD_SERVICE_${PN}-systemd = "dlt-example-user.service \ - dlt-dbus.service \ - dlt-adaptor-udp.service \ - dlt-receive.service" -SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" - -EXTRA_OECMAKE = "-DWITH_SYSTEMD=ON" - -FILES_${PN}-doc += "/usr/share/dlt-filetransfer" diff --git a/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb b/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb deleted file mode 100644 index dbc87c9ac..000000000 --- a/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Diagnostic Log and Trace" -DESCRIPTION = "This component provides a standardised log and trace interface, \ -based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ -This component can be used by GENIVI components and other applications as \ -logging facility providing: \ -- the DLT shared library \ -- the DLT daemon, including startup scripts \ -- the DLT daemon adaptors- the DLT client console utilities \ -- the DLT test applications" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "console/utils" -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" - -DEPENDS = "dbus zlib pigz-native" -do_unpack[depends] += "pigz-native:do_populate_sysroot" - -SRCREV = "e9a486a08fff6d3cc7133a350cec3ee10f463207" -SRC_URI = "git://git.projects.genivi.org/${BPN}.git;protocol=http \ - file://0002-Don-t-execute-processes-as-a-specific-user.patch \ - file://0004-Modify-systemd-config-directory.patch \ - " -S = "${WORKDIR}/git" - -inherit autotools gettext cmake systemd - -# -fPIC is needed to prevent relocation errors when we compile gtest with -# Yocto security flags. See this issue for more details: -# -# https://github.com/google/googletest/issues/854 -# -# If that issue is fixed, we can probably remove the manual -fPIC flags here. -OECMAKE_C_FLAGS += "-fPIC" -OECMAKE_CXX_FLAGS += "-fPIC" - -PACKAGES += "${PN}-systemd" -SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dlt-system.service dlt.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" -SYSTEMD_SERVICE_${PN}-systemd = "dlt-example-user.service \ - dlt-dbus.service \ - dlt-adaptor-udp.service \ - dlt-receive.service" -SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" - -EXTRA_OECMAKE = "-DWITH_SYSTEMD=ON" - -FILES_${PN}-doc += "/usr/share/dlt-filetransfer" - -do_install_append() { - rm -f ${D}${bindir}/dlt-test-* -} |