diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/archiver.bbclass | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 05a7996676..78c6245553 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
@@ -171,12 +171,18 @@ python do_ar_original() { | |||
171 | # to be set when using the git fetcher, otherwise SRCREV cannot | 171 | # to be set when using the git fetcher, otherwise SRCREV cannot |
172 | # be set separately for each URL. | 172 | # be set separately for each URL. |
173 | params = bb.fetch2.decodeurl(url)[5] | 173 | params = bb.fetch2.decodeurl(url)[5] |
174 | type = bb.fetch2.decodeurl(url)[0] | ||
175 | location = bb.fetch2.decodeurl(url)[2] | ||
174 | name = params.get('name', '') | 176 | name = params.get('name', '') |
175 | if name in tarball_suffix: | 177 | if type.lower() == 'file': |
176 | if not name: | 178 | name_tmp = location.rstrip("*").rstrip("/") |
177 | bb.fatal("Cannot determine archive names for original source because 'name' URL parameter is unset in more than one URL. Add it to at least one of these: %s %s" % (tarball_suffix[name], url)) | 179 | name = os.path.basename(name_tmp) |
178 | else: | 180 | else: |
179 | bb.fatal("Cannot determine archive names for original source because 'name=' URL parameter '%s' is used twice. Make it unique in: %s %s" % (tarball_suffix[name], url)) | 181 | if name in tarball_suffix: |
182 | if not name: | ||
183 | bb.fatal("Cannot determine archive names for original source because 'name' URL parameter is unset in more than one URL. Add it to at least one of these: %s %s" % (tarball_suffix[name], url)) | ||
184 | else: | ||
185 | bb.fatal("Cannot determine archive names for original source because 'name=' URL parameter '%s' is used twice. Make it unique in: %s %s" % (tarball_suffix[name], url)) | ||
180 | tarball_suffix[name] = url | 186 | tarball_suffix[name] = url |
181 | create_tarball(d, tmpdir + '/.', name, ar_outdir) | 187 | create_tarball(d, tmpdir + '/.', name, ar_outdir) |
182 | 188 | ||