aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2017-02-08 03:08:50 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2017-02-08 03:08:50 +0900
commit3fc7c36940b67f12b3bb1205f89721f9ffe93e9c (patch)
tree0596eebcf1aa0dafa37cb5e8e2af40ab762b3730
parent3892342cf66bf5284bb42a09d823213d09df6eb7 (diff)
parent82ad0c7481c5c0343049b1bf5872b163fd868fc1 (diff)
downloadmeta-ivi-3fc7c36940b67f12b3bb1205f89721f9ffe93e9c.tar.gz
meta-ivi-3fc7c36940b67f12b3bb1205f89721f9ffe93e9c.tar.bz2
meta-ivi-3fc7c36940b67f12b3bb1205f89721f9ffe93e9c.zip
Merge commit '82ad0c7481c5c0343049b1bf5872b163fd868fc1' into 12
-rw-r--r--meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend2
-rw-r--r--meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc8
-rw-r--r--meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend2
-rw-r--r--meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend2
-rw-r--r--meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb4
-rw-r--r--meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_111.bb (renamed from meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_106.bb)4
6 files changed, 11 insertions, 11 deletions
diff --git a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend
index 441fdf0..4a6c02c 100644
--- a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend
+++ b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend
@@ -9,7 +9,7 @@ SRC_URI_append += " \
SRC_URI[md5sum] = "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
SRC_URI[sha256sum] = "247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d"
-EXTRA_OECONF += " -DTEST_IP_MASTER=10.0.3.1 -DTEST_IP_SLAVE=10.0.3.125"
+EXTRA_OECONF += " -DTEST_IP_MASTER=10.0.3.1 -DTEST_IP_SLAVE=10.0.3.125 "
do_configure_prepend() {
export GTEST_ROOT=${WORKDIR}/gtest-1.7.0
}
diff --git a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc
index d9ff540..181e6e4 100644
--- a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc
+++ b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc
@@ -29,14 +29,14 @@ run_1() {
systemctl restart node-startup-controller
if [ "x${1}" != "x" ]; then
_run_1 > /tmp/t
- _c1=`cat /tmp/t | grep :P: | wc -l`
- _c2=`cat /tmp/t | grep :F: | wc -l`
+ _c1=`cat /tmp/t | grep OK | wc -l`
+ _c2=`cat /tmp/t | grep FAILED | wc -l`
if [ "x${_c1}" = "x0" ]; then
echo "[ FAILED ] ${_c2} tests."
elif [ "x${_c2}" = "x0" ]; then
- echo "[ PASSED ] ${_c1} tests."
+ echo "[ OK ] ${_c1} tests."
else
- echo " ${_c1} PASSED, ${_c2} FAILED"
+ echo " ${_c1} OK, ${_c2} FAILED"
fi
else
_run_1
diff --git a/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend b/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend
index 963f5fc..979280d 100644
--- a/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend
+++ b/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend
@@ -5,7 +5,7 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
SRC_URI_append += " file://${BPN}_t.inc \
"
-EXTRA_OECONF += "--enable-tests"
+EXTRA_OECONF += " --enable-tests "
do_install_append() {
install -d ${D}/opt/tests/${PN}
diff --git a/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend b/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend
index dbc65bb..ce049e9 100644
--- a/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend
+++ b/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend
@@ -5,7 +5,7 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
SRC_URI_append += " file://${BPN}_t.inc \
"
-EXTRA_OECONF += "--enable-tests"
+EXTRA_OECONF += " --enable-tests "
do_install_append() {
install -d ${D}/opt/tests/${PN}
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 16ed3a5..97724df 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,9 +5,9 @@ SECTION = "base"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
-SRCREV = "395b0f504e05ee6c59c1b9d9267c793e072a19ba"
+SRCREV = "9f2fd043d034219a22b0ea84ee84ff9c07f05ec9"
SRC_URI = " \
- git://git.projects.genivi.org/persistence/persistence-common-object.git;protocol=http \
+ git://github.com/GENIVI/persistence-common-object.git;protocol=https \
"
S = "${WORKDIR}/git"
diff --git a/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_106.bb b/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_111.bb
index c1e382b..841c850 100644
--- a/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_106.bb
+++ b/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_111.bb
@@ -13,8 +13,8 @@ SRC_URI = "https://launchpad.net/ecryptfs/trunk/${PV}/+download/${BPN}_${PV}.ori
file://ecryptfs-fix-disable-nss.patch \
file://ecryptfs.service \
"
-SRC_URI[md5sum] = "bff8052636f6be642f15c6be45a14ea3"
-SRC_URI[sha256sum] = "173e0add31e898789076103723894964ce474233988ef8d3309021bad8a7b6b4"
+SRC_URI[md5sum] = "83513228984f671930752c3518cac6fd"
+SRC_URI[sha256sum] = "112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f"
inherit pkgconfig autotools systemd