aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortolkien-joh <yong-il.joh@windriver.com>2016-07-29 17:24:01 +0900
committerGitHub <noreply@github.com>2016-07-29 17:24:01 +0900
commita9164d6e8b4dbf6f8bc08b066c2dd3767b05bf70 (patch)
tree992bf8a10217f6798afa9be66d825e2966b289d0
parent5376b25bd586f76ef3733e171ae4935cf02595b8 (diff)
parenta6c903827abcb4a3004b919376c7b61e37da7a34 (diff)
downloadmeta-ivi-7.0.tar.gz
meta-ivi-7.0.tar.bz2
meta-ivi-7.0.zip
Merge pull request #15 from tolkien-joh/7.07.0.47.0
hot fix of 7.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-p1.bb4
-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.3.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_git.bb2
-rw-r--r--meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_git.bb2
-rw-r--r--meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_7.0.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.1.bb5
-rw-r--r--meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb2
13 files changed, 18 insertions, 21 deletions
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index 0abec81..1e246ef 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 = "7.0.3"
+DISTRO_VERSION = "7.0.4"
DISTRO_CODENAME ="intrepid"
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-p1.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p1.bb
index bf91a97..221da73 100644
--- a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p1.bb
+++ b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p1.bb
@@ -3,8 +3,8 @@ SECTION = "libs"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
-BRANCH ?= "maintain/2.1.6"
-SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;protocol=http;branch=${BRANCH};tag=${PV}"
+SRCREV = "3372155b32a2cf3b05e1a2a13f6f8413069de33f"
+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.3.bb b/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.3.bb
index 0caa712..1b92e49 100644
--- a/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.3.bb
+++ b/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.3.bb
@@ -6,7 +6,7 @@ PR = "r2"
SRCREV = "e8ec4787395986599cc2c816ac2bbe56d3c85764"
-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 e137535..0473425 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 \
"
diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_git.bb b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_git.bb
index df9a9bd..96d41a5 100644
--- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_git.bb
+++ b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
PV = "7.0+git${SRCPV}"
-SRC_URI = "git://git.projects.genivi.org/persistence/persistence-administrator.git \
+SRC_URI = "git://git.projects.genivi.org/persistence/persistence-administrator.git;protocol=http \
file://libsystemd_daemon.patch \
"
diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_git.bb b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_git.bb
index 181e3d6..1fa86a3 100644
--- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_git.bb
+++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "dlt-daemon dbus libcheck persistence-common-object"
PV = "7.0+git${SRCPV}"
-SRC_URI = "git://git.projects.genivi.org/persistence/persistence-client-library.git"
+SRC_URI = "git://git.projects.genivi.org/persistence/persistence-client-library.git;protocol=http"
SRCREV = "441b3ce710ec6b7f1e6360cdf29e5c4243af9f1e"
S = "${WORKDIR}/git"
diff --git a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_7.0.bb b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_7.0.bb
index 299438d..9a9e9ae 100644
--- a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_7.0.bb
+++ b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_7.0.bb
@@ -6,7 +6,7 @@ SECTION = "base"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
-SRC_URI = "git://git.projects.genivi.org/persistence/persistence-common-object.git;tag=${PV} \
+SRC_URI = "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.1.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.1.bb
index c02c38e..97d9805 100644
--- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.1.bb
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.1.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=815ca599c9df247a0c7f619bab123dad"
DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager"
-BRANCH = "Intreprid_stable_branch"
-
-SRC_URI = "git://git.projects.genivi.org/AudioManager.git;branch=${BRANCH};tag=${PV} \
+SRCREV = "6e700bfc7faecb6d7e0f31c9d08b8b4f6cd1b3dd"
+SRC_URI = "git://git.projects.genivi.org/AudioManager.git;nobranch=1;protocol=http \
file://0001-src-gen-update-to-CommonAPI-version-2.1.6.patch \
file://AudioManager.service file://setup_amgr.sh"
diff --git a/meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb b/meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb
index f851d93..73336f7 100644
--- a/meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb
+++ b/meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb
@@ -1,5 +1,5 @@
# Base this image on generic IVI image
require recipes-yocto-ivi/images/ivi-image.bb
-PV = "7.0.3"
+PV = "7.0.4"