[bitbake-devel] [PATCHv2] s3.py: Remove hardcoded aws
Elizabeth 'pidge' Flanagan
pidge at toganlabs.com
Thu Mar 30 09:06:13 UTC 2017
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 at toganlabs.com>
---
lib/bb/fetch2/s3.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/bb/fetch2/s3.py b/lib/bb/fetch2/s3.py
index 27993aa..1629288 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)
--
1.9.1
More information about the bitbake-devel
mailing list