Fix ico-vic-amb-plugin

Change-Id: I890e2cf8d1246405e48890b30a742c7c63c7a6ce

diff --git a/recipes-tizen/ico-vic-amb-plugin/files/fix_remove_test_and_tools_build.patch b/recipes-tizen/ico-vic-amb-plugin/files/fix_remove_test_and_tools_build.patch
new file mode 100644 (file)
index 0000000..e577a3f
--- /dev/null
+++ b/recipes-tizen/ico-vic-amb-plugin/files/fix_remove_test_and_tools_build.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8f5666f..623db0b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,5 +51,4 @@ set(ico-vic-amb-plugin_docs README)
+ install (FILES ${ico-vic-amb-plugin_docs} DESTINATION ${DOC_INSTALL_DIR})
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests)
+ add_subdirectory(tool)

diff --git a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin-extraconf.inc b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin-extraconf.inc
index 24f80f7..0ffe0b1 100644 (file)
--- a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin-extraconf.inc
+++ b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin-extraconf.inc
@@ -1 +1,3 @@
-B="${S}"
+SRC_URI += " file://fix_remove_test_and_tools_build.patch"
+
+FILES_${PN}-dbg += "/usr/lib/automotive-message-broker/.debug"

diff --git a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc
index 81d6f48..312b15a 100644 (file)
--- a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc
+++ b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc
@@ -1,7 +1,7 @@
-DESCRIPTION = "Automotive Message Broker is a vehicle network abstraction system."
+DESCRIPTION = "Automotive Message Broker is a vehicle network abstraction system"
 HOMEPAGE = "http://nohomepage.org"
-SECTION = "System Environment/Daemons"
-LICENSE = "LGPL v2.1"
+SECTION = "Automotive/Other"
+LICENSE = "LGPL-2.1"
 
 SRC_URI = ""
 
@@ -17,7 +17,6 @@ PROVIDES = ""
 
 RDEPENDS = ""
 #RDEPENDS of ico-vic-amb-plugin (${PN})
-RDEPENDS_${PN} += "libjson"
 RDEPENDS_${PN} += "ico-uxf-utilities"
 RDEPENDS_${PN} += "eglibc"
 
@@ -36,6 +35,7 @@ do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q -n ico-vic-amb-plugin-0.9.5
+ cp ${S}/packaging/ico-vic-amb-plugin.manifest .
  
  
 }
@@ -66,8 +66,7 @@ do_compile() {
          -DBUILD_SHARED_LIBS:BOOL=ON \
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
          ${EXTRA_OECMAKE}
- 
- make -j16
+ oe_runmake -j16
  
  
  
@@ -93,9 +92,9 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  mkdir -p ${D}/${sysconfdir}/ambd
- mkdir -p ${D}/usr/bin
  cp src/AMBformat.conf ${D}/${sysconfdir}/ambd/
- cp tool/ico_set_vehicleinfo ${D}/usr/bin/ico_set_vehicleinfo
+ mkdir -p ${D}${prefix}/bin
+ cp tool/ico_set_vehicleinfo ${D}${prefix}/bin/ico_set_vehicleinfo
  
  
 }
@@ -118,8 +117,10 @@ PACKAGES += " ico-vic-amb-plugin "
 ico-vic-amb-plugin_files = ""
 ico-vic-amb-plugin_files += "${prefix}/lib/automotive-message-broker/*.so"
 ico-vic-amb-plugin_files += "${sysconfdir}/ambd/AMBformat.conf"
-ico-vic-amb-plugin_files += "/usr/share/doc/automotive-message-broker/ico-vic-amb-plugin/README"
-ico-vic-amb-plugin_files += "/usr/bin/ico_set_vehicleinfo"
+ico-vic-amb-plugin_files += "${prefix}/share/doc/automotive-message-broker/ico-vic-amb-plugin/README"
+ico-vic-amb-plugin_files += "${prefix}/bin/ico_set_vehicleinfo"
+CONFFILES_${PN} = ""
+CONFFILES_${PN} += "${sysconfdir}/ambd/AMBformat.conf"
 MANIFESTFILES_${PN} = "ico-vic-amb-plugin.manifest"
 
 FILES_${PN} = "${ico-vic-amb-plugin_files}"

diff --git a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin_git.bb b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin_git.bb
index f1b72f4..38a9a81 100644 (file)
--- a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin_git.bb
+++ b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin_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-amb-plugin;tag=743db049cbd153971aff0bcf1f002683cc7aebd3;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/ico-vic-amb-plugin;tag=02ef0382aa81212de4246c6e6074eb10c678007f;nobranch=1"
 
 BBCLASSEXTEND += " native "