summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-11 12:04:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-11 12:04:12 +0000
commit96aeec41bcc1f34f124dc8d8326ccacfc145106e (patch)
tree6e36389c6a3b986efa5372d3acaa15520e9a8d8b
parent8e93b533ab6da5500b2eda7c81f35b4f8cf17e2e (diff)
downloadpoky-96aeec41bcc1f34f124dc8d8326ccacfc145106e.tar.gz
meta: Update mirror urls to new format and update yocto project urls
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/mirrors.bbclass112
-rw-r--r--meta/conf/distro/poky.conf39
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc12
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 @@
1MIRRORS[func] = "0" 1MIRRORS = "\
2MIRRORS () { 2${DEBIAN_MIRROR}/main http://snapshot.debian.net/archive/pool \n \
3${DEBIAN_MIRROR}/main http://snapshot.debian.net/archive/pool 3${DEBIAN_MIRROR} ftp://ftp.de.debian.org/debian/pool \n \
4${DEBIAN_MIRROR} ftp://ftp.de.debian.org/debian/pool 4${DEBIAN_MIRROR} ftp://ftp.au.debian.org/debian/pool \n \
5${DEBIAN_MIRROR} ftp://ftp.au.debian.org/debian/pool 5${DEBIAN_MIRROR} ftp://ftp.cl.debian.org/debian/pool \n \
6${DEBIAN_MIRROR} ftp://ftp.cl.debian.org/debian/pool 6${DEBIAN_MIRROR} ftp://ftp.hr.debian.org/debian/pool \n \
7${DEBIAN_MIRROR} ftp://ftp.hr.debian.org/debian/pool 7${DEBIAN_MIRROR} ftp://ftp.fi.debian.org/debian/pool \n \
8${DEBIAN_MIRROR} ftp://ftp.fi.debian.org/debian/pool 8${DEBIAN_MIRROR} ftp://ftp.hk.debian.org/debian/pool \n \
9${DEBIAN_MIRROR} ftp://ftp.hk.debian.org/debian/pool 9${DEBIAN_MIRROR} ftp://ftp.hu.debian.org/debian/pool \n \
10${DEBIAN_MIRROR} ftp://ftp.hu.debian.org/debian/pool 10${DEBIAN_MIRROR} ftp://ftp.ie.debian.org/debian/pool \n \
11${DEBIAN_MIRROR} ftp://ftp.ie.debian.org/debian/pool 11${DEBIAN_MIRROR} ftp://ftp.it.debian.org/debian/pool \n \
12${DEBIAN_MIRROR} ftp://ftp.it.debian.org/debian/pool 12${DEBIAN_MIRROR} ftp://ftp.jp.debian.org/debian/pool \n \
13${DEBIAN_MIRROR} ftp://ftp.jp.debian.org/debian/pool 13${DEBIAN_MIRROR} ftp://ftp.no.debian.org/debian/pool \n \
14${DEBIAN_MIRROR} ftp://ftp.no.debian.org/debian/pool 14${DEBIAN_MIRROR} ftp://ftp.pl.debian.org/debian/pool \n \
15${DEBIAN_MIRROR} ftp://ftp.pl.debian.org/debian/pool 15${DEBIAN_MIRROR} ftp://ftp.ro.debian.org/debian/pool \n \
16${DEBIAN_MIRROR} ftp://ftp.ro.debian.org/debian/pool 16${DEBIAN_MIRROR} ftp://ftp.si.debian.org/debian/pool \n \
17${DEBIAN_MIRROR} ftp://ftp.si.debian.org/debian/pool 17${DEBIAN_MIRROR} ftp://ftp.es.debian.org/debian/pool \n \
18${DEBIAN_MIRROR} ftp://ftp.es.debian.org/debian/pool 18${DEBIAN_MIRROR} ftp://ftp.se.debian.org/debian/pool \n \
19${DEBIAN_MIRROR} ftp://ftp.se.debian.org/debian/pool 19${DEBIAN_MIRROR} ftp://ftp.tr.debian.org/debian/pool \n \
20${DEBIAN_MIRROR} ftp://ftp.tr.debian.org/debian/pool 20${GNU_MIRROR} ftp://mirrors.kernel.org/gnu \n \
21${GNU_MIRROR} ftp://mirrors.kernel.org/gnu 21${GNU_MIRROR} ftp://ftp.matrix.com.br/pub/gnu \n \
22${GNU_MIRROR} ftp://ftp.matrix.com.br/pub/gnu 22${GNU_MIRROR} ftp://ftp.cs.ubc.ca/mirror2/gnu \n \
23${GNU_MIRROR} ftp://ftp.cs.ubc.ca/mirror2/gnu 23${GNU_MIRROR} ftp://sunsite.ust.hk/pub/gnu \n \
24${GNU_MIRROR} ftp://sunsite.ust.hk/pub/gnu 24${GNU_MIRROR} ftp://ftp.ayamura.org/pub/gnu \n \
25${GNU_MIRROR} ftp://ftp.ayamura.org/pub/gnu 25${KERNELORG_MIRROR} http://www.kernel.org/pub \n \
26${KERNELORG_MIRROR} http://www.kernel.org/pub 26${KERNELORG_MIRROR} ftp://ftp.us.kernel.org/pub \n \
27${KERNELORG_MIRROR} ftp://ftp.us.kernel.org/pub 27${KERNELORG_MIRROR} ftp://ftp.uk.kernel.org/pub \n \
28${KERNELORG_MIRROR} ftp://ftp.uk.kernel.org/pub 28${KERNELORG_MIRROR} ftp://ftp.hk.kernel.org/pub \n \
29${KERNELORG_MIRROR} ftp://ftp.hk.kernel.org/pub 29${KERNELORG_MIRROR} ftp://ftp.au.kernel.org/pub \n \
30${KERNELORG_MIRROR} ftp://ftp.au.kernel.org/pub 30${KERNELORG_MIRROR} ftp://ftp.jp.kernel.org/pub \n \
31${KERNELORG_MIRROR} ftp://ftp.jp.kernel.org/pub 31ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ \n \
32ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ 32ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/ \n \
33ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/ 33ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/ \n \
34ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/ 34ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \
35ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN 35ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ \n \
36ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ 36ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \
37ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ 37ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/ \n \
38ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/ 38ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ \n \
39ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ 39ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \n \
40ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ 40ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \n \
41ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ 41ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ \n \
42ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ 42http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ \n \
43http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ 43http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \n \
44http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ 44ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \n \
45ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ 45ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tau.ac.il/pub/unix/admin/ \n \
46ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tau.ac.il/pub/unix/admin/ 46ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ \n \
47ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ 47ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ \n \
48ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ 48ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.kaizo.org/pub/lsof/ \n \
49ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.kaizo.org/pub/lsof/ 49ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tu-darmstadt.de/pub/sysadmin/lsof/ \n \
50ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tu-darmstadt.de/pub/sysadmin/lsof/ 50ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tux.org/pub/sites/vic.cc.purdue.edu/tools/unix/lsof/ \n \
51ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tux.org/pub/sites/vic.cc.purdue.edu/tools/unix/lsof/ 51ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ \n \
52ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ 52ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ \n \
53ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ 53ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://the.wiretapped.net/pub/security/host-security/lsof/ \n \
54ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://the.wiretapped.net/pub/security/host-security/lsof/ 54http://www.apache.org/dist http://archive.apache.org/dist \n \
55http://www.apache.org/dist http://archive.apache.org/dist 55"
56
57}
58 56
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"
150 150
151require conf/distro/include/world-broken.inc 151require conf/distro/include/world-broken.inc
152 152
153PREMIRRORS_append = "\ 153PREMIRRORS =+ "\
154bzr://.*/.* http://pokylinux.org/sources/ \n \ 154bzr://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
155cvs://.*/.* http://pokylinux.org/sources/ \n \ 155cvs://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
156git://.*/.* http://pokylinux.org/sources/ \n \ 156git://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
157hg://.*/.* http://pokylinux.org/sources/ \n \ 157hg://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
158osc://.*/.* http://pokylinux.org/sources/ \n \ 158osc://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
159p4://.*/.* http://pokylinux.org/sources/ \n \ 159p4://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
160svk://.*/.* http://pokylinux.org/sources/ \n \ 160svk://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
161svn://.*/.* http://pokylinux.org/sources/ \n \ 161svn://.*/.* http://autobuilder.yoctoproject.org/sources/ \n"
162bzr://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ 162
163cvs://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ 163MIRRORS =+ "\
164git://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ 164ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
165hg://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ 165http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
166osc://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ 166https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n"
167p4://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
168svk://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
169svn://.*/.* http://autobuilder.pokylinux.org/sources/ \n"
170
171MIRRORS_append = "\
172ftp://.*/.* http://pokylinux.org/sources/ \n \
173http://.*/.* http://pokylinux.org/sources/ \n \
174https://.*/.* http://pokylinux.org/sources/ \n \
175ftp://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
176http://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
177https://.*/.* http://autobuilder.pokylinux.org/sources/ \n"
178 167
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"
25 25
26DEBIANNAME_libgcc = "libgcc1" 26DEBIANNAME_libgcc = "libgcc1"
27 27
28MIRRORS_prepend () { 28MIRRORS =+ "\
29${GNU_MIRROR}/gcc/releases/ ftp://gcc.gnu.org/pub/gcc/releases/ 29${GNU_MIRROR}/gcc/releases/ ftp://gcc.gnu.org/pub/gcc/releases/ \n \
30${GNU_MIRROR}/gcc/ http://mirrors.rcn.net/pub/sourceware/gcc/releases/ 30${GNU_MIRROR}/gcc/ http://mirrors.rcn.net/pub/sourceware/gcc/releases/ \n \
31${GNU_MIRROR}/gcc/releases/ http://gcc.get-software.com/releases/ 31${GNU_MIRROR}/gcc/releases/ http://gcc.get-software.com/releases/ \n \
32${GNU_MIRROR}/gcc/ http://gcc.get-software.com/releases/ 32${GNU_MIRROR}/gcc/ http://gcc.get-software.com/releases/ \n \
33} 33"
34 34
35# 35#
36# Set some default values 36# Set some default values