From 9560d58596ceb50280b81296688883f3fca99aa6 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 4 May 2015 14:49:53 -0700 Subject: 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. Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/classes/mirrors.bbclass | 2 -- meta/classes/own-mirrors.bbclass | 1 - meta/classes/sanity.bbclass | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/classes') 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 \ git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -svk://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ @@ -62,7 +61,6 @@ svn://.*/.* http://sources.openembedded.org/ \n \ git://.*/.* http://sources.openembedded.org/ \n \ hg://.*/.* http://sources.openembedded.org/ \n \ bzr://.*/.* http://sources.openembedded.org/ \n \ -svk://.*/.* http://sources.openembedded.org/ \n \ p4://.*/.* http://sources.openembedded.org/ \n \ osc://.*/.* http://sources.openembedded.org/ \n \ https?$://.*/.* 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} gitsm://.*/.* ${SOURCE_MIRROR_URL} hg://.*/.* ${SOURCE_MIRROR_URL} bzr://.*/.* ${SOURCE_MIRROR_URL} -svk://.*/.* ${SOURCE_MIRROR_URL} p4://.*/.* ${SOURCE_MIRROR_URL} osc://.*/.* ${SOURCE_MIRROR_URL} https?$://.*/.* ${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): import re mirror_vars = ['MIRRORS', 'PREMIRRORS', 'SSTATE_MIRRORS'] protocols = ['http', 'ftp', 'file', 'https', \ - 'git', 'gitsm', 'hg', 'osc', 'p4', 'svk', 'svn', \ + 'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \ 'bzr', 'cvs'] for mirror_var in mirror_vars: mirrors = (d.getVar(mirror_var, True) or '').replace('\\n', '\n').split('\n') -- cgit 1.2.3-korg