genivi-shell: update build fixes

The recent spec2yocto refresh led to different build rules.
The wayland-scanner invocation is now in the .inc file and needs
to be fixed there.

We also must ensure that it happens as part of do_compile,
because the wayland-native dependency is only guaranteed to
be resolved for that task and not the earlier do_patch.

Change-Id: I5890e7a47d96799eceb7f5a425386af8e6b0a436

diff --git a/meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell-extraconf.inc b/meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell-extraconf.inc
index bfd8a83..2e9fa94 100644 (file)
--- a/meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell-extraconf.inc
+++ b/meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell-extraconf.inc
@@ -5,16 +5,9 @@ INSANE_SKIP_${PN}-dev = "staticdev"
 
 B="${S}"
 
-do_prep() {
-    cd ${S}
-    chmod -Rf a+rX,u+w,g-w,o-w ${S}
-    cp ${S}/packaging/genivi-shell.manifest .
-}
-
-do_compile_prepend() {
+do_prep_prepend() {
     cd ${S}
 
-    ${STAGING_BINDIR_NATIVE}/wayland-scanner code < protocol/ivi-controller.xml > protocol/ivi-controller-protocol.c
     sed -i "s@\${LIBS} \${WESTON_LIBDIR}/weston/ivi-shell.so@\${LIBS} ${PKG_CONFIG_SYSROOT_DIR}\${WESTON_LIBDIR}/weston/ivi-shell.so@g" ${S}/weston-ivi-shell/CMakeLists.txt 
 }
 

diff --git a/meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc b/meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc
index 42aba90..cac2696 100644 (file)
--- a/meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc
+++ b/meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc
@@ -37,23 +37,23 @@ DEPENDS += "weston"
 DEPENDS += "wayland"
 DEPENDS += "libffi"
 
-do_prep() {
+do_compile_prepend() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
  cp ${S}/packaging/genivi-shell.manifest .
- 
- /usr/bin/wayland-scanner code < protocol/ivi-controller.xml \
+
+ ${STAGING_BINDIR_NATIVE}/wayland-scanner code < protocol/ivi-controller.xml \
      > protocol/ivi-controller-protocol.c
- 
+
  cat ivi-extension-protocol.pc.in \
      | sed s\#@libdir@\#${prefix}/lib\#g \
      | sed s\#@includedir@\#${prefix}/include/genivi-shell\#g \
      | sed s\#@name@\#genivi-shell\#g \
      | sed s\#@package_version@\#0.2.5\#g \
      > ivi-extension-protocol.pc
- 
- 
+
+
    cmake \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
          -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
@@ -66,11 +66,8 @@ do_prep() {
          -DBUILD_SHARED_LIBS:BOOL=ON \
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
          ${EXTRA_OECMAKE} .
- 
- 
-}
-do_patch_append() {
-    bb.build.exec_func('do_prep', d)
+
+
 }
 
 do_configure() {