summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-05-04 14:49:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-05 22:15:17 +0100
commit09fa915b56e4f20d69ab567aef446c34ba7ebdf0 (patch)
treed300b51d9ae3cfcc7d9e1139b79e62a8e346d5dc /meta
parentc4359d1d825ed3c4f935446b0fad9531158f0b9b (diff)
downloadpoky-09fa915b56e4f20d69ab567aef446c34ba7ebdf0.tar.gz
mirrors.bbclass: drop support for svk sources
The svk fetcher was removed from bitbake 1.22, so svk support should logically have been removed from oe-core Daisy onwards. (From OE-Core rev: 9560d58596ceb50280b81296688883f3fca99aa6) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/mirrors.bbclass2
-rw-r--r--meta/classes/own-mirrors.bbclass1
-rw-r--r--meta/classes/sanity.bbclass2
3 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index 0d9b5174fb..081c982aa1 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -52,7 +52,6 @@ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
52git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ 52git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
53hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ 53hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
54bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ 54bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
55svk://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
56p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ 55p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
57osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ 56osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
58https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ 57https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
@@ -62,7 +61,6 @@ svn://.*/.* http://sources.openembedded.org/ \n \
62git://.*/.* http://sources.openembedded.org/ \n \ 61git://.*/.* http://sources.openembedded.org/ \n \
63hg://.*/.* http://sources.openembedded.org/ \n \ 62hg://.*/.* http://sources.openembedded.org/ \n \
64bzr://.*/.* http://sources.openembedded.org/ \n \ 63bzr://.*/.* http://sources.openembedded.org/ \n \
65svk://.*/.* http://sources.openembedded.org/ \n \
66p4://.*/.* http://sources.openembedded.org/ \n \ 64p4://.*/.* http://sources.openembedded.org/ \n \
67osc://.*/.* http://sources.openembedded.org/ \n \ 65osc://.*/.* http://sources.openembedded.org/ \n \
68https?$://.*/.* http://sources.openembedded.org/ \n \ 66https?$://.*/.* http://sources.openembedded.org/ \n \
diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass
index 77bf0c1c14..e235227ec8 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/meta/classes/own-mirrors.bbclass
@@ -5,7 +5,6 @@ git://.*/.* ${SOURCE_MIRROR_URL}
5gitsm://.*/.* ${SOURCE_MIRROR_URL} 5gitsm://.*/.* ${SOURCE_MIRROR_URL}
6hg://.*/.* ${SOURCE_MIRROR_URL} 6hg://.*/.* ${SOURCE_MIRROR_URL}
7bzr://.*/.* ${SOURCE_MIRROR_URL} 7bzr://.*/.* ${SOURCE_MIRROR_URL}
8svk://.*/.* ${SOURCE_MIRROR_URL}
9p4://.*/.* ${SOURCE_MIRROR_URL} 8p4://.*/.* ${SOURCE_MIRROR_URL}
10osc://.*/.* ${SOURCE_MIRROR_URL} 9osc://.*/.* ${SOURCE_MIRROR_URL}
11https?$://.*/.* ${SOURCE_MIRROR_URL} 10https?$://.*/.* ${SOURCE_MIRROR_URL}
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index cca39c9b52..f8b9fac453 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -772,7 +772,7 @@ def check_sanity_everybuild(status, d):
772 import re 772 import re
773 mirror_vars = ['MIRRORS', 'PREMIRRORS', 'SSTATE_MIRRORS'] 773 mirror_vars = ['MIRRORS', 'PREMIRRORS', 'SSTATE_MIRRORS']
774 protocols = ['http', 'ftp', 'file', 'https', \ 774 protocols = ['http', 'ftp', 'file', 'https', \
775 'git', 'gitsm', 'hg', 'osc', 'p4', 'svk', 'svn', \ 775 'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \
776 'bzr', 'cvs'] 776 'bzr', 'cvs']
777 for mirror_var in mirror_vars: 777 for mirror_var in mirror_vars:
778 mirrors = (d.getVar(mirror_var, True) or '').replace('\\n', '\n').split('\n') 778 mirrors = (d.getVar(mirror_var, True) or '').replace('\\n', '\n').split('\n')