diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-26 17:54:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:32:57 +0000 |
commit | 889a5cc221dc8f77c87bce03781aaf044cb74da4 (patch) | |
tree | 77b0cb44a78c67681f22cf15c3369f5fe8a76add /meta | |
parent | 28d17cf9422ca16beb582dda4b387f0ff06949f9 (diff) | |
download | poky-889a5cc221dc8f77c87bce03781aaf044cb74da4.tar.gz |
mirrors/own-mirrors/sanity: Updates after npm fetcher addition
Update the classes after the addition of the npm fetcher to
match the other fetcher additions.
(From OE-Core rev: b91c5c94182ce08d4daccf85eaa0375daefc356e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/mirrors.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/own-mirrors.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/sanity.bbclass | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass index 488b86d33a..9e6d4836db 100644 --- a/meta/classes/mirrors.bbclass +++ b/meta/classes/mirrors.bbclass | |||
@@ -54,6 +54,7 @@ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | |||
54 | osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | 54 | osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ |
55 | https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | 55 | https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ |
56 | ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | 56 | ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ |
57 | npm://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | ||
57 | cvs://.*/.* http://sources.openembedded.org/ \n \ | 58 | cvs://.*/.* http://sources.openembedded.org/ \n \ |
58 | svn://.*/.* http://sources.openembedded.org/ \n \ | 59 | svn://.*/.* http://sources.openembedded.org/ \n \ |
59 | git://.*/.* http://sources.openembedded.org/ \n \ | 60 | git://.*/.* http://sources.openembedded.org/ \n \ |
@@ -63,6 +64,7 @@ p4://.*/.* http://sources.openembedded.org/ \n \ | |||
63 | osc://.*/.* http://sources.openembedded.org/ \n \ | 64 | osc://.*/.* http://sources.openembedded.org/ \n \ |
64 | https?$://.*/.* http://sources.openembedded.org/ \n \ | 65 | https?$://.*/.* http://sources.openembedded.org/ \n \ |
65 | ftp://.*/.* http://sources.openembedded.org/ \n \ | 66 | ftp://.*/.* http://sources.openembedded.org/ \n \ |
67 | npm://.*/.* http://sources.openembedded.org/ \n \ | ||
66 | ${CPAN_MIRROR} http://cpan.metacpan.org/ \n \ | 68 | ${CPAN_MIRROR} http://cpan.metacpan.org/ \n \ |
67 | ${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \ | 69 | ${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \ |
68 | " | 70 | " |
diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass index e235227ec8..12b42675bc 100644 --- a/meta/classes/own-mirrors.bbclass +++ b/meta/classes/own-mirrors.bbclass | |||
@@ -9,4 +9,5 @@ p4://.*/.* ${SOURCE_MIRROR_URL} | |||
9 | osc://.*/.* ${SOURCE_MIRROR_URL} | 9 | osc://.*/.* ${SOURCE_MIRROR_URL} |
10 | https?$://.*/.* ${SOURCE_MIRROR_URL} | 10 | https?$://.*/.* ${SOURCE_MIRROR_URL} |
11 | ftp://.*/.* ${SOURCE_MIRROR_URL} | 11 | ftp://.*/.* ${SOURCE_MIRROR_URL} |
12 | npm://.*/.* ${SOURCE_MIRROR_URL} | ||
12 | } | 13 | } |
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 31f01ca9ba..a0553eef87 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -841,7 +841,7 @@ def check_sanity_everybuild(status, d): | |||
841 | mirror_vars = ['MIRRORS', 'PREMIRRORS', 'SSTATE_MIRRORS'] | 841 | mirror_vars = ['MIRRORS', 'PREMIRRORS', 'SSTATE_MIRRORS'] |
842 | protocols = ['http', 'ftp', 'file', 'https', \ | 842 | protocols = ['http', 'ftp', 'file', 'https', \ |
843 | 'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \ | 843 | 'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \ |
844 | 'bzr', 'cvs'] | 844 | 'bzr', 'cvs', 'npm'] |
845 | for mirror_var in mirror_vars: | 845 | for mirror_var in mirror_vars: |
846 | mirrors = (d.getVar(mirror_var, True) or '').replace('\\n', '\n').split('\n') | 846 | mirrors = (d.getVar(mirror_var, True) or '').replace('\\n', '\n').split('\n') |
847 | for mirror_entry in mirrors: | 847 | for mirror_entry in mirrors: |