sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: 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).

(Bitbake rev: fdeaed70a7d1ff8be1a1de937cb864130b0c2c86)

Signed-off-by: Elizabeth 'pidge' Flanagan <pidge@toganlabs.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Elizabeth 'pidge' Flanagan 2017-03-30 11:06:13 +02:00 committed by Richard Purdie
parent d828ccb05e
commit e5e463fbbb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/lib/bb/fetch2/s3.py
View File

@ -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)