aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-09-21 18:29:42 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-09-23 10:13:16 +0900
commit16c78f7c57f2dd6e15c517233bd6a042ca58ef0b (patch)
treef973c6a1f85d69e83d63ba9f02d0b9e00b48a6e7
parent482b222ea4306632df3c3e65a98c3cbff248d0db (diff)
downloadmeta-ivi-16c78f7c57f2dd6e15c517233bd6a042ca58ef0b.tar.gz
meta-ivi-16c78f7c57f2dd6e15c517233bd6a042ca58ef0b.tar.bz2
meta-ivi-16c78f7c57f2dd6e15c517233bd6a042ca58ef0b.zip
audiomanager: add version 7.0
Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend27
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend (renamed from meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend)4
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc34
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc (renamed from meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc)0
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch95
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend22
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend (renamed from meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend)7
-rw-r--r--meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch60
-rw-r--r--meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb67
-rw-r--r--meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb33
10 files changed, 344 insertions, 5 deletions
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend
new file mode 100644
index 0000000..ba56fef
--- /dev/null
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend
@@ -0,0 +1,27 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+SRC_URI_append += " \
+ file://${BPN}_t.inc \
+ "
+
+EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF"
+EXTRA_OECMAKE_append = " -DWITH_TESTS=ON -DUSE_BUILD_LIBS=OFF \
+ -DTEST_EXECUTABLE_INSTALL_PATH=/opt/tests/${PN}/ \
+ -Dgmock_build_tests=ON -Dgtest_build_samples=ON -Dgtest_build_tests=ON \
+ -DCMAKE_SKIP_RPATH=ON \
+ "
+
+do_install_append() {
+ mkdir -p ${D}/opt/tests/${PN}
+
+ for i in `find ${B}/bin/ -type f -regex '.*[tT]est.*'`; do
+ install -m 0755 ${i} ${D}/opt/tests/${PN}
+ done
+ install -m 0755 ${B}/googleMock/gtest/libgtest_dll.so ${D}/opt/tests/${PN}
+
+ install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
+}
+
+PACKAGES += " ${PN}-test"
+
+FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* "
+FILES_${PN}-test = "/opt/tests/${PN}/ "
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend
index 5a90214..0647b46 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend
@@ -19,10 +19,10 @@ do_install_append() {
install -m 0755 ${i} ${D}/opt/tests/${PN}
done
- install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
+ install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
}
PACKAGES += " ${PN}-test"
FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* "
-FILES_${PN}-test = "/opt/tests/${PN}/* "
+FILES_${PN}-test = "/opt/tests/${PN}/ "
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc
new file mode 100644
index 0000000..a4111e3
--- /dev/null
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc
@@ -0,0 +1,34 @@
+#!/bin/sh
+get_list() {
+ return 4
+}
+
+get_title() {
+ echo "audiomanagerplugins"
+}
+
+_run_dir=/opt/tests/audiomanagerplugins
+_run() {
+ if [ "x${2}" != "x" ]; then
+ ${_run_dir}/$1 > /tmp/t
+ tail /tmp/t | grep -E 'PASS|FAIL'
+ else
+ ${_run_dir}/$1
+ fi
+}
+
+run_1() {
+ _run AmCommandSenderCAPITest $*
+}
+
+run_2() {
+ _run AmControlReceiverShadowTest $*
+}
+
+run_3() {
+ _run AmRoutingInterfaceCAPITests $*s
+}
+
+run_4() {
+ _run AmRoutingReceiveAsyncTest $*
+}
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc
index d72db30..d72db30 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch
new file mode 100644
index 0000000..9386af2
--- /dev/null
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch
@@ -0,0 +1,95 @@
+diff --git a/PluginCommandInterfaceCAPI/CMakeLists.txt b/PluginCommandInterfaceCAPI/CMakeLists.txt
+index a5ec2fc..5e8e4fe 100644
+--- a/PluginCommandInterfaceCAPI/CMakeLists.txt
++++ b/PluginCommandInterfaceCAPI/CMakeLists.txt
+@@ -31,12 +31,6 @@ if (NOT DAEMONVERSION)
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif(NOT TARGET gtest)
+- endif(WITH_TESTS)
+-
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+ message(FATAL_ERROR "Could not find audiomanager cmake configuration")
+diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt
+index 225fdc6..d6ef7e8 100644
+--- a/PluginCommandInterfaceDbus/CMakeLists.txt
++++ b/PluginCommandInterfaceDbus/CMakeLists.txt
+@@ -26,11 +26,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif()
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt
+index 137ca8f..53d71f3 100644
+--- a/PluginControlInterface/CMakeLists.txt
++++ b/PluginControlInterface/CMakeLists.txt
+@@ -29,11 +29,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif()
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt
+index 85a7a04..010b7ee 100644
+--- a/PluginRoutingInterfaceAsync/CMakeLists.txt
++++ b/PluginRoutingInterfaceAsync/CMakeLists.txt
+@@ -29,11 +29,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif()
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+diff --git a/PluginRoutingInterfaceCAPI/CMakeLists.txt b/PluginRoutingInterfaceCAPI/CMakeLists.txt
+index 7b4b1af..bf52e4a 100644
+--- a/PluginRoutingInterfaceCAPI/CMakeLists.txt
++++ b/PluginRoutingInterfaceCAPI/CMakeLists.txt
+@@ -30,11 +30,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif()
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+diff --git a/PluginRoutingInterfaceDBus/CMakeLists.txt b/PluginRoutingInterfaceDBus/CMakeLists.txt
+index e08b591..09a0696 100644
+--- a/PluginRoutingInterfaceDBus/CMakeLists.txt
++++ b/PluginRoutingInterfaceDBus/CMakeLists.txt
+@@ -26,9 +26,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend
new file mode 100644
index 0000000..cda5a2c
--- /dev/null
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend
@@ -0,0 +1,22 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+SRC_URI_append += " \
+ file://remove_add_gmock.patch \
+ file://${BPN}_t-${PV}.inc \
+ "
+
+EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF"
+EXTRA_OECMAKE_append = " -DWITH_TEST_CONTROLLER=ON -DWITH_TESTS=ON"
+
+DEPENDS += "gtest gmock"
+
+do_install_append() {
+ make plugin-test-install
+ mv ${D}/opt/tests/audiomanager ${D}/opt/tests/${PN}
+
+ install -m 0755 ${WORKDIR}/${BPN}_t-${PV}.inc ${D}/opt/tests/${PN}/${BPN}_t.inc
+}
+
+PACKAGES += " ${PN}-test"
+
+FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* "
+FILES_${PN}-test = "/opt/tests/${PN}/ "
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend
index 3692ff2..356808c 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend
@@ -1,8 +1,9 @@
FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
SRC_URI_append += " \
- file://${BPN}_t.inc \
+ file://${BPN}_t-${PV}.inc \
"
+EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF"
EXTRA_OECMAKE_append = " -DWITH_TEST_CONTROLLER=ON -DWITH_TESTS=ON"
DEPENDS += "gtest gmock"
@@ -10,10 +11,10 @@ DEPENDS += "gtest gmock"
do_install_append() {
mv ${D}/opt/tests/audiomanager ${D}/opt/tests/${PN}
- install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
+ install -m 0755 ${WORKDIR}/${BPN}_t-${PV}.inc ${D}/opt/tests/${PN}/${BPN}_t.inc
}
PACKAGES += " ${PN}-test"
FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* "
-FILES_${PN}-test = "/opt/tests/${PN}/* "
+FILES_${PN}-test = "/opt/tests/${PN}/ "
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch
new file mode 100644
index 0000000..3f2c2ef
--- /dev/null
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch
@@ -0,0 +1,60 @@
+From d214197c418945f8ae8ad72a7173c6b83a808ef0 Mon Sep 17 00:00:00 2001
+From: Clement Dransart <clement.dransart@awtce.be>
+Date: Fri, 17 Jun 2016 10:40:36 +0200
+Subject: [audiomanager][PATCH] audiomanager: fix lib install path for multilib
+
+Signed-off-by: Clement Dransart <clement.dransart@awtce.be>
+---
+ CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d4e3cb5..0004b07 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -169,13 +169,13 @@ if(USE_BUILD_LIBS)
+ endif(NOT DEFINED CONTROLLER_PLUGIN)
+ else(USE_BUILD_LIBS)
+ if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR)
+- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command")
++ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command")
+ endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR)
+ if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR)
+- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing")
++ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing")
+ endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR)
+ if(NOT DEFINED CONTROLLER_PLUGIN)
+- set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so")
++ set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_LIBDIR}/control/libPluginControlInterface.so")
+ endif(NOT DEFINED CONTROLLER_PLUGIN)
+ endif(USE_BUILD_LIBS)
+
+@@ -228,7 +228,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG")
+
+ configure_package_config_file (
+ ${CMAKE_SOURCE_DIR}/cmake/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake
+- INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
+ PATH_VARS AUDIO_INCLUDE_FOLDER )
+
+ write_basic_package_version_file(
+@@ -237,14 +237,14 @@ write_basic_package_version_file(
+ COMPATIBILITY SameMajorVersion )
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake
+- DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
+ COMPONENT dev)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/config.h
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX}
+ COMPONENT dev)
+
+ configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanager.pc.in ${CMAKE_BINARY_DIR}/audiomanager.pc @ONLY )
+-install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel)
++install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel)
+
+ add_subdirectory (AudioManagerDaemon)
+
+--
+1.9.1
+
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb
new file mode 100644
index 0000000..912076b
--- /dev/null
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb
@@ -0,0 +1,67 @@
+SUMMARY = "Genivi AudioManager"
+HOMEPAGE = "https://www.genivi.org/"
+SECTION = "multimedia"
+
+LICENSE = "MPLv2"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5"
+PR = "r1"
+
+DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager"
+
+SRCREV = "8725157e248c6706de59a02996f869b6ccdccb13"
+SRC_URI = " \
+ git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \
+ file://AudioManager.service \
+ file://setup_amgr.sh \
+ file://0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch \
+ "
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig systemd
+
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "AudioManager.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
+OECMAKE_CXX_FLAGS +="-ldl"
+EXTRA_OECMAKE = " -DWITH_TESTS=OFF"
+
+FILES_${PN} = " \
+ ${bindir}/* \
+ ${systemd_unitdir}/AudioManager.service \
+ ${systemd_unitdir}/scripts/setup_amgr.sh \
+ "
+FILES_${PN}-dev += " \
+ ${libdir}/* \
+ /usr/share/cmake/Modules/* \
+ "
+do_install_append() {
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ mkdir -p ${D}${systemd_unitdir}/scripts/
+ install -m 0755 ${WORKDIR}/setup_amgr.sh ${D}${systemd_unitdir}/scripts/setup_amgr.sh
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/AudioManager.service ${D}${systemd_unitdir}/system
+ fi
+
+ install -d 0755 ${D}/usr/share/cmake/Modules
+ for i in `ls ${S}/cmake/*.cmake`; do
+ install -m 0644 ${i} ${D}/usr/share/cmake/Modules
+ done
+ perl -pi -e 's|COMMAND find "/usr/local/share/CommonAPI-\${CommonAPI_VERSION}"|COMMAND find "${PSEUDO_PREFIX}/share"|' \
+ ${D}/usr/share/cmake/Modules/CommonAPI.cmake
+
+ C_CMAKE=${D}${libdir}/cmake/audiomanagerConfig.cmake
+ perl -pi -e 's|;${S}/cmake||' ${C_CMAKE}
+ perl -pi -e 's|;(.*)/usr/share/cmake/Modules/||' ${C_CMAKE}
+ perl -pi -e 's|set\(WITH_TESTS|#set\(WITH_TESTS|' ${C_CMAKE}
+ perl -pi -e 's|.*set_and_check\(GOOGLE_MOCK_PROJECT_FOLDER \"(.+)\"\)\n||' ${C_CMAKE}
+ perl -pi -e 's|GOOGLE_TEST_INCLUDE_DIR \"(.+)\"|GOOGLE_TEST_INCLUDE_DIR \"${PKG_CONFIG_SYSROOT_DIR}/usr/include/gtest\"|' ${C_CMAKE}
+ perl -pi -e 's|GMOCK_INCLUDE_DIR \"(.+)\"|GMOCK_INCLUDE_DIR \"${PKG_CONFIG_SYSROOT_DIR}/usr/include/gmock\"|' ${C_CMAKE}
+# perl -pi -e \
+# 's/set_and_check\(CMAKE_MODULE_PATH/#set_and_check\(CMAKE_MODULE_PATH/' \
+# ${D}${libdir}/cmake/audiomanagerConfig.cmake
+}
+
+python do_qa_staging() {
+ bb.note("QA checking staging - SKIP")
+}
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb
new file mode 100644
index 0000000..035fa6b
--- /dev/null
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Genivi AudioManager Plugins"
+HOMEPAGE = "https://www.genivi.org/"
+SECTION = "multimedia"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
+
+DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native"
+
+SRCREV = "a0ed3b8f05147e9240d941655488d505057bbae7"
+SRC_URI = " \
+ git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \
+ file://build-fixup.patch \
+ "
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE = " -DWITH_TESTS=OFF \
+ -DWITH_COMMAND_INTERFACE_COMMON_CAPI=ON -DWITH_COMMAND_INTERFACE_DBUS=ON \
+ -DWITH_ROUTING_INTERFACE_CAPI=ON -DWITH_ROUTING_INTERFACE_DBUS=ON \
+ -DWITH_ROUTING_INTERFACE_ASYNC=ON \
+ "
+
+FILES_${PN} += " \
+ ${libdir}/* \
+ /usr/share/* \
+ "
+
+do_install_append() {
+ mv ${D}${libdir}/audiomanager/* ${D}${libdir}
+ rmdir ${D}${libdir}/audiomanager
+}