diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-21 10:45:56 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-23 17:09:26 +0000 |
commit | 5920b3f129f5fb4bc8e98f98999f1d1247c00ce9 (patch) | |
tree | 9c245e9d58f3d0da5a3b1ae60f8cfb8be68b5ad2 /bitbake | |
parent | 9f123238261a68e37cec634782e9320633cac5d4 (diff) | |
download | poky-5920b3f129f5fb4bc8e98f98999f1d1247c00ce9.tar.gz |
bitbake: fetch2/perforce: Fix localfile to include ud.module
As reported by Katu Txakur, the output depends on the module path
set so this needs to be accounted for in localfile.
(Bitbake rev: 9861ed37bb1c5d09c3b4852d2a252e3f3c86ab14)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/fetch2/perforce.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index 6f3c95b6ce..da6d337461 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py | |||
@@ -119,6 +119,7 @@ class Perforce(FetchMethod): | |||
119 | cleanedpath = ud.path.replace('/...', '').replace('/', '.') | 119 | cleanedpath = ud.path.replace('/...', '').replace('/', '.') |
120 | cleanedhost = ud.host.replace(':', '.') | 120 | cleanedhost = ud.host.replace(':', '.') |
121 | 121 | ||
122 | cleanedmodule = "" | ||
122 | # Merge the path and module into the final depot location | 123 | # Merge the path and module into the final depot location |
123 | if ud.module: | 124 | if ud.module: |
124 | if ud.module.find('/') == 0: | 125 | if ud.module.find('/') == 0: |
@@ -133,7 +134,7 @@ class Perforce(FetchMethod): | |||
133 | 134 | ||
134 | ud.setup_revisions(d) | 135 | ud.setup_revisions(d) |
135 | 136 | ||
136 | ud.localfile = d.expand('%s_%s_%s.tar.gz' % (cleanedhost, cleanedpath, ud.revision)) | 137 | ud.localfile = d.expand('%s_%s_%s_%s.tar.gz' % (cleanedhost, cleanedpath, cleandedmodule, ud.revision)) |
137 | 138 | ||
138 | def _buildp4command(self, ud, d, command, depot_filename=None): | 139 | def _buildp4command(self, ud, d, command, depot_filename=None): |
139 | """ | 140 | """ |