diff options
4 files changed, 13 insertions, 15 deletions
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc index ea9b942..fe45729 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc @@ -1,6 +1,6 @@ #!/bin/sh get_list() { - return 7 + return 6 } get_title() { @@ -40,7 +40,3 @@ run_5() { run_6() { _run AmSocketHandlerTest $* } - -run_7() { - _run AmTelnetServerTest $* -} diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend index 0647b46..50e695f 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend @@ -15,7 +15,7 @@ DEPENDS += "gtest gmock" do_install_append() { mkdir -p ${D}/opt/tests/${PN} - for i in `find ${B}/bin/ -type f -regex '.*[tT]est.*'`; do + for i in `find ${B}/ -type f -regex '.*[tT]est'`; do install -m 0755 ${i} ${D}/opt/tests/${PN} done diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb index 4144bd9..907f771 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb @@ -1,18 +1,18 @@ 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 = "5bcd206b9270d9a79e212f91723ea1a08a4d4859" +SRCREV = "fe056279dde92475f29a35f8c0c6c5a41dc59a8b" SRC_URI = " \ - git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ + git://github.com/GENIVI/AudioManager.git;protocol=https \ file://AudioManager.service \ file://setup_amgr.sh \ - file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ " S = "${WORKDIR}/git" diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb index aa731d7..d8603af 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb @@ -1,16 +1,17 @@ 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" +PR = "r1" + DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native" RDEPENDS_${PN} += "libxml2" -SRCREV = "8096eee2649585d13464b23e9ab940f0e030c56a" +SRCREV = "cb5797de3df41f4661c3055b0ea1a3e677c293aa" SRC_URI = " \ - git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \ + git://github.com/GENIVI/AudioManagerPlugins.git;branch=master;protocol=https \ file://AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch \ " S = "${WORKDIR}/git" @@ -29,6 +30,8 @@ do_configure_prepend() { perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager/AudioManagerCore\)|' ${S}/CMakeLists.txt perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager\)|' ${S}/CMakeLists.txt + perl -pi -e 's|\${CMAKE_INSTALL_PREFIX}/etc/controllerconf|/etc/controllerconf|' ${S}/PluginControlInterfaceGeneric/CMakeLists.txt + perl -pi -e 's|set\(LIBRARY_OUTPUT_PATH \${DEFAULT_PLUGIN_ROUTING_DIR}\)|set\(LIBRARY_OUTPUT_PATH ${B}\)|' ${S}/PluginRouting*/CMakeLists.txt perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake @@ -49,7 +52,6 @@ FILES_${PN}-dev = " \ " do_install_append() { - mv ${D}${libdir}/audiomanager/routing/* ${D}${libdir}/routing/ - rmdir ${D}${libdir}/audiomanager/routing + mv ${D}${libdir}/audiomanager/* ${D}${libdir}/ rmdir ${D}${libdir}/audiomanager } |