diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-06-05 12:13:50 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-15 17:57:30 +0100 |
commit | 783829427157b82dd021be345fe00afdf4d84a68 (patch) | |
tree | 46f95f4f37aabbcb5dc6101f222469cd25c914b6 /bitbake/lib/bb/fetch2/perforce.py | |
parent | b054015357b2b03f308af00a41b29c649cbca171 (diff) | |
download | poky-783829427157b82dd021be345fe00afdf4d84a68.tar.gz |
bitbake: fetch2: unify the way fetchers determine DL_DIR and FETCHCMD
Currently there is quite some variation between the fetchers in terms
of how they determine the subdirectory within DL_DIR and the base
fetch command to run. Some rely on variables being set externally
(e.g. from bitbake.conf in oe-core), some respect these external
variables but provide fallback defaults and some use only hardcoded
internal values. Try to unify the approach used across the various
fetchers.
(Bitbake rev: efd5e35af4b08501c67e8b30f30d9457f6fdf610)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/perforce.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/perforce.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index 3debad59f4..903a8e61ae 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py | |||
@@ -43,13 +43,9 @@ class Perforce(FetchMethod): | |||
43 | provided by the env, use it. If P4PORT is specified by the recipe, use | 43 | provided by the env, use it. If P4PORT is specified by the recipe, use |
44 | its values, which may override the settings in P4CONFIG. | 44 | its values, which may override the settings in P4CONFIG. |
45 | """ | 45 | """ |
46 | ud.basecmd = d.getVar('FETCHCMD_p4') | 46 | ud.basecmd = d.getVar("FETCHCMD_p4") or "/usr/bin/env p4" |
47 | if not ud.basecmd: | ||
48 | ud.basecmd = "/usr/bin/env p4" | ||
49 | 47 | ||
50 | ud.dldir = d.getVar('P4DIR') | 48 | ud.dldir = d.getVar("P4DIR") or (d.getVar("DL_DIR") + "/p4") |
51 | if not ud.dldir: | ||
52 | ud.dldir = '%s/%s' % (d.getVar('DL_DIR'), 'p4') | ||
53 | 49 | ||
54 | path = ud.url.split('://')[1] | 50 | path = ud.url.split('://')[1] |
55 | path = path.split(';')[0] | 51 | path = path.split(';')[0] |