genivi-audio-manager: correct build issues

* Use Yocto cmake functions.
* Add missing debug files
* Prevent packaging from failing because a non dev package a symlink
  (use of "INSANE_SKIP").
* Update generated recipe.

Change-Id: I5fe93eadcc9d8688faa0920a27040f78a54a8ee7
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc b/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc
index e69de29..4cdb141 100644 (file)
--- a/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc
+++ b/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc
@@ -0,0 +1,30 @@
+inherit pkgconfig cmake
+
+INSANE_SKIP_${PN} = "dev-so"
+
+EXTRA_OECMAKE += " \
+                    -DUSE_BUILD_LIBS=OFF \
+                    -DWITH_TESTS=OFF \
+                    -DWITH_DBUS_WRAPPER=ON \
+                    -DWITH_NSM=OFF \
+                    -DCMAKE_INSTALL_PREFIX=/usr \
+                    "
+
+cmake_do_install_append() {
+
+    export RPM_BUILD_ROOT=${D}
+
+    rm -f ${D}${infodir}/dir
+
+    find ${D} -regex ".*\.la$" | xargs rm -f --
+    find ${D} -regex ".*\.a$" | xargs rm -f -- DESTDIR=$RPM_BUILD_ROOT
+
+    mkdir $RPM_BUILD_ROOT${prefix}/include/genivi-audio-manager
+    mv $RPM_BUILD_ROOT${prefix}/include/*.h $RPM_BUILD_ROOT${prefix}/include/command $RPM_BUILD_ROOT${prefix}/include/control $RPM_BUILD_ROOT${prefix}/include/routing $RPM_BUILD_ROOT${prefix}/include/shared $RPM_BUILD_ROOT${prefix}/include/genivi-audio-manager
+    rm $RPM_BUILD_ROOT${prefix}/lib/audioManager/routing/libPluginRoutingInterfaceAsync.so*
+}
+
+FILES_${PN}-dbg += "${prefix}/lib/audioManager/command/.debug/libPluginCommandInterfaceDbus.so.2.0"
+FILES_${PN}-dbg += "${prefix}/lib/audioManager/control/.debug/libPluginControlInterfaceDbus.so.2.0"
+FILES_${PN}-dbg += "${prefix}/lib/audioManager/control/.debug/libPluginControlInterface.so.2.0"
+FILES_${PN}-dbg += "${prefix}/lib/audioManager/routing/.debug/libPluginRoutingInterfaceDbus.so.2.0"

diff --git a/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc b/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc
index 594d330..0f6c422 100644 (file)
--- a/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc
+++ b/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc
@@ -59,19 +59,19 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
- mkdir build
+ mkdir -p build
  cd build
  
  cmake -DUSE_BUILD_LIBS=OFF -DWITH_TESTS=OFF -DWITH_DBUS_WRAPPER=ON -DWITH_NSM=OFF -DCMAKE_INSTALL_PREFIX=/usr ..
  #make VERBOSE=1
- make -j16 
+ oe_runmake -j16
  
  
  
 }
 
 do_install() {
- echo export RPM_BUILD_ROOT=${D}
+ export RPM_BUILD_ROOT=${D}
  cd ${S}
  LANG=C
  export LANG
@@ -81,7 +81,15 @@ do_install() {
  
  rm -rf "$RPM_BUILD_ROOT"
  cd build
- make install DESTDIR=$RPM_BUILD_ROOT
+ 
+   oe_runmake \
+         DESTDIR=${D} \
+         INSTALL_ROOT=${D} \
+         BINDIR=${prefix}/bin \
+   install  
+   rm -f ${D}${infodir}/dir 
+   find ${D} -regex ".*\.la$" | xargs rm -f -- 
+   find ${D} -regex ".*\.a$" | xargs rm -f -- DESTDIR=$RPM_BUILD_ROOT
  mkdir $RPM_BUILD_ROOT${prefix}/include/genivi-audio-manager
  mv $RPM_BUILD_ROOT${prefix}/include/*.h $RPM_BUILD_ROOT${prefix}/include/command $RPM_BUILD_ROOT${prefix}/include/control $RPM_BUILD_ROOT${prefix}/include/routing $RPM_BUILD_ROOT${prefix}/include/shared $RPM_BUILD_ROOT${prefix}/include/genivi-audio-manager
  rm $RPM_BUILD_ROOT${prefix}/lib/audioManager/routing/libPluginRoutingInterfaceAsync.so*

diff --git a/recipes-tizen/genivi-audio-manager/genivi-audio-manager_git.bb b/recipes-tizen/genivi-audio-manager/genivi-audio-manager_git.bb
index e9ef86d..e508d5a 100644 (file)
--- a/recipes-tizen/genivi-audio-manager/genivi-audio-manager_git.bb
+++ b/recipes-tizen/genivi-audio-manager/genivi-audio-manager_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/profile/ivi/genivi/genivi-audio-manager;tag=c408bbaa028e734b541f08fe4cff122b3da4c4ec;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/genivi/genivi-audio-manager;tag=ecbfb15600353a7191cdeca2e0148832bf79e1e2;nobranch=1"
 
 BBCLASSEXTEND += " native "