diff options
author | Ross Burton <ross.burton@intel.com> | 2016-01-25 13:38:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:39:01 +0000 |
commit | 0c0b07286f28f33d2334681b3a4d378d14f90d76 (patch) | |
tree | 7c52b74a88ea0fc84319beb7f4ec25f150431cf9 /meta | |
parent | f9266106db3c0e0ab526e426086d542c9ed6b62c (diff) | |
download | poky-0c0b07286f28f33d2334681b3a4d378d14f90d76.tar.gz |
meta: add ASSUME_PROVIDED dependency on wget-native for http fetches
For clarity and consistency, add a dependency on wget-native for any URIs that
will be fetched using the wget fetcher, and add wget-native to ASSUME_PROVIDED.
(From OE-Core rev: 91583704383aef3d4742630380fd3f1d38c4b00a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 4 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d68ffbe848..d4b11bc7a8 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -553,6 +553,10 @@ python () { | |||
553 | for uri in srcuri.split(): | 553 | for uri in srcuri.split(): |
554 | (scheme, _ , path) = bb.fetch.decodeurl(uri)[:3] | 554 | (scheme, _ , path) = bb.fetch.decodeurl(uri)[:3] |
555 | 555 | ||
556 | # HTTP/FTP use the wget fetcher | ||
557 | if scheme in ("http", "https", "ftp"): | ||
558 | d.appendVarFlag('do_fetch', 'depends', ' wget-native:do_populate_sysroot') | ||
559 | |||
556 | # Svn packages should DEPEND on subversion-native | 560 | # Svn packages should DEPEND on subversion-native |
557 | if scheme == "svn": | 561 | if scheme == "svn": |
558 | d.appendVarFlag('do_fetch', 'depends', ' subversion-native:do_populate_sysroot') | 562 | d.appendVarFlag('do_fetch', 'depends', ' subversion-native:do_populate_sysroot') |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 1a2f420c74..775c0c6617 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -179,6 +179,7 @@ ASSUME_PROVIDED = "\ | |||
179 | texinfo-native \ | 179 | texinfo-native \ |
180 | bash-native \ | 180 | bash-native \ |
181 | sed-native \ | 181 | sed-native \ |
182 | wget-native \ | ||
182 | " | 183 | " |
183 | # gzip-native should be listed above? | 184 | # gzip-native should be listed above? |
184 | 185 | ||