diff options
5 files changed, 22 insertions, 17 deletions
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf index 30ccb83..2dcea5f 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 = "10.0.0" +DISTRO_VERSION = "10.0.2" DISTRO_CODENAME ="leviathan" MAINTAINER = "meta-ivi <genivi-meta-ivi@lists.genivi.org>" diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb index 12bf842..94991a3 100644 --- a/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb +++ b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb @@ -2,20 +2,24 @@ SUMMARY = "CommonAPI" SECTION = "libs" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + PROVIDES = "commonapi3" -PR = "r0" +PR = "r1" + +DEPENDS = "dlt-daemon" -inherit autotools cmake lib_package pkgconfig +inherit cmake lib_package pkgconfig SRCREV = "77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407" -SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;protocol=http" + +SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;protocol=http \ + file://0001-common-api-runtime-replace-hard-coded-lib-dir-by-var.patch \ + " S = "${WORKDIR}/git" -EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr" +EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_LIB_DIR:PATH=${baselib} \ + -DINSTALL_CMAKE_DIR:PATH=${baselib}/cmake/CommonAPI \ + " FILES_${PN}-dev += "${libdir}/cmake" -RDEPENDS_${PN} += "dlt-daemon" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://0001-common-api-runtime-replace-hard-coded-lib-dir-by-var.patch" -EXTRA_OECMAKE += "-DINSTALL_LIB_DIR:PATH=${baselib} -DINSTALL_CMAKE_DIR:PATH=${baselib}/cmake/CommonAPI" 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 e3ad60b..06352d3 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 @@ -15,8 +15,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \ DEPENDS = "dbus zlib" +PR = "r1" SRCREV = "b8b3ea3a31f7deb681941a19878c82e7b7350ae7" -SRC_URI = "git://git.projects.genivi.org/${BPN}.git;branch=v2.11.x;protocol=http \ +SRC_URI = "git://git.projects.genivi.org/${BPN}.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-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 9d92364..f9652d0 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 @@ -12,13 +12,13 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -PR = "r4" +PR = "r5" SRCREV = "717e743c84ef9c168501dcbc012c4212f1903581" -SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;branch=genivi-excalibur;protocol=http \ - file://use-systemd-unit-dir.patch \ - file://fix-no-libsystemd-daemon.patch \ - " +SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;nobranch=1;protocol=http \ + file://use-systemd-unit-dir.patch \ + file://fix-no-libsystemd-daemon.patch \ + " S = "${WORKDIR}/git" DEPENDS = "glib-2.0 dlt-daemon systemd" diff --git a/meta-ivi/recipes-yocto-ivi/images/leviathan-image.bb b/meta-ivi/recipes-yocto-ivi/images/leviathan-image.bb index da973a7..1194c3b 100644 --- a/meta-ivi/recipes-yocto-ivi/images/leviathan-image.bb +++ b/meta-ivi/recipes-yocto-ivi/images/leviathan-image.bb @@ -1,5 +1,5 @@ # Base this image on generic IVI image require recipes-yocto-ivi/images/ivi-image.bb -PV = "10.0.0" +PV = "10.0.2" |