ico-vic-carsimulator: correct configure issue

Correct wrong include paths in src/Makefile.am.

Also update recipe.

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

diff --git a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator-extraconf.inc b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator-extraconf.inc
index e69de29..c146a60 100644 (file)
--- a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator-extraconf.inc
+++ b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator-extraconf.inc
@@ -0,0 +1,3 @@
+do_configure_prepend() {
+    sed -i 's@-I/usr/include/glib-2.0 -I/usr/include/json-glib-1.0 -I/usr/lib/glib-2.0/include@-I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/json-glib-1.0 -I${STAGING_LIBDIR}/glib-2.0/include@' src/Makefile.am
+}
\ No newline at end of file

diff --git a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
index 5b6b335..bfcb5f7 100644 (file)
--- a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
+++ b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "CarSimulator"
 HOMEPAGE = "http://nohomepage.org"
-SECTION = "System Environment/Daemons"
-LICENSE = "Apache 2.0"
+SECTION = "System/Utilities"
+LICENSE = "Apache-2.0"
 
 SRC_URI = ""
 
@@ -20,7 +20,6 @@ RDEPENDS = ""
 RDEPENDS_${PN} += "ico-vic-amb-plugin"
 RDEPENDS_${PN} += "eglibc"
 RDEPENDS_${PN} += "ico-uxf-utilities"
-RDEPENDS_${PN} += "glib-2.0"
 
 
 DEPENDS = ""
@@ -31,7 +30,6 @@ DEPENDS += "glib-2.0"
 DEPENDS += "json-glib"
 DEPENDS_append_class-native = " automake-native"
 DEPENDS_append_class-target = " automake-native"
-DEPENDS += "boost"
 
 do_prep() {
  cd ${S}
@@ -54,11 +52,9 @@ do_compile() {
   unset DISPLAY
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
   
-  autoreconf --install
-  
   
   autotools_do_configure
-  make -j16
+  oe_runmake -j16
   
   
   
@@ -66,7 +62,7 @@ do_compile() {
 EXTRA_OECONF += ""
 
 do_install() {
- echo export RPM_BUILD_ROOT=${D}
+ export RPM_BUILD_ROOT=${D}
  cd ${S}
  LANG=C
  export LANG
@@ -86,10 +82,10 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
  # configurations
- mkdir -p ${D}/etc/ico-vic-carsim/
- mkdir -p ${D}/usr/lib/systemd/user/
- install -m 0644 G25.conf ${D}/etc/ico-vic-carsim/
- install -m 0644 G27.conf ${D}/etc/ico-vic-carsim/
+ mkdir -p ${D}${sysconfdir}/ico-vic-carsim/
+ mkdir -p ${D}/lib/systemd/user
+ install -m 0644 G25.conf ${D}${sysconfdir}/ico-vic-carsim/
+ install -m 0644 G27.conf ${D}${sysconfdir}/ico-vic-carsim/
  install -m 0644 ico-vic-carsim.service ${D}/lib/systemd/user/ico-vic-carsim.service
  
  
@@ -113,8 +109,10 @@ PACKAGES += " ico-vic-carsimulator "
 ico-vic-carsimulator_files = ""
 ico-vic-carsimulator_files += "${prefix}/bin/ico-vic-carsim"
 ico-vic-carsimulator_files += "${prefix}/bin/*"
-ico-vic-carsimulator_files += "/etc/ico-vic-carsim/*"
-ico-vic-carsimulator_files += "/usr/lib/systemd/user/ico-vic-carsim.service"
+ico-vic-carsimulator_files += "${sysconfdir}/ico-vic-carsim/*"
+ico-vic-carsimulator_files += "/lib/systemd/user/ico-vic-carsim.service"
+CONFFILES_${PN} = ""
+CONFFILES_${PN} += "${sysconfdir}/ico-vic-carsim/*"
 MANIFESTFILES_${PN} = "ico-vic-carsimulator.manifest"
 
 FILES_${PN} = "${ico-vic-carsimulator_files}"

diff --git a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator_git.bb b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator_git.bb
index 1ca1294..282062e 100644 (file)
--- a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator_git.bb
+++ b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator_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/ico-vic-carsimulator;tag=0d3b74297286d2ce2260f498caeceddcd90c1a2a;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/ico-vic-carsimulator;tag=7f54d8d41f57877e3a701fd97fe0afdfaac1776e;nobranch=1"
 
 BBCLASSEXTEND += " native "