diff options
Diffstat (limited to 'meta-ivi/recipes-extended/persistence-client-library')
3 files changed, 17 insertions, 123 deletions
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 index 5bf6aae..2c3958b 100644 --- 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 @@ -5,25 +5,22 @@ 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(-) + config/pclCustomLibConfigFile.cfg.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -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 +diff --git a/config/pclCustomLibConfigFile.cfg.in b/config/pclCustomLibConfigFile.cfg.in +index 185cab4..fe95b18 100644 +--- a/config/pclCustomLibConfigFile.cfg.in ++++ b/config/pclCustomLibConfigFile.cfg.in +@@ -1,7 +1,7 @@ + hwinfo @prefix@/lib/libhwinfoperscustom.so init async + secure @prefix@/lib/libsecureperscustom.so od sync + custom3 @prefix@/lib/libcustom3perscustom.so init sync +-default @prefix@/lib/libpers_common.so init sync ++default @prefix@/lib/libpers_common.so.0 init sync + emergency @prefix@/lib/libemergencyperscustom.so od async + early @prefix@/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 +-- +1.9.1 diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch deleted file mode 100644 index 8b60de1..0000000 --- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 9ee8b6a522e2b1f731799690ac78da40f26e1bb7 Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico.cadete@awtce.be> -Date: Wed, 8 Jun 2016 14:43:53 +0200 -Subject: [PATCH] plugin conf file: rework to use @libdir@ from autotools - -Signed-off-by: Frederico Cadete <frederico.cadete@awtce.be> ---- - Makefile.am | 15 ++++++++++++++- - config/pclCustomLibConfigFile.cfg | 8 -------- - config/pclCustomLibConfigFile.cfg.in | 8 ++++++++ - config/pclCustomLibConfigFileEmpty.cfg | 0 - config/pclCustomLibConfigFileEmpty.cfg.in | 0 - configure.ac | 1 + - 6 files changed, 23 insertions(+), 9 deletions(-) - delete mode 100644 config/pclCustomLibConfigFile.cfg - create mode 100644 config/pclCustomLibConfigFile.cfg.in - delete mode 100644 config/pclCustomLibConfigFileEmpty.cfg - create mode 100644 config/pclCustomLibConfigFileEmpty.cfg.in - -diff --git a/Makefile.am b/Makefile.am -index 51b4104..7e42f63 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,15 +6,28 @@ SUBDIRS+=test - endif - - # Write the config file for customer plugins to the config destination --sysconf_DATA = config/pclCustomLibConfigFile.cfg \ -+libconffiles = config/pclCustomLibConfigFile.cfg \ - config/pclCustomLibConfigFileEmpty.cfg - -+libconffiles_subst = $(SED) \ -+ -e 's|@libdir[@]|$(libdir)|g' -+ -+$(libconffiles): -+ $(libconffiles_subst) '$(abs_top_srcdir)/$@.in' > $@ -+ -+config/pclCustomLibConfigFile.cfg: config/pclCustomLibConfigFile.cfg.in -+config/pclCustomLibConfigFileEmpty.cfg: config/pclCustomLibConfigFileEmpty.cfg.in -+ - # Add config file to distribution -+sysconf_DATA = $(libconffiles) - EXTRA_DIST = $(sysconf_DATA) - - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA=persistence_client_library.pc - -+CLEANFILES = \ -+ $(libconffiles) -+ - MAINTAINERCLEANFILES = \ - Makefile.in aclocal.m4 compile config.guess config.h.in config.sub \ - configure depcomp install-sh ltmain.sh persistence_client_library.pc config.h.in~ Makefile missing -diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg -deleted file mode 100644 -index 305cb7c..0000000 ---- a/config/pclCustomLibConfigFile.cfg -+++ /dev/null -@@ -1,8 +0,0 @@ --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.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 -diff --git a/config/pclCustomLibConfigFile.cfg.in b/config/pclCustomLibConfigFile.cfg.in -new file mode 100644 -index 0000000..8527211 ---- /dev/null -+++ b/config/pclCustomLibConfigFile.cfg.in -@@ -0,0 +1,8 @@ -+hwinfo @libdir@/libhwinfoperscustom.so init async -+secure @libdir@/libsecureperscustom.so od sync -+custom3 @libdir@/libcustom3perscustom.so init sync -+default @libdir@/libpers_common.so.0 init sync -+emergency @libdir@/libemergencyperscustom.so od async -+early @libdir@/libearlyperscustom.so od sync -+anInvalidEntry /wrongPath/wrongLib do cnys -+custom2 @libdir@/libcustom2perscustom.so init sync -diff --git a/config/pclCustomLibConfigFileEmpty.cfg b/config/pclCustomLibConfigFileEmpty.cfg -deleted file mode 100644 -index e69de29..0000000 -diff --git a/config/pclCustomLibConfigFileEmpty.cfg.in b/config/pclCustomLibConfigFileEmpty.cfg.in -new file mode 100644 -index 0000000..e69de29 -diff --git a/configure.ac b/configure.ac -index 2ae0042..649f9c7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -193,6 +193,7 @@ esac], - - AM_CONDITIONAL(DEBUG, test x"$debug" = x"true") - -+AC_PROG_SED - - AC_CONFIG_FILES([Makefile - persistence_client_library.pc --- -1.9.1 - 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 c423f70..1445a8d 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 @@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6161c6840f21a000e9b52af81d2ca823" DEPENDS = "dlt-daemon dbus libcheck persistence-common-object" -SRCREV = "4b503da99c6b04ad21a197dafe6e7243187c7c7e" +SRCREV = "fe4b73dcc282932ae3ebb8805e0b617a0016dc9a" SRC_URI = " \ git://git.projects.genivi.org/persistence/persistence-client-library.git;protocol=http \ file://0001-load-correct-version-of-libpers_common.patch \ file://0001-fix-exec-path.patch \ - file://0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch \ " S = "${WORKDIR}/git" |