aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortolkien-joh <yong-il.joh@windriver.com>2016-07-29 17:24:08 +0900
committerGitHub <noreply@github.com>2016-07-29 17:24:08 +0900
commit65b49e4e1554bbecd2ec8417a7e848c2fce8731f (patch)
tree5ea16f99624eef178eb51acfdcee17ca2ff9b76e
parentcc64f96b285e64524d7e0c740155851bbc44d790 (diff)
parentdf50d43581ac92fedf5ca12e17874a725122a1ec (diff)
downloadmeta-ivi-8.0.tar.gz
meta-ivi-8.0.tar.bz2
meta-ivi-8.0.zip
Merge pull request #16 from tolkien-joh/8.08.0.28.0
hot fix of 8.0
-rw-r--r--meta-ivi/conf/distro/poky-ivi-systemd.conf2
-rw-r--r--meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb5
-rw-r--r--meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb5
-rw-r--r--meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb5
-rw-r--r--meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb2
-rw-r--r--meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb2
-rw-r--r--meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb2
-rw-r--r--meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb2
-rw-r--r--meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.0.0.bb2
-rw-r--r--meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb2
-rw-r--r--meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.3.0.bb4
-rw-r--r--meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.2.bb2
-rw-r--r--meta-ivi/recipes-yocto-ivi/images/jupiter-image.bb2
13 files changed, 17 insertions, 20 deletions
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index 96ebd5d..a1d4819 100644
--- a/meta-ivi/conf/distro/poky-ivi-systemd.conf
+++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf
@@ -1,6 +1,6 @@
DISTRO = "poky-ivi-systemd"
DISTRO_NAME = "Yocto GENIVI Baseline (Poky/meta-ivi)"
-DISTRO_VERSION = "8.0.1"
+DISTRO_VERSION = "8.0.2"
DISTRO_CODENAME ="jupiter"
MAINTAINER = "meta-ivi <genivi-meta-ivi@lists.genivi.org>"
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb
index d1d612f..b6381b5 100644
--- a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb
+++ b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb
@@ -3,9 +3,8 @@ SECTION = "libs"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
-BRANCH ?= "maintain/2.1.6"
-TAG ?= "${PV}"
-SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;branch=${BRANCH};tag=${TAG}"
+SRCREV = "2976e524d5a46cc4793e3e3f3ec70558f6de74de"
+SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;nobranch=1;protocol=http"
S = "${WORKDIR}/git"
DEPENDS = "common-api2 dbus"
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb b/meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb
index 19a3b7a..3a2c6c7 100644
--- a/meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb
+++ b/meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb
@@ -4,9 +4,8 @@ LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
PROVIDES = "common-api2"
-BRANCH ?= "maintain/2.1.6"
-TAG ?= "${PV}"
-SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;branch=${BRANCH};tag=${TAG}"
+SRCREV = "5a8007f50b82c30535c3f51af5f23b265d594c27"
+SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;nobranch=1;protocol=http"
S = "${WORKDIR}/git"
CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
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..2c8e68f 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
@@ -18,9 +18,8 @@ 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;nobranch=1;protocol=http \
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 \
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..f175f13 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
@@ -6,7 +6,7 @@ PR = "r2"
SRCREV = "851565499527e2d44047de3f6cbe9dd3a84a6c74"
-SRC_URI = "git://git.projects.genivi.org/lifecycle/node-health-monitor.git \
+SRC_URI = "git://git.projects.genivi.org/lifecycle/node-health-monitor.git;protocol=http \
file://fix-no-libsystemd-daemon.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..0cd8fec 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
@@ -17,7 +17,7 @@ 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 \
+SRC_URI = "git://git.projects.genivi.org/lifecycle/node-startup-controller.git;nobranch=1;protocol=http \
file://use-systemd-unit-dir.patch \
file://fix-no-libsystemd-daemon.patch \
"
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..430523a 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
@@ -13,7 +13,7 @@ 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/node-state-manager.git;protocol=http \
file://nsm-fix-systemd-service-dep.patch \
file://nsm-fix-no-libsystemd-daemon.patch \
file://link-with-gio.patch \
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 31073fe..8f064fb 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
@@ -7,7 +7,7 @@ LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
SRC_URI = " \
- git://git.projects.genivi.org/persistence/persistence-administrator.git;tag=${PV} \
+ git://git.projects.genivi.org/persistence/persistence-administrator.git;tag=${PV};protocol=http \
file://libsystemd_daemon.patch \
"
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.0.0.bb
index 0054e30..48a6402 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.0.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6161c6840f21a000e9b52af81d2ca823"
DEPENDS = "dlt-daemon dbus libcheck persistence-common-object"
SRC_URI = " \
- git://git.projects.genivi.org/persistence/persistence-client-library.git;tag=v${PV} \
+ git://git.projects.genivi.org/persistence/persistence-client-library.git;tag=v${PV};protocol=http \
file://0001-Fix-cast-on-64bit-machines.patch \
"
S = "${WORKDIR}/git"
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..6d66bf4 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
@@ -6,7 +6,7 @@ LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
SRC_URI = " \
- git://git.projects.genivi.org/persistence/persistence-common-object.git;tag=${PV} \
+ git://git.projects.genivi.org/persistence/persistence-common-object.git;tag=${PV};protocol=http \
file://configure.ac-fix-typo.patch \
file://B251_typedef_uint64_t.patch \
"
diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.3.0.bb b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.3.0.bb
index c8f9ca8..7200a9b 100644
--- a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.3.0.bb
+++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.3.0.bb
@@ -10,8 +10,8 @@ DEPENDS = "weston"
# FIX ME
# This should be TAG = "${PV}" but yocto doesn't support lightweight tags for now
# https://bugzilla.yoctoproject.org/show_bug.cgi?id=6881
-TAG = "a4bde3e5a4c21ff7cf28cc027d45d7c63cac2f66"
-SRC_URI = "git://git.projects.genivi.org/${PN}.git;tag=${TAG} \
+SRCREV = "a4bde3e5a4c21ff7cf28cc027d45d7c63cac2f66"
+SRC_URI = "git://git.projects.genivi.org/${PN}.git;protocol=http \
file://use_sysroot_dir.patch \
file://fix_compositor_include.patch \
"
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.2.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.2.bb
index 21676a2..6f37fd1 100644
--- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.2.bb
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.2.bb
@@ -10,7 +10,7 @@ DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager"
BRANCH = "master"
SRC_URI = " \
- git://git.projects.genivi.org/AudioManager.git;branch=${BRANCH};tag=${PV} \
+ git://git.projects.genivi.org/AudioManager.git;branch=${BRANCH};tag=${PV};protocol=http \
file://AudioManager.service \
file://setup_amgr.sh \
file://0001-Add-CommonAPI-sources-generated-with-CommonAPI-2.1.6.patch \
diff --git a/meta-ivi/recipes-yocto-ivi/images/jupiter-image.bb b/meta-ivi/recipes-yocto-ivi/images/jupiter-image.bb
index 4474fd2..eaccf3b 100644
--- a/meta-ivi/recipes-yocto-ivi/images/jupiter-image.bb
+++ b/meta-ivi/recipes-yocto-ivi/images/jupiter-image.bb
@@ -1,5 +1,5 @@
# Base this image on generic IVI image
require recipes-yocto-ivi/images/ivi-image.bb
-PV = "8.0.1"
+PV = "8.0.2"