[gnome-continuous-yocto/gnomeostree-3.28-rocko: 76/218] image: Expand PV to avoid AUTOREV parsing failures

[Emmanuele Bassi <ebassi src gnome org>]

commit ad24cc9ba5c79ae0a860fd3b87205f4c0953d5f3
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon Jan 8 17:41:27 2018 +0000

    image: Expand PV to avoid AUTOREV parsing failures
    
    Currently, setting PV to include SRCPV for build-appliance results in:
    
    bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was
    ${@bb.fetch2.get_srcrev(d)} which triggered exception FetchError: Fetcher
    failure: Fetch command export ftp_proxy="http://proxy.yocto.io:5187/";; export
    FTP_PROXY="http://proxy.yocto.io:5187/";; export PATH="${TMPDIR}/work/
    qemux86_64-poky-linux/build-appliance-image/fetcheravoidrecurse-r0/
    recipe-sysroot-native/usr/bin/python3-native:${TMPDIR}/work/
    qemux86_64-poky-linux/build-appliance-image/fetcheravoidrecurse-r0/
    recipe-sysroot-native/usr/bin/python3-native:${TMPDIR}/work/
    qemux86_64-poky-linux/build-appliance-image/fetcheravoidrecurse-r0/
    recipe-sysroot-native/usr/bin/python3-native:/home/pokybuild/
    yocto-autobuilder/yocto-worker/buildtools/build/scripts:${TMPDIR}/
    work/qemux86_64-poky-linux/build-appliance-image/fetcheravoidrecurse-r0/
    recipe-sysroot-native/usr/bin/x86_64-poky-linux:${TMPDIR}/work/
    qemux86_64-poky-linux/build-appliance-image/fetcheravoidrecurse-r0/
    recipe-sysroot/usr/bin/crossscripts:${TMPDIR}/work/qemux86_64-poky-linux/
    build-appliance-image/fetcheravoidrecurse-r0/recipe-sysroot-native/usr/sbin:
    ${TMPDIR}/work/qemux86_64-poky-linux/build-appliance-image/
    fetcheravoidrecurse-r0/recipe-sysroot-native/usr/bin:${TMPDIR}/work/
    qemux86_64-poky-linux/build-appliance-image/fetcheravoidrecurse-r0/
    recipe-sysroot-native/sbin:${TMPDIR}/work/qemux86_64-poky-linux/
    build-appliance-image/fetcheravoidrecurse-r0/recipe-sysroot-native/bin:/home/
    pokybuild/yocto-autobuilder/yocto-worker/buildtools/build/bitbake/bin:${TMPDIR}
    /hosttools"; export HOME="/home/pokybuild"; git -c core.fsyncobjectfiles=0
    ls-remote git://git.yoctoproject.org/poky  failed with exit code 127, output:
    /bin/sh: 1: git: not found
    
    This is because PV is being expanded when TMPDIR is unset.
    
    Expand PV in advance to avoid this problem.
    
    (From OE-Core rev: 1aaab0595e0a5d898ba2ca5f144a99b9e6dc4495)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d93de02..d88ce5c 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -441,6 +441,8 @@ python () {
         # This means the task's hash can be stable rather than having hardcoded
         # date/time values. It will get expanded at execution time.
         # Similarly TMPDIR since otherwise we see QA stamp comparision problems
+        # Expand PV else it can trigger get_srcrev which can fail due to these variables being unset
+        localdata.setVar('PV', d.getVar('PV'))
         localdata.delVar('DATETIME')
         localdata.delVar('DATE')
         localdata.delVar('TMPDIR')