diff options
13 files changed, 73 insertions, 85 deletions
@@ -90,3 +90,47 @@ export TEMPLATECONF=/full/path/to/meta-ivi/meta-ivi/conf 5. To login use these credentials: > User - root > Password - root + + +talk about using SRCREV instead of branch or tag at SRC_URI +----------------------------------------------------------- +Sent: Tuesday, April 05, 2016 11:33 PM +To: James Thomas +Cc: genivi-meta-ivi@lists.genivi.org +Subject: Re: [meta-ivi] Building with local source mirror + +On Tue, Mar 29, 2016 at 10:51 PM, James Thomas <james.thomas@codethink.co.uk> wrote: +> One thing I noticed is that simply providing the SRCREV works as long +> as that sha exists within master, if it doesn't then you have a build +> error, so being able to use tags is useful. +> +> I think using git://...;tag=foo is not sufficient, because tags *can* +> change (i.e there's no guarantee that the tag you're using is going to +> be the same as the one you used yesterday). +> +> What would be nice is if you could go tag=foo, and have it verified +> against SRCREV (in my testing this resulted in a build error *when* +> the tag and sha matched) +> +> However, something like +> +> SRC_URI = "git://mygitrepo/foo.git;nobranch=1;branch=v0.2" +> SRCREV = "7654321" +> +> does enforce that check (v0.2 is actually a tag in this case), which +> seems to be pretty useful (the recipe provides something human +> readable, and something a machine can understand, and will always +> check they match) + +I completely understand the reasoning behind this. The point I'm trying to make is that the automotive industry has a strong need for reproducible offline builds and any kind of mandatory online checks break this requirement. And like Federico said, using SRCREV is also the Yocto project practice. + +If we want meta-ivi to be widely used in the industry I believe it should support it's needs. In my opinion the same should go for the whole GENIVI stack to work nicely, which in particular means tags of the projects should not change. But the easiest solution would be for meta-ivi to not use tags. That way it supports offline builds and it is also possible to track bugfixes in the projects instead of pinning to the tag and then getting the bugfixes in patch by patch until next release. + +How do the others on this list feel about this proposal? + +Regards, +-- +Igor Socec +Software Engineer + + diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb index b39f939..36b36db 100644 --- a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb +++ b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb @@ -6,8 +6,8 @@ PR = "r0" DEPENDS = "commonapi3 dbus" REQUIRES = "commonapi3 dbus" -SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;branch=master;tag=${PV}" - +SRCREV = "3348a422ffc756b63de5890356383858a898e8b1" +SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git" S = "${WORKDIR}/git" EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr " 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 2e10d40..907c25d 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 @@ -7,7 +7,8 @@ PR = "r0" inherit autotools cmake lib_package pkgconfig -SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;branch=master;tag=${PV}" +SRCREV = "77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407" +SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git" S = "${WORKDIR}/git" EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr" @@ -18,3 +19,4 @@ do_configure_prepend () { } FILES_${PN}-dev += "${libdir}/cmake" +RDEPENDS_${PN} += "dlt-daemon"
\ No newline at end of file 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 d6465bd..e117ad4 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,12 +15,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \ 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;branch=v2.11.x \ 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 3cfd172..2ef9cdb 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 @@ -4,7 +4,8 @@ LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" PR = "r2" -SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git;tag=${PV} \ +SRCREV="851565499527e2d44047de3f6cbe9dd3a84a6c74" +SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git \ file://fix-no-libsystemd-daemon.patch \ file://0001-change-service-name.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 54204fe..570677a 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 @@ -1,5 +1,3 @@ -DEFAULT_PREFERENCE = "-1" - SUMMARY = "GENIVI Node Startup Controller" DESCRIPTION = "The GENIVI Node Startup Controller \ - manages the Last User Context (LUC) \ @@ -16,15 +14,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" PR = "r4" -SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git;tag=${PN}-${PV};branch=genivi-excalibur \ +SRCREV = "717e743c84ef9c168501dcbc012c4212f1903581" +SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git;branch=genivi-excalibur \ file://use-systemd-unit-dir.patch \ file://fix-no-libsystemd-daemon.patch \ " +S = "${WORKDIR}/git" DEPENDS = "glib-2.0 dlt-daemon systemd" -S = "${WORKDIR}/git" - inherit autotools gtk-doc systemd do_configure_prepend () { mkdir -p ${S}/m4 diff --git a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_git.bb b/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_git.bb deleted file mode 100644 index 0d3b90c..0000000 --- a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_git.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "GENIVI Node Startup Controller" -DESCRIPTION = "The GENIVI Node Startup Controller \ - - manages the Last User Context (LUC) \ - - monitors node startup \ - and \ - - manages legacy applications within a node \ - " - -HOMEPAGE = "https://www.genivi.org/" -SECTION = "base" - -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" - -SRCREV = "958e5ab2bc93ac0d885ca75f4f33988cbdd3e758" -PV = "1.0.0+git${SRCPV}" -PR = "r2" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "git://git.projects.genivi.org/lifecycle/node-startup-controller.git;protocol=git" - -DEPENDS = "glib-2.0 dlt-daemon systemd" - -S = "${WORKDIR}/git" - -inherit autotools gtk-doc -do_configure_prepend () { - mkdir m4 -} - -PACKAGES =+ "${PN}-nsm-dummy ${PN}-nsm-dummy-dbg" - -RRECOMMENDS_${PN} += "${PN}-nsm-dummy" - - -FILES_${PN} += "\ - ${libdir}/${PN}-1/${PN} \ - ${libdir}/${PN}-1/legacy-app-handler \ - ${libdir}/systemd/system/${PN}.service \ - ${datadir}/dbus-1/system-services/org.genivi.NodeStartupController1.service \ - " -FILES_${PN}-dbg += "\ - ${libdir}/${PN}-1/.debug/*ler \ - " -FILES_${PN}-nsm-dummy = "\ - ${libdir}/${PN}-1/nsm-dummy \ - ${libdir}/systemd/system/nsm-dummy.service \ - ${datadir}/dbus-1/system-services/org.genivi.NodeStateManager.* \ - " -FILES_${PN}-nsm-dummy-dbg = "\ - ${libdir}/${PN}-1/.debug/nsm-dummy \ - " 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 662b86e..f2af33b 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 @@ -11,11 +11,13 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git;tag=${PV} \ +SRCREV = "dd4a86b9459537d2e85489b36abf80f34d12f098" +SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git \ file://nsm-fix-systemd-service-dep.patch \ file://nsm-fix-no-libsystemd-daemon.patch \ file://link-with-gio.patch \ " +S = "${WORKDIR}/git" PR = "r1" @@ -23,8 +25,6 @@ EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-syste DEPENDS = "dbus glib-2.0 dlt-daemon persistence-client-library systemd" -S = "${WORKDIR}/git" - inherit pkgconfig autotools-brokensep systemd SYSTEMD_PACKAGES = "${PN}" 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 79b5dc0..0f36220 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 @@ -6,17 +6,17 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" +SRCREV = "68016b6762f9cbd87a7196df26d2b6fc8fcba2c1" SRC_URI = " \ - git://git.projects.genivi.org/persistence/persistence-administrator.git;tag=${PV} \ + git://git.projects.genivi.org/persistence/persistence-administrator.git \ file://libsystemd_daemon.patch \ file://0001-Add-support-for-json-c-0.12.patch \ " +S = "${WORKDIR}/git" DEPENDS = "glib-2.0 dbus dlt-daemon libarchive zlib json-c node-state-manager \ systemd persistence-common-object libffi libitzam" -S = "${WORKDIR}/git" - inherit autotools-brokensep systemd pkgconfig FILES_${PN}-dev += "${datadir}/dbus-1/" diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb index 7dc7845..bbaf9a5 100644 --- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb +++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb @@ -9,8 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6161c6840f21a000e9b52af81d2ca823" DEPENDS = "dlt-daemon dbus libcheck persistence-common-object" +SRCREV = "4b503da99c6b04ad21a197dafe6e7243187c7c7e" 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 \ file://0001-load-correct-version-of-libpers_common.patch \ file://0001-fix-exec-path.patch \ " 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 655f267..2ba5c88 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,17 +5,16 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" +SRCREV = "b27fe577fcef7bf57d8d287f56e8dfd6ac60b1f0" SRC_URI = " \ - git://git.projects.genivi.org/persistence/persistence-common-object.git;tag=${PV} \ + git://git.projects.genivi.org/persistence/persistence-common-object.git \ file://configure.ac-fix-typo.patch \ file://B251_typedef_uint64_t.patch \ " -#link for bug 251 in bugzilla https://bugs.genivi.org/show_bug.cgi?id=251 +S = "${WORKDIR}/git" DEPENDS = "glib-2.0 libitzam dlt-daemon" -S = "${WORKDIR}/git" - inherit autotools-brokensep pkgconfig EXTRA_OECONF = " \ diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb index 6987552..d7310fc 100644 --- a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb +++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb @@ -7,13 +7,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=176cedb32f48dd58f07e0c1c717b3ea4" PR = "r1" -SRC_URI = "git://git.projects.genivi.org/${PN}.git;tag=${PV} \ +SRCREV = "beac5d2e25324ca9cc82d0e3b364512258af3567" +SRC_URI = "git://git.projects.genivi.org/${PN}.git \ file://remove_compile-host-path_issue.patch \ file://0001-buildsystem-make-example-programs-link-to-the-genera.patch \ " +S = "${WORKDIR}/git" DEPENDS = "weston" -S = "${WORKDIR}/git" inherit cmake autotools diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb index 7009aa4..2f85b52 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb @@ -8,15 +8,14 @@ PR = "r1" DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" -BRANCH = "master" - +SRCREV = "8725157e248c6706de59a02996f869b6ccdccb13" SRC_URI = " \ - git://git.projects.genivi.org/AudioManager.git;branch=${BRANCH};tag=${PV} \ + git://git.projects.genivi.org/AudioManager.git;branch=master \ file://AudioManager.service \ file://setup_amgr.sh \ " - S = "${WORKDIR}/git" + inherit autotools gettext cmake pkgconfig systemd SYSTEMD_PACKAGES = "${PN}" |