From 7e4a616ec4c578de838b70bd8145fbfeda4d86ad Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 24 Aug 2018 16:43:24 +0000 Subject: [PATCH] mavlink: set fixed SRCREV instead of tag name and define PV * otherwise bitbake fetcher will access the network every time the recipes is parsed to convert tag name in SRCREV to git SHA and then again during do_fetch and do_unpack: log.do_fetch: DEBUG: Fetcher accessed the network with the command git -c core.fsyncobjectfiles=0 ls-remote git://github.com/mavlink/mavlink-gbp-release.git DEBUG: Running export PSEUDO_DISABLED=1; export PATH="/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/python-native:/OE/build/oe-core/openembedded-core/scripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot/usr/bin/crossscripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/bin:/OE/build/oe-core/bitbake/bin:/OE/build/oe-core/tmp-glibc/hosttools"; export HOME="/OE"; git -c core.fsyncobjectfiles=0 ls-remote git://github.com/mavlink/mavlink-gbp-release.git DEBUG: Running export PSEUDO_DISABLED=1; export PATH="/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/python-native:/OE/build/oe-core/openembedded-core/scripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot/usr/bin/crossscripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/bin:/OE/build/oe-core/bitbake/bin:/OE/build/oe-core/tmp-glibc/hosttools"; export HOME="/OE"; git -c core.fsyncobjectfiles=0 branch --contains 7dbef3644782a4297fec76a4a2f7a61705dd624d --list release/kinetic/mavlink 2> /dev/null | wc -l log.do_unpack: DEBUG: Fetcher accessed the network with the command git -c core.fsyncobjectfiles=0 ls-remote git://github.com/mavlink/mavlink-gbp-release.git DEBUG: Running export PSEUDO_DISABLED=1; export PATH="/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/python-native:/OE/build/oe-core/openembedded-core/scripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot/usr/bin/crossscripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/bin:/OE/build/oe-core/bitbake/bin:/OE/build/oe-core/tmp-glibc/hosttools"; export HOME="/OE"; git -c core.fsyncobjectfiles=0 ls-remote git://github.com/mavlink/mavlink-gbp-release.git DEBUG: Running export PSEUDO_DISABLED=1; export PATH="/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/python-native:/OE/build/oe-core/openembedded-core/scripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot/usr/bin/crossscripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/bin:/OE/build/oe-core/bitbake/bin:/OE/build/oe-core/tmp-glibc/hosttools"; export HOME="/OE"; git -c core.fsyncobjectfiles=0 clone -s -n /OE/build/oe-core/downloads/git2/github.com.mavlink.mavlink-gbp-release.git/ /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/git/ DEBUG: Running export PSEUDO_DISABLED=1; export PATH="/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/python-native:/OE/build/oe-core/openembedded-core/scripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot/usr/bin/crossscripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/bin:/OE/build/oe-core/bitbake/bin:/OE/build/oe-core/tmp-glibc/hosttools"; export HOME="/OE"; git -c core.fsyncobjectfiles=0 remote set-url origin git://github.com/mavlink/mavlink-gbp-release.git DEBUG: Running export PSEUDO_DISABLED=1; export PATH="/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/python-native:/OE/build/oe-core/openembedded-core/scripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot/usr/bin/crossscripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/bin:/OE/build/oe-core/bitbake/bin:/OE/build/oe-core/tmp-glibc/hosttools"; export HOME="/OE"; git -c core.fsyncobjectfiles=0 checkout -B release/kinetic/mavlink 7dbef3644782a4297fec76a4a2f7a61705dd624d DEBUG: Running export PSEUDO_DISABLED=1; export PATH="/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/python-native:/OE/build/oe-core/openembedded-core/scripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot/usr/bin/crossscripts:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/usr/bin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/sbin:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/mavlink/git-r0/recipe-sysroot-native/bin:/OE/build/oe-core/bitbake/bin:/OE/build/oe-core/tmp-glibc/hosttools"; export HOME="/OE"; git -c core.fsyncobjectfiles=0 branch release/kinetic/mavlink --set-upstream-to origin/release/kinetic/mavlink * set PV according to PROJECT_VERSION in CMakeLists.txt, because current version "git-r0" is quite annoying and doesn't really sort well when doing the package upgrades on target MACHINE Signed-off-by: Martin Jansa --- recipes-ros/mavlink/mavlink_git.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes-ros/mavlink/mavlink_git.bb b/recipes-ros/mavlink/mavlink_git.bb index 144f98e..64b9279 100644 --- a/recipes-ros/mavlink/mavlink_git.bb +++ b/recipes-ros/mavlink/mavlink_git.bb @@ -4,11 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=54ad3cbe91bebcf6b1823970ff1fb97f" DEPENDS = "${PYTHON_PN}-setuptools-native ${PYTHON_PN}-future-native" -SRC_URI = "git://github.com/mavlink/mavlink-gbp-release.git;branch=release/kinetic/mavlink" -SRCREV = "release/kinetic/mavlink/2017.8.8-0" - -SRC_URI += "file://0001-do-not-require-python2.patch" -SRC_URI += "file://0002-provide-path-to-find-mavgen_c.patch" +SRC_URI = "git://github.com/mavlink/mavlink-gbp-release.git;branch=release/kinetic/mavlink \ + file://0001-do-not-require-python2.patch \ + file://0002-provide-path-to-find-mavgen_c.patch \ +" +SRCREV = "7dbef3644782a4297fec76a4a2f7a61705dd624d" +PV = "1.0.9+git${SRCPV}" S = "${WORKDIR}/git"