summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-08 17:41:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-11 10:26:07 +0000
commit9e181149271f507242e1423edd6736e272ee8970 (patch)
tree75060b52d2ab0d6b6ccafe6a3f692f86e3a106e0
parentd7d59e75cfe645b7a76720f0e282fe5e8005b135 (diff)
downloadpoky-9e181149271f507242e1423edd6736e272ee8970.tar.gz
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: 9ca2fad2e569597f460e6bcbbd96077c8b8cfce9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index ec940a4b65..4531aa2a57 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -441,6 +441,8 @@ python () {
441 # This means the task's hash can be stable rather than having hardcoded 441 # This means the task's hash can be stable rather than having hardcoded
442 # date/time values. It will get expanded at execution time. 442 # date/time values. It will get expanded at execution time.
443 # Similarly TMPDIR since otherwise we see QA stamp comparision problems 443 # Similarly TMPDIR since otherwise we see QA stamp comparision problems
444 # Expand PV else it can trigger get_srcrev which can fail due to these variables being unset
445 localdata.setVar('PV', d.getVar('PV'))
444 localdata.delVar('DATETIME') 446 localdata.delVar('DATETIME')
445 localdata.delVar('DATE') 447 localdata.delVar('DATE')
446 localdata.delVar('TMPDIR') 448 localdata.delVar('TMPDIR')