diff options
| author |   Elizabeth 'pidge' Flanagan <pidge@toganlabs.com> | 2017-03-30 11:06:13 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-30 10:41:44 +0100 |
| commit | fdeaed70a7d1ff8be1a1de937cb864130b0c2c86 (patch) | |
| tree | 094640f8a4d1eb9111fc3109a6d80f5e93e98268 | |
| parent | 968a77388dd1a24c1dadec6ce49bf53ebb5b643f (diff) | |
| download | bitbake-contrib-fdeaed70a7d1ff8be1a1de937cb864130b0c2c86.tar.gz | |
s3.py: Remove hardcoded aws
This commit looks to see if FETCHCMD_s3 is set and if not, sets
it.
This is needed because I've use cases where I don't use aws, but
s3cmd (due to license).
Signed-off-by: Elizabeth 'pidge' Flanagan <pidge@toganlabs.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/s3.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/bb/fetch2/s3.py b/lib/bb/fetch2/s3.py index 27993aacf..162928862 100644 --- a/lib/bb/fetch2/s3.py +++ b/lib/bb/fetch2/s3.py @@ -55,13 +55,15 @@ class S3(FetchMethod): ud.localfile = d.expand(urllib.parse.unquote(ud.basename)) + ud.basecmd = d.getVar("FETCHCMD_s3") or "/usr/bin/env aws s3" + def download(self, ud, d): """ Fetch urls Assumes localpath was called first """ - cmd = 'aws s3 cp s3://%s%s %s' % (ud.host, ud.path, ud.localpath) + cmd = '%s cp s3://%s%s %s' % (ud.basecmd, ud.host, ud.path, ud.localpath) bb.fetch2.check_network_access(d, cmd, ud.url) runfetchcmd(cmd, d) @@ -83,7 +85,7 @@ class S3(FetchMethod): Check the status of a URL """ - cmd = 'aws s3 ls s3://%s%s' % (ud.host, ud.path) + cmd = '%s ls s3://%s%s' % (ud.basecmd, ud.host, ud.path) bb.fetch2.check_network_access(d, cmd, ud.url) output = runfetchcmd(cmd, d) |