diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-11 12:04:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-11 12:04:12 +0000 |
commit | 96aeec41bcc1f34f124dc8d8326ccacfc145106e (patch) | |
tree | 6e36389c6a3b986efa5372d3acaa15520e9a8d8b | |
parent | 8e93b533ab6da5500b2eda7c81f35b4f8cf17e2e (diff) | |
download | poky-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.bbclass | 112 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 39 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 12 |
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 @@ | |||
1 | MIRRORS[func] = "0" | 1 | MIRRORS = "\ |
2 | MIRRORS () { | 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 | 31 | ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ \n \ |
32 | ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ | 32 | ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/ \n \ |
33 | ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/ | 33 | ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/ \n \ |
34 | ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/ | 34 | ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \ |
35 | ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN | 35 | ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ \n \ |
36 | ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ | 36 | ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \ |
37 | ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ | 37 | ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/ \n \ |
38 | ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/ | 38 | ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ \n \ |
39 | ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ | 39 | ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \n \ |
40 | ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ | 40 | ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \n \ |
41 | ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ | 41 | ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ \n \ |
42 | ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ | 42 | http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ \n \ |
43 | http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ | 43 | http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \n \ |
44 | http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ | 44 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \n \ |
45 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ | 45 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tau.ac.il/pub/unix/admin/ \n \ |
46 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tau.ac.il/pub/unix/admin/ | 46 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ \n \ |
47 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ | 47 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ \n \ |
48 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ | 48 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.kaizo.org/pub/lsof/ \n \ |
49 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.kaizo.org/pub/lsof/ | 49 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tu-darmstadt.de/pub/sysadmin/lsof/ \n \ |
50 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tu-darmstadt.de/pub/sysadmin/lsof/ | 50 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tux.org/pub/sites/vic.cc.purdue.edu/tools/unix/lsof/ \n \ |
51 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tux.org/pub/sites/vic.cc.purdue.edu/tools/unix/lsof/ | 51 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ \n \ |
52 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ | 52 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ \n \ |
53 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ | 53 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://the.wiretapped.net/pub/security/host-security/lsof/ \n \ |
54 | ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://the.wiretapped.net/pub/security/host-security/lsof/ | 54 | http://www.apache.org/dist http://archive.apache.org/dist \n \ |
55 | http://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 | ||
151 | require conf/distro/include/world-broken.inc | 151 | require conf/distro/include/world-broken.inc |
152 | 152 | ||
153 | PREMIRRORS_append = "\ | 153 | PREMIRRORS =+ "\ |
154 | bzr://.*/.* http://pokylinux.org/sources/ \n \ | 154 | bzr://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
155 | cvs://.*/.* http://pokylinux.org/sources/ \n \ | 155 | cvs://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
156 | git://.*/.* http://pokylinux.org/sources/ \n \ | 156 | git://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
157 | hg://.*/.* http://pokylinux.org/sources/ \n \ | 157 | hg://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
158 | osc://.*/.* http://pokylinux.org/sources/ \n \ | 158 | osc://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
159 | p4://.*/.* http://pokylinux.org/sources/ \n \ | 159 | p4://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
160 | svk://.*/.* http://pokylinux.org/sources/ \n \ | 160 | svk://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
161 | svn://.*/.* http://pokylinux.org/sources/ \n \ | 161 | svn://.*/.* http://autobuilder.yoctoproject.org/sources/ \n" |
162 | bzr://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | 162 | |
163 | cvs://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | 163 | MIRRORS =+ "\ |
164 | git://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | 164 | ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
165 | hg://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | 165 | http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ |
166 | osc://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | 166 | https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n" |
167 | p4://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | ||
168 | svk://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | ||
169 | svn://.*/.* http://autobuilder.pokylinux.org/sources/ \n" | ||
170 | |||
171 | MIRRORS_append = "\ | ||
172 | ftp://.*/.* http://pokylinux.org/sources/ \n \ | ||
173 | http://.*/.* http://pokylinux.org/sources/ \n \ | ||
174 | https://.*/.* http://pokylinux.org/sources/ \n \ | ||
175 | ftp://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | ||
176 | http://.*/.* http://autobuilder.pokylinux.org/sources/ \n \ | ||
177 | https://.*/.* 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 | ||
26 | DEBIANNAME_libgcc = "libgcc1" | 26 | DEBIANNAME_libgcc = "libgcc1" |
27 | 27 | ||
28 | MIRRORS_prepend () { | 28 | MIRRORS =+ "\ |
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 |