summaryrefslogtreecommitdiffstats
path: root/meta-ivi/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ivi/recipes-extended')
-rw-r--r--meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb (renamed from meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.3.bb)11
-rw-r--r--meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb (renamed from meta-ivi/recipes-extended/common-api/common-api-c++_3.1.3.bb)11
-rw-r--r--meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb12
-rw-r--r--meta-ivi/recipes-extended/node-health-monitor/node-health-monitor/0001-change-service-name.patch27
-rw-r--r--meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb6
-rw-r--r--meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb9
-rw-r--r--meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_git.bb53
-rw-r--r--meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb16
-rw-r--r--meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb12
-rw-r--r--meta-ivi/recipes-extended/persistence-client-library/persistence-client-library-1.0.0/0001-Fix-cast-on-64bit-machines.patch35
-rw-r--r--meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-fix-exec-path.patch26
-rw-r--r--meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch29
-rw-r--r--meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb (renamed from meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.0.0.bb)21
-rw-r--r--meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb12
14 files changed, 142 insertions, 138 deletions
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.3.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb
index c1cfa71..1426d9c 100644
--- a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.3.bb
+++ b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb
@@ -2,21 +2,16 @@ SUMMARY = "CommonAPI-DBus"
SECTION = "libs"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
-PR = "r1"
+PR = "r0"
DEPENDS = "commonapi3 dbus"
REQUIRES = "commonapi3 dbus"
-SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;branch=master;tag=${PV}"
-
+SRCREV = "3348a422ffc756b63de5890356383858a898e8b1"
+SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git"
S = "${WORKDIR}/git"
EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr "
CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
-do_configure_prepend() {
- sed -i '/ set(${var} /c set(ABSOLUTE_${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") ' ${S}/CMakeLists.txt
- sed -i '/file(RELATIVE_PATH /c file(RELATIVE_PATH REL_INCLUDE_DIR "${ABSOLUTE_INSTALL_CMAKE_DIR}" "${ABSOLUTE_INSTALL_INCLUDE_DIR}") ' ${S}/CMakeLists.txt
-}
-
inherit cmake lib_package pkgconfig
FILES_${PN}-dev += "${libdir}/cmake"
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.3.bb b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb
index 064499d..66308d4 100644
--- a/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.3.bb
+++ b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb
@@ -3,18 +3,15 @@ SECTION = "libs"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
PROVIDES = "commonapi3"
-PR = "r1"
+PR = "r0"
inherit autotools cmake lib_package pkgconfig
-SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;branch=master;tag=${PV}"
+SRCREV = "77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407"
+SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git"
S = "${WORKDIR}/git"
EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr"
-do_configure_prepend () {
- sed -i '/ set(${var} /c set(ABSOLUTE_${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") ' ${S}/CMakeLists.txt
- sed -i '/file(RELATIVE_PATH /c file(RELATIVE_PATH REL_INCLUDE_DIR "${ABSOLUTE_INSTALL_CMAKE_DIR}" "${ABSOLUTE_INSTALL_INCLUDE_DIR}") ' ${S}/CMakeLists.txt
-}
-
FILES_${PN}-dev += "${libdir}/cmake"
+RDEPENDS_${PN} += "dlt-daemon"
diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
index 183e2e9..e117ad4 100644
--- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
+++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
@@ -15,12 +15,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \
DEPENDS = "dbus zlib"
-# FIX ME
-# This should be TAG = "v${PV}" but yocto doesn't support lightweight tags for now
-# https://bugzilla.yoctoproject.org/show_bug.cgi?id=6881
-TAG = "b8b3ea3a31f7deb681941a19878c82e7b7350ae7"
-BRANCH = "v2.11.x"
-SRC_URI = "git://git.projects.genivi.org/${PN}.git;branch=${BRANCH};tag=${TAG} \
+SRCREV = "b8b3ea3a31f7deb681941a19878c82e7b7350ae7"
+SRC_URI = "git://git.projects.genivi.org/${PN}.git;branch=v2.11.x \
file://0001-Fix-build-with-systemd-209.patch \
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
file://0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch \
@@ -42,3 +38,7 @@ SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable"
EXTRA_OECMAKE = "-DWITH_SYSTEMD=ON"
FILES_${PN}-doc += "/usr/share/dlt-filetransfer"
+
+do_install_append() {
+ rm -f ${D}${bindir}/dlt-test-*
+}
diff --git a/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor/0001-change-service-name.patch b/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor/0001-change-service-name.patch
new file mode 100644
index 0000000..21a4cc5
--- /dev/null
+++ b/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor/0001-change-service-name.patch
@@ -0,0 +1,27 @@
+From 15e991f5e36f896fa79e4fd851ba075c25e4ce0d Mon Sep 17 00:00:00 2001
+From: Yong-iL Joh <yong-il.joh@windriver.com>
+Date: Wed, 9 Mar 2016 17:30:32 +0900
+Subject: [PATCH] change service name
+
+---
+ cfg/node-health-monitor.service.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cfg/node-health-monitor.service.in b/cfg/node-health-monitor.service.in
+index a28ab39..9027b42 100644
+--- a/cfg/node-health-monitor.service.in
++++ b/cfg/node-health-monitor.service.in
+@@ -2,8 +2,8 @@
+
+ [Unit]
+ Description=node-health-monitor to observe system health
+-Requires=nodestatemanager-daemon.service dlt-daemon.service
+-After=nodestatemanager-daemon.service dlt-daemon.service
++Requires=nodestatemanager-daemon.service dlt.service
++After=nodestatemanager-daemon.service dlt.service
+
+ [Service]
+ Type=notify
+--
+1.9.1
+
diff --git a/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb b/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb
index 2d3c7a6..2ef9cdb 100644
--- a/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb
+++ b/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb
@@ -4,10 +4,10 @@ LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
PR = "r2"
-SRCREV = "851565499527e2d44047de3f6cbe9dd3a84a6c74"
-
-SRC_URI = "git://git.projects.genivi.org/lifecycle/node-health-monitor.git \
+SRCREV="851565499527e2d44047de3f6cbe9dd3a84a6c74"
+SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git \
file://fix-no-libsystemd-daemon.patch \
+ file://0001-change-service-name.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb b/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb
index d5cbc92..570677a 100644
--- a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb
+++ b/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
SUMMARY = "GENIVI Node Startup Controller"
DESCRIPTION = "The GENIVI Node Startup Controller \
- manages the Last User Context (LUC) \
@@ -14,18 +12,17 @@ SECTION = "base"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
-SRCREV = "717e743c84ef9c168501dcbc012c4212f1903581"
PR = "r4"
-SRC_URI = "git://git.projects.genivi.org/lifecycle/node-startup-controller.git;branch=genivi-excalibur \
+SRCREV = "717e743c84ef9c168501dcbc012c4212f1903581"
+SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git;branch=genivi-excalibur \
file://use-systemd-unit-dir.patch \
file://fix-no-libsystemd-daemon.patch \
"
+S = "${WORKDIR}/git"
DEPENDS = "glib-2.0 dlt-daemon systemd"
-S = "${WORKDIR}/git"
-
inherit autotools gtk-doc systemd
do_configure_prepend () {
mkdir -p ${S}/m4
diff --git a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_git.bb b/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_git.bb
deleted file mode 100644
index 0d3b90c..0000000
--- a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_git.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "GENIVI Node Startup Controller"
-DESCRIPTION = "The GENIVI Node Startup Controller \
- - manages the Last User Context (LUC) \
- - monitors node startup \
- and \
- - manages legacy applications within a node \
- "
-
-HOMEPAGE = "https://www.genivi.org/"
-SECTION = "base"
-
-LICENSE = "MPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
-
-SRCREV = "958e5ab2bc93ac0d885ca75f4f33988cbdd3e758"
-PV = "1.0.0+git${SRCPV}"
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.projects.genivi.org/lifecycle/node-startup-controller.git;protocol=git"
-
-DEPENDS = "glib-2.0 dlt-daemon systemd"
-
-S = "${WORKDIR}/git"
-
-inherit autotools gtk-doc
-do_configure_prepend () {
- mkdir m4
-}
-
-PACKAGES =+ "${PN}-nsm-dummy ${PN}-nsm-dummy-dbg"
-
-RRECOMMENDS_${PN} += "${PN}-nsm-dummy"
-
-
-FILES_${PN} += "\
- ${libdir}/${PN}-1/${PN} \
- ${libdir}/${PN}-1/legacy-app-handler \
- ${libdir}/systemd/system/${PN}.service \
- ${datadir}/dbus-1/system-services/org.genivi.NodeStartupController1.service \
- "
-FILES_${PN}-dbg += "\
- ${libdir}/${PN}-1/.debug/*ler \
- "
-FILES_${PN}-nsm-dummy = "\
- ${libdir}/${PN}-1/nsm-dummy \
- ${libdir}/systemd/system/nsm-dummy.service \
- ${datadir}/dbus-1/system-services/org.genivi.NodeStateManager.* \
- "
-FILES_${PN}-nsm-dummy-dbg = "\
- ${libdir}/${PN}-1/.debug/nsm-dummy \
- "
diff --git a/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb b/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb
index 59eccce..f2af33b 100644
--- a/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb
+++ b/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb
@@ -12,12 +12,12 @@ LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
SRCREV = "dd4a86b9459537d2e85489b36abf80f34d12f098"
-
-SRC_URI = "git://git.projects.genivi.org/lifecycle/node-state-manager.git \
+SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git \
file://nsm-fix-systemd-service-dep.patch \
file://nsm-fix-no-libsystemd-daemon.patch \
file://link-with-gio.patch \
"
+S = "${WORKDIR}/git"
PR = "r1"
@@ -25,8 +25,6 @@ EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-syste
DEPENDS = "dbus glib-2.0 dlt-daemon persistence-client-library systemd"
-S = "${WORKDIR}/git"
-
inherit pkgconfig autotools-brokensep systemd
SYSTEMD_PACKAGES = "${PN}"
@@ -45,7 +43,13 @@ FILES_SOLIBSDEV = ""
SOLIBS = "${SOLIBSDEV}"
FILES_${PN} += "\
- ${datadir}/dbus-1/system-services/org.genivi.NodeStateManager.LifeCycleControl.service \
+ ${datadir}/dbus-1/system-services \
+ ${datadir}/dbus-1/interfaces/org.genivi.NodeStateManager.*.xml \
${systemd_unitdir}/system/nodestatemanager-daemon.service \
"
-FILES_${PN}-dev += "${datadir}/dbus-1/interfaces/"
+
+do_install_append() {
+ rm -f ${D}${bindir}/NodeStateTest
+ rm -f ${D}${libdir}/libNodeStateMachineTest.*
+ rm -f ${D}${datadir}/dbus-1/interfaces/org.genivi.NodeStateMachineTest.xml
+}
diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb
index c90f53c..0f36220 100644
--- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb
+++ b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb
@@ -6,17 +6,17 @@ SECTION = "base"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
+SRCREV = "68016b6762f9cbd87a7196df26d2b6fc8fcba2c1"
SRC_URI = " \
- git://git.projects.genivi.org/persistence/persistence-administrator.git;tag=${PV} \
+ git://git.projects.genivi.org/persistence/persistence-administrator.git \
file://libsystemd_daemon.patch \
file://0001-Add-support-for-json-c-0.12.patch \
"
+S = "${WORKDIR}/git"
DEPENDS = "glib-2.0 dbus dlt-daemon libarchive zlib json-c node-state-manager \
systemd persistence-common-object libffi libitzam"
-S = "${WORKDIR}/git"
-
inherit autotools-brokensep systemd pkgconfig
FILES_${PN}-dev += "${datadir}/dbus-1/"
@@ -24,3 +24,9 @@ FILES_${PN}-dev += "${datadir}/dbus-1/"
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "pas-daemon.service"
SYSTEMD_AUTO_ENABLE = "disable"
+
+do_install_append() {
+ perl -pi -e 's/dbus-public-bus.service/dbus.service/' \
+ ${D}/lib/systemd/system/pas-daemon.service
+ rm -f ${D}${bindir}/pers_admin_test_framework
+}
diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library-1.0.0/0001-Fix-cast-on-64bit-machines.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library-1.0.0/0001-Fix-cast-on-64bit-machines.patch
deleted file mode 100644
index 4f86748..0000000
--- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library-1.0.0/0001-Fix-cast-on-64bit-machines.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d58ab09ddd9a6ce7f47a045ecb9bccb7d59109bd Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei.gherzan@windriver.com>
-Date: Sun, 17 May 2015 22:40:55 +0200
-Subject: [PATCH] Fix cast on 64bit machines
-
-Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
----
- src/persistence_client_library_dbus_service.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/persistence_client_library_dbus_service.c b/src/persistence_client_library_dbus_service.c
-index c3c2624..84bbb0a 100644
---- a/src/persistence_client_library_dbus_service.c
-+++ b/src/persistence_client_library_dbus_service.c
-@@ -286,7 +286,7 @@ static void removeWatch(DBusWatch *watch, void *data)
-
- (void)data;
-
-- DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("removeWatch called "), DLT_INT( (int)watch) );
-+ DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("removeWatch called "), DLT_INT( (long)watch) );
-
- if(w_data)
- free(w_data);
-@@ -299,7 +299,7 @@ static void removeWatch(DBusWatch *watch, void *data)
- static void watchToggled(DBusWatch *watch, void *data)
- {
- (void)data;
-- DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("watchToggled called "), DLT_INT( (int)watch) );
-+ DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("watchToggled called "), DLT_INT( (long)watch) );
-
- if(dbus_watch_get_enabled(watch))
- addWatch(watch, data);
---
-2.1.0
-
diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-fix-exec-path.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-fix-exec-path.patch
new file mode 100644
index 0000000..45ca6cd
--- /dev/null
+++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-fix-exec-path.patch
@@ -0,0 +1,26 @@
+From f658846d8bf13f00e2d39b951f7811d2a6fa1f51 Mon Sep 17 00:00:00 2001
+From: Yong-iL Joh <yong-il.joh@windriver.com>
+Date: Tue, 23 Feb 2016 20:38:13 +0900
+Subject: [PATCH] fix exec path
+
+Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
+---
+ test/persistence_client_library_test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/persistence_client_library_test.c b/test/persistence_client_library_test.c
+index 7382ab4..fd92be1 100644
+--- a/test/persistence_client_library_test.c
++++ b/test/persistence_client_library_test.c
+@@ -1578,7 +1578,7 @@ END_TEST
+ START_TEST(test_PAS_DbusInterface)
+ {
+ // let the administration servis generate a message to the PCL
+- if(system("/usr/local/bin/persadmin_tool export /tmp/myBackup 0") == -1)
++ if(system("/usr/bin/persadmin_tool export /tmp/myBackup 0") == -1)
+ {
+ printf("Failed to execute command -> admin service!!\n");
+ }
+--
+1.9.1
+
diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch
new file mode 100644
index 0000000..5bf6aae
--- /dev/null
+++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch
@@ -0,0 +1,29 @@
+From 58c25a1bee0e65aa273af3958675b9db398851ee Mon Sep 17 00:00:00 2001
+From: Igor Socec <igor.socec@pelagicore.com>
+Date: Thu, 25 Feb 2016 09:52:15 +0100
+Subject: [PATCH] load correct version of libpers_common
+
+Signed-off-by: Igor Socec <igor.socec@pelagicore.com>
+---
+ config/pclCustomLibConfigFile.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg
+index fe95ea0..f8e0877 100644
+--- a/config/pclCustomLibConfigFile.cfg
++++ b/config/pclCustomLibConfigFile.cfg
+@@ -1,8 +1,8 @@
+ hwinfo /usr/lib/libhwinfoperscustom.so init async
+ secure /usr/lib/libsecureperscustom.so od sync
+ custom3 /usr/lib/libcustom3perscustom.so init sync
+-default /usr/lib/libpers_common.so.1 init sync
++default /usr/lib/libpers_common.so.0 init sync
+ emergency /usr/lib/libemergencyperscustom.so od async
+ early /usr/lib/libearlyperscustom.so od sync
+ anInvalidEntry /wrongPath/wrongLib do cnys
+-custom2 /usr/lib/libcustom2perscustom.so init sync
+\ No newline at end of file
++custom2 /usr/lib/libcustom2perscustom.so init sync
+--
+2.1.4
+
diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.0.0.bb b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb
index 0054e30..bbaf9a5 100644
--- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.0.0.bb
+++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb
@@ -1,7 +1,7 @@
SUMMARY = "GENIVI Persistence Client Library"
DESCRIPTION = "The Persistence Management is responsible to handle \
-persistent data, including all data read and modified often during \
-a lifetime of an infotainment system."
+ persistent data, including all data read and modified often during \
+ a lifetime of an infotainment system."
HOMEPAGE = "http://projects.genivi.org/persistence-client-library"
BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Persistence"
LICENSE = "MPLv2"
@@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6161c6840f21a000e9b52af81d2ca823"
DEPENDS = "dlt-daemon dbus libcheck persistence-common-object"
+SRCREV = "4b503da99c6b04ad21a197dafe6e7243187c7c7e"
SRC_URI = " \
- git://git.projects.genivi.org/persistence/persistence-client-library.git;tag=v${PV} \
- file://0001-Fix-cast-on-64bit-machines.patch \
+ git://git.projects.genivi.org/persistence/persistence-client-library.git \
+ file://0001-load-correct-version-of-libpers_common.patch \
+ file://0001-fix-exec-path.patch \
"
S = "${WORKDIR}/git"
@@ -19,11 +21,18 @@ inherit pkgconfig autotools-brokensep
PARALLEL_MAKE = ""
-FILES_${PN} = " \
- ${libdir}/*.so \
+# .so files are the actual libraries
+FILES_SOLIBSDEV = ""
+#SOLIBS = "${SOLIBSDEV}"
+
+FILES_${PN} += " \
+ ${libdir}/lib*custom.so \
${libdir}/*.so.* \
${sysconfdir} \
"
+FILES_${PN}-dev += " \
+ ${libdir}/libpersistence_client_library.so \
+ "
do_install_append() {
install -d ${D}${sysconfdir}/dbus-1/system.d
diff --git a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb
index dd9e4fe..2ba5c88 100644
--- a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb
+++ b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb
@@ -5,19 +5,21 @@ SECTION = "base"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
+SRCREV = "b27fe577fcef7bf57d8d287f56e8dfd6ac60b1f0"
SRC_URI = " \
- git://git.projects.genivi.org/persistence/persistence-common-object.git;tag=${PV} \
+ git://git.projects.genivi.org/persistence/persistence-common-object.git \
file://configure.ac-fix-typo.patch \
file://B251_typedef_uint64_t.patch \
"
-#link for bug 251 in bugzilla https://bugs.genivi.org/show_bug.cgi?id=251
+S = "${WORKDIR}/git"
DEPENDS = "glib-2.0 libitzam dlt-daemon"
-S = "${WORKDIR}/git"
-
inherit autotools-brokensep pkgconfig
-EXTRA_OECONF = "--with-dbuspolicydir=${sysconfdir}"
+EXTRA_OECONF = " \
+ --with-dbuspolicydir=${sysconfdir} \
+ --with-database=key-value-store \
+ "
FILES_${PN} += "${datadir}"