aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-06-29 11:59:10 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-07-27 17:38:31 +0900
commit6128beeb75cd58ca045ee4e1683454c58f348993 (patch)
treed4ab6f1a6d95a1c05838632654b8b19eef89544d
parent7d3d57804802cd5d238ea245a3cb1128e734d653 (diff)
downloadmeta-ivi-6128beeb75cd58ca045ee4e1683454c58f348993.tar.gz
meta-ivi-6128beeb75cd58ca045ee4e1683454c58f348993.tar.bz2
meta-ivi-6128beeb75cd58ca045ee4e1683454c58f348993.zip
persistence-administrator: upgrade to 1.0.8
" Subject: [meta-ivi] Persistence components in meta-ivi From: Igor Socec <igor.socec@pelagicore.com> I'm working on a project that uses meta-ivi 10.0 and Persistence components. There are some critical bugfixes in Persistence Administrator which are not available in meta-ivi. There is also a bugfix in Persistence Common Object available upstream that's missing in meta-ivi. ...<skip> Here is a stack of upstream commits that we apply on top of meta-ivi 10.0 to resolve bugs in Persistence: persistence-administrator: - add-missing-compiler-flags-for-CPP-compliance.patch - PAS-Vers.-1.0.6-Fixed-bug-295-further-calls-of-persa.patch - PAS-Vers.-1.0.7-Fixed-bug-299-Link-to-shared-group-d.patch - Takeover-fix-for-Bug-299-from-Continental-git-branch.patch - PAS-Vers.-1.0.8-Fixed-bug-437-pas-daemon-stops-trigg.patch persistence-common-object: - fixed GENIVI Bug 345 " Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rw-r--r--meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch41
-rw-r--r--meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch26
-rw-r--r--meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch13
-rw-r--r--meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.8.bb (renamed from meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb)4
4 files changed, 1 insertions, 83 deletions
diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch
deleted file mode 100644
index 99bb684..0000000
--- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 23b3053a7062ba38cf39e1b0caeb5ec006287d68 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei.gherzan@windriver.com>
-Date: Mon, 22 Jun 2015 22:21:50 +0200
-Subject: [PATCH] Add support for json-c > 0.12
-
-Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
-Upstream-Status: Submitted [http://bugs.genivi.org/show_bug.cgi?id=354]
----
- Administrator/src/ssw_pers_admin_config.c | 2 +-
- configure.ac | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Administrator/src/ssw_pers_admin_config.c b/Administrator/src/ssw_pers_admin_config.c
-index 62671a5..c52af16 100644
---- a/Administrator/src/ssw_pers_admin_config.c
-+++ b/Administrator/src/ssw_pers_admin_config.c
-@@ -25,7 +25,7 @@
- *
- **********************************************************************************************************************/
-
--#include <json/json.h>
-+#include <json-c/json.h>
-
- #include <sys/types.h>
- #include <sys/stat.h>
-diff --git a/configure.ac b/configure.ac
-index 5207334..48ed91f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -114,7 +114,7 @@ PKG_CHECK_MODULES([DLT], [automotive-dlt >= 2.2.0])
- PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5])
- PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4])
- PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1])
--PKG_CHECK_MODULES([JSON], [json >= 0.9])
-+PKG_CHECK_MODULES([JSON], [json-c >= 0.9])
- PKG_CHECK_MODULES([NSM], [node-state-manager])
- PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ])
-
---
-2.1.0
-
diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch
deleted file mode 100644
index a52f88f..0000000
--- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 887c1367ba633357abe13dde39363f2a9da4c6c6 Mon Sep 17 00:00:00 2001
-From: Holger Behrens <holger.behrens@windriver.com>
-Date: Mon, 17 Nov 2014 16:39:21 +0100
-Subject: [[PATCH] configure.ac: fix typo libperscommon
-
-Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5207334..6e1b2dd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,7 +113,7 @@ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.4.10])
- PKG_CHECK_MODULES([DLT], [automotive-dlt >= 2.2.0])
- PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5])
- PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4])
--PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1])
-+PKG_CHECK_MODULES([PERSCOMMON], [persistence_client_library >= 1.0.1])
- PKG_CHECK_MODULES([JSON], [json >= 0.9])
- PKG_CHECK_MODULES([NSM], [node-state-manager])
- PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ])
---
-2.1.3
-
diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch
deleted file mode 100644
index 866a2c3..0000000
--- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index f1fde52..44a1045 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -116,7 +116,7 @@ PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4])
- PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1])
- PKG_CHECK_MODULES([JSON], [json >= 0.9])
- PKG_CHECK_MODULES([NSM], [node-state-manager])
--PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ])
-+PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 37 ])
-
- AC_SUBST(DEPS_CFLAGS)
- AC_SUBST(DEPS_LIBS)
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.8.bb
index 1d1adc5..bf0def8 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.8.bb
@@ -6,11 +6,9 @@ SECTION = "base"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
-SRCREV = "68016b6762f9cbd87a7196df26d2b6fc8fcba2c1"
+SRCREV = "47e5a424c8ef6e33565737f20d3bd81f69c8efc9"
SRC_URI = " \
git://git.projects.genivi.org/persistence/persistence-administrator.git;protocol=http \
- file://libsystemd_daemon.patch \
- file://0001-Add-support-for-json-c-0.12.patch \
"
S = "${WORKDIR}/git"