aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Socec <igor.socec@pelagicore.com>2016-02-25 10:21:07 +0100
committerYong-iL Joh <yong-il.joh@windriver.com>2016-02-27 00:11:09 +0900
commit78adfc41c48e93b93ca283762fb11a85d9dd01b1 (patch)
tree9bad865d8c8488c883c045888f4bb271b85cc676
parente7bbc1a96e8a91c897d3e024046bafb6ab454fb9 (diff)
downloadmeta-ivi-78adfc41c48e93b93ca283762fb11a85d9dd01b1.tar.gz
meta-ivi-78adfc41c48e93b93ca283762fb11a85d9dd01b1.tar.bz2
meta-ivi-78adfc41c48e93b93ca283762fb11a85d9dd01b1.zip
PCL: load correct libpers_common.so version.
Signed-off-by: Igor Socec <igor.socec@pelagicore.com>
-rw-r--r--meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch (renamed from meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-libpers_common.so-extension-fix-for-EGL.patch)19
-rw-r--r--meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb2
2 files changed, 11 insertions, 10 deletions
diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-libpers_common.so-extension-fix-for-EGL.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch
index a01a3ae..5bf6aae 100644
--- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-libpers_common.so-extension-fix-for-EGL.patch
+++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch
@@ -1,14 +1,15 @@
-From 6cf2b01cb7475e06f44fb5db6352156f7384aa5b Mon Sep 17 00:00:00 2001
-From: Tom Pollard <tom.pollard@codethink.co.uk>
-Date: Tue, 1 Dec 2015 14:01:32 +0000
-Subject: [PATCH 1/1] libpers_common.so extension fix for EGL
+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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ config/pclCustomLibConfigFile.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg
-index fe95ea0..305cb7c 100644
+index fe95ea0..f8e0877 100644
--- a/config/pclCustomLibConfigFile.cfg
+++ b/config/pclCustomLibConfigFile.cfg
@@ -1,8 +1,8 @@
@@ -16,13 +17,13 @@ index fe95ea0..305cb7c 100644
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 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.1.0.bb b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb
index 0dc3e6e..756113e 100644
--- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb
+++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb
@@ -11,7 +11,7 @@ DEPENDS = "dlt-daemon dbus libcheck persistence-common-object"
SRC_URI = " \
git://git.projects.genivi.org/persistence/persistence-client-library.git;tag=v${PV} \
- file://0001-libpers_common.so-extension-fix-for-EGL.patch \
+ file://0001-load-correct-version-of-libpers_common.patch \
file://0001-fix-exec-path.patch \
"
S = "${WORKDIR}/git"