poky.bbclass: Move mirrors/premirrors to poky.conf

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 27 insertions, 30 deletions

diff --git a/meta/classes/poky.bbclass b/meta/classes/poky.bbclass
deleted file mode 100644
index 7d3c28ffe2..0000000000
--- a/meta/classes/poky.bbclass
+++ /dev/null
@@ -1,29 +0,0 @@
-PREMIRRORS_append () {
-bzr://.*/.*   http://pokylinux.org/sources/
-cvs://.*/.*   http://pokylinux.org/sources/
-git://.*/.*   http://pokylinux.org/sources/
-hg://.*/.*    http://pokylinux.org/sources/
-osc://.*/.*   http://pokylinux.org/sources/
-p4://.*/.*    http://pokylinux.org/sources/
-svk://.*/.*   http://pokylinux.org/sources/
-svn://.*/.*   http://pokylinux.org/sources/
-
-bzr://.*/.*   http://autobuilder.pokylinux.org/sources/
-cvs://.*/.*   http://autobuilder.pokylinux.org/sources/
-git://.*/.*   http://autobuilder.pokylinux.org/sources/
-hg://.*/.*    http://autobuilder.pokylinux.org/sources/
-osc://.*/.*   http://autobuilder.pokylinux.org/sources/
-p4://.*/.*    http://autobuilder.pokylinux.org/sources/
-svk://.*/.*   http://autobuilder.pokylinux.org/sources/
-svn://.*/.*   http://autobuilder.pokylinux.org/sources/
-}
-
-MIRRORS_append () {
-ftp://.*/.*     http://pokylinux.org/sources/
-http://.*/.*    http://pokylinux.org/sources/
-https://.*/.*   http://pokylinux.org/sources/
-
-ftp://.*/.*      http://autobuilder.pokylinux.org/sources/
-http://.*/.*     http://autobuilder.pokylinux.org/sources/
-https://.*/.*    http://autobuilder.pokylinux.org/sources/
-}
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ee390dca85..fe2d49a3a9 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -12,7 +12,7 @@ USER_CLASSES ?= ""
 
 PACKAGE_CLASSES ?= "package_ipk"
 INHERIT_INSANE ?= "insane"
-INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian poky devshell ${INHERIT_INSANE} sstate"
+INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE} sstate"
 # For some reason, this doesn't work
 # TARGET_OS ?= "linux"
 # TARGET_VENDOR ?= "-poky"
@@ -141,6 +141,32 @@ COMMERCIAL_QT ?= ""
 
 require conf/distro/include/world-broken.inc
 
+PREMIRRORS_append = "\
+bzr://.*/.*   http://pokylinux.org/sources/ \n \
+cvs://.*/.*   http://pokylinux.org/sources/ \n \
+git://.*/.*   http://pokylinux.org/sources/ \n \
+hg://.*/.*    http://pokylinux.org/sources/ \n \
+osc://.*/.*   http://pokylinux.org/sources/ \n \
+p4://.*/.*    http://pokylinux.org/sources/ \n \
+svk://.*/.*   http://pokylinux.org/sources/ \n \
+svn://.*/.*   http://pokylinux.org/sources/ \n \
+bzr://.*/.*   http://autobuilder.pokylinux.org/sources/ \n \
+cvs://.*/.*   http://autobuilder.pokylinux.org/sources/ \n \
+git://.*/.*   http://autobuilder.pokylinux.org/sources/ \n \
+hg://.*/.*    http://autobuilder.pokylinux.org/sources/ \n \
+osc://.*/.*   http://autobuilder.pokylinux.org/sources/ \n \
+p4://.*/.*    http://autobuilder.pokylinux.org/sources/ \n \
+svk://.*/.*   http://autobuilder.pokylinux.org/sources/ \n \
+svn://.*/.*   http://autobuilder.pokylinux.org/sources/ \n"
+
+MIRRORS_append = "\
+ftp://.*/.*     http://pokylinux.org/sources/ \n \
+http://.*/.*    http://pokylinux.org/sources/ \n \
+https://.*/.*   http://pokylinux.org/sources/ \n \
+ftp://.*/.*      http://autobuilder.pokylinux.org/sources/ \n \
+http://.*/.*     http://autobuilder.pokylinux.org/sources/ \n \
+https://.*/.*    http://autobuilder.pokylinux.org/sources/ \n"
+
 # Setup our hash policy
 BB_SIGNATURE_HANDLER = "basic"
 BB_HASHTASK_WHITELIST = "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)"