meta: Update mirror urls to new format and update yocto project urls

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 75 insertions, 88 deletions

diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index 9b430abcee..2eb99cd23f 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -1,58 +1,56 @@
-MIRRORS[func] = "0"
-MIRRORS () {
-${DEBIAN_MIRROR}/main	http://snapshot.debian.net/archive/pool
-${DEBIAN_MIRROR}	ftp://ftp.de.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.au.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.cl.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.hr.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.fi.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.hk.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.hu.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.ie.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.it.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.jp.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.no.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.pl.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.ro.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.si.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.es.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.se.debian.org/debian/pool
-${DEBIAN_MIRROR}	ftp://ftp.tr.debian.org/debian/pool
-${GNU_MIRROR}	ftp://mirrors.kernel.org/gnu
-${GNU_MIRROR}	ftp://ftp.matrix.com.br/pub/gnu
-${GNU_MIRROR}	ftp://ftp.cs.ubc.ca/mirror2/gnu
-${GNU_MIRROR}	ftp://sunsite.ust.hk/pub/gnu
-${GNU_MIRROR}	ftp://ftp.ayamura.org/pub/gnu
-${KERNELORG_MIRROR}	http://www.kernel.org/pub
-${KERNELORG_MIRROR}	ftp://ftp.us.kernel.org/pub
-${KERNELORG_MIRROR}	ftp://ftp.uk.kernel.org/pub
-${KERNELORG_MIRROR}	ftp://ftp.hk.kernel.org/pub
-${KERNELORG_MIRROR}	ftp://ftp.au.kernel.org/pub
-${KERNELORG_MIRROR}	ftp://ftp.jp.kernel.org/pub
-ftp://ftp.gnupg.org/gcrypt/     ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/
-ftp://ftp.gnupg.org/gcrypt/     ftp://ftp.surfnet.nl/pub/security/gnupg/
-ftp://ftp.gnupg.org/gcrypt/     http://gulus.USherbrooke.ca/pub/appl/GnuPG/
-ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN
-ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/
-ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/
-ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/
-ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/
-ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/
-ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
-ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/
-http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/
-http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.tau.ac.il/pub/unix/admin/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.kaizo.org/pub/lsof/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.tu-darmstadt.de/pub/sysadmin/lsof/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.tux.org/pub/sites/vic.cc.purdue.edu/tools/unix/lsof/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://sunsite.ualberta.ca/pub/Mirror/lsof/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://the.wiretapped.net/pub/security/host-security/lsof/
-http://www.apache.org/dist  http://archive.apache.org/dist
-
-}
+MIRRORS = "\
+${DEBIAN_MIRROR}/main	http://snapshot.debian.net/archive/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.de.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.au.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.cl.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.hr.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.fi.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.hk.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.hu.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.ie.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.it.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.jp.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.no.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.pl.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.ro.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.si.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.es.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.se.debian.org/debian/pool \n \
+${DEBIAN_MIRROR}	ftp://ftp.tr.debian.org/debian/pool \n \
+${GNU_MIRROR}	ftp://mirrors.kernel.org/gnu \n \
+${GNU_MIRROR}	ftp://ftp.matrix.com.br/pub/gnu \n \
+${GNU_MIRROR}	ftp://ftp.cs.ubc.ca/mirror2/gnu \n \
+${GNU_MIRROR}	ftp://sunsite.ust.hk/pub/gnu \n \
+${GNU_MIRROR}	ftp://ftp.ayamura.org/pub/gnu \n \
+${KERNELORG_MIRROR}	http://www.kernel.org/pub \n \
+${KERNELORG_MIRROR}	ftp://ftp.us.kernel.org/pub \n \
+${KERNELORG_MIRROR}	ftp://ftp.uk.kernel.org/pub \n \
+${KERNELORG_MIRROR}	ftp://ftp.hk.kernel.org/pub \n \
+${KERNELORG_MIRROR}	ftp://ftp.au.kernel.org/pub \n \
+${KERNELORG_MIRROR}	ftp://ftp.jp.kernel.org/pub \n \
+ftp://ftp.gnupg.org/gcrypt/     ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ \n \
+ftp://ftp.gnupg.org/gcrypt/     ftp://ftp.surfnet.nl/pub/security/gnupg/ \n \
+ftp://ftp.gnupg.org/gcrypt/     http://gulus.USherbrooke.ca/pub/appl/GnuPG/ \n \
+ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \
+ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ \n \
+ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \
+ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/ \n \
+ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ \n \
+ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \n \
+ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \n \
+ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ \n \
+http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ \n \
+http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.tau.ac.il/pub/unix/admin/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.kaizo.org/pub/lsof/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.tu-darmstadt.de/pub/sysadmin/lsof/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.tux.org/pub/sites/vic.cc.purdue.edu/tools/unix/lsof/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ \n \
+ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://the.wiretapped.net/pub/security/host-security/lsof/ \n \
+http://www.apache.org/dist  http://archive.apache.org/dist \n \
+"
 
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 5e560fa5e1..12f60a1f57 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -150,29 +150,18 @@ BB_GENERATE_MIRROR_TARBALLS ??= "0"
 
 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"
+PREMIRRORS =+ "\
+bzr://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
+cvs://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
+git://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
+hg://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n \
+osc://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
+p4://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n \
+svk://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
+svn://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n"
+
+MIRRORS =+ "\
+ftp://.*/.*      http://autobuilder.yoctoproject.org/sources/ \n \
+http://.*/.*     http://autobuilder.yoctoproject.org/sources/ \n \
+https://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n"
 
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 1e9c65e662..a3fa234422 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -25,12 +25,12 @@ SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"
 
 DEBIANNAME_libgcc = "libgcc1"
 
-MIRRORS_prepend () {
-${GNU_MIRROR}/gcc/releases/    ftp://gcc.gnu.org/pub/gcc/releases/
-${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
-${GNU_MIRROR}/gcc/releases/    http://gcc.get-software.com/releases/
-${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
-}
+MIRRORS =+ "\
+${GNU_MIRROR}/gcc/releases/    ftp://gcc.gnu.org/pub/gcc/releases/ \n \
+${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/ \n \
+${GNU_MIRROR}/gcc/releases/    http://gcc.get-software.com/releases/ \n \
+${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/ \n \
+"
 
 #
 # Set some default values