From 4d7db4b62f828083bd7c13db70d38e272f48d77a Mon Sep 17 00:00:00 2001
From: =?utf8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
Date: Fri, 22 Aug 2014 17:15:34 +0200
Subject: [PATCH] wailand-ivi-extension: correct build issues
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* Use yocto built-in cmake functions.
* Correct paths for the prep() and install() sections.
* Update recipe.

Change-Id: Ie6ad2d160426dad1d06c7ebb3e84687b00f711c8
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
---
 .../wayland-ivi-extension-extraconf.inc            | 43 ++++++++++++++++++++++
 .../wayland-ivi-extension.inc                      |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc
index e69de29..2037263 100644
--- a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc
+++ b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc
@@ -0,0 +1,43 @@
+inherit pkgconfig cmake
+
+EXTRA_OECMAKE += " \
+                    -DCMAKE_VERBOSE_MAKEFILE=ON \
+                    -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+                    -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
+                    -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
+                    -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
+                    -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
+                    -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
+                    -DCMAKE_SKIP_RPATH:BOOL=ON \
+                    -DBUILD_SHARED_LIBS:BOOL=ON \
+                    "
+
+do_prep() {
+
+    cd ${S}
+    chmod -Rf a+rX,u+w,g-w,o-w ${S}
+    cp ${S}/packaging/genivi-shell.manifest .
+
+    ${STAGING_BINDIR_NATIVE}/wayland-scanner code < protocol/ivi-controller.xml > protocol/ivi-controller-protocol.c
+}
+
+cmake_do_install_append() {
+
+    rm -f ${D}${infodir}/dir
+
+    find ${D} -regex ".*\.la$" | xargs rm -f --
+    find ${D} -regex ".*\.a$" | xargs rm -f --
+
+    install -d ${D}/${prefix}/share/genivi-shell/protocol/
+    pwd
+    install -m 644 ${S}/protocol/ivi-application.xml ${D}/${prefix}/share/genivi-shell/protocol/
+    install -m 644 ${S}/protocol/ivi-controller.xml ${D}/${prefix}/share/genivi-shell/protocol/
+    install -m 644 protocol/ivi-application-server-protocol.h ${D}/${prefix}/share/genivi-shell/protocol/
+    install -m 644 protocol/ivi-application-protocol.c ${D}/${prefix}/share/genivi-shell/protocol/
+    install -m 644 protocol/ivi-controller-server-protocol.h ${D}/${prefix}/share/genivi-shell/protocol/
+    install -m 644 protocol/ivi-controller-protocol.c ${D}/${prefix}/share/genivi-shell/protocol/
+}
+
+PACKAGES += " genivi-shell-dbg "
+
+FILES_genivi-shell-dbg = "${prefix}/lib/weston/.debug/ivi-controller.so"
diff --git a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc
index 829c331..c2aef79 100644
--- a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc
+++ b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc
@@ -82,7 +82,7 @@ do_compile() {
 }
 
 do_install() {
- echo export RPM_BUILD_ROOT=${D}
+ export RPM_BUILD_ROOT=${D}
  cd ${S}
  LANG=C
  export LANG
-- 
2.7.4