fix mirror handling for openmoko, oplinux and nylon. Closes 3585.

* patch from 3585 is now fully applied

diff --git a/classes/nylon-mirrors.bbclass b/classes/nylon-mirrors.bbclass
index 25a8b87d9bcfb4b60c9742390caa6204fafc8276..02fddc01ba2dddd0a3468233042eebac48967c04 100644 (file)
--- a/classes/nylon-mirrors.bbclass
+++ b/classes/nylon-mirrors.bbclass
@@ -1,6 +1,6 @@
 MIRRORS_append () {
-ftp://.*/.*/   http://meshcube.org/nylon/stable/sources/
-https?://.*/.*/        http://meshcube.org/nylon/stable/sources/
-ftp://.*/.*/   http://meshcube.org/nylon/unstable/sources/
-https?://.*/.*/        http://meshcube.org/nylon/unstable/sources/
+ftp://.*/.*    http://meshcube.org/nylon/stable/sources/
+https?://.*/.* http://meshcube.org/nylon/stable/sources/
+ftp://.*/.*    http://meshcube.org/nylon/unstable/sources/
+https?://.*/.* http://meshcube.org/nylon/unstable/sources/
 }
\ No newline at end of file

diff --git a/classes/oplinux-mirrors.bbclass b/classes/oplinux-mirrors.bbclass
index c76e822ce3ddfac8b5aef0e5d7994f13d5bd074e..59c199485c1cee07048d3c2ce6354852107f192a 100644 (file)
--- a/classes/oplinux-mirrors.bbclass
+++ b/classes/oplinux-mirrors.bbclass
@@ -2,13 +2,13 @@
 # Released under the MIT license (see packages/COPYING)
 
 MIRRORS_append () {
-ftp://.*/.*/   http://digital-opsis.com/oplinux/stable/sources/
-https?://.*/.*/        http://digital-opsis.com/oplinux/stable/sources/
-ftp://.*/.*/   http://digital-opsis.com/oplinux/unstable/sources/
-https?://.*/.*/        http://digital-opsis.com/oplinux/unstable/sources/
+ftp://.*/.*    http://digital-opsis.com/oplinux/stable/sources/
+https?://.*/.* http://digital-opsis.com/oplinux/stable/sources/
+ftp://.*/.*    http://digital-opsis.com/oplinux/unstable/sources/
+https?://.*/.* http://digital-opsis.com/oplinux/unstable/sources/
 
-ftp://.*/.*/   http://digital-opsis.com/oplinux-uclibc/stable/sources/
-https?://.*/.*/        http://digital-opsis.com/oplinux-uclibc/stable/sources/
-ftp://.*/.*/   http://digital-opsis.com/oplinux-uclibc/unstable/sources/
-https?://.*/.*/        http://digital-opsis.com/oplinux-uclibc/unstable/sources/
+ftp://.*/.*    http://digital-opsis.com/oplinux-uclibc/stable/sources/
+https?://.*/.* http://digital-opsis.com/oplinux-uclibc/stable/sources/
+ftp://.*/.*    http://digital-opsis.com/oplinux-uclibc/unstable/sources/
+https?://.*/.* http://digital-opsis.com/oplinux-uclibc/unstable/sources/
 }

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index f6968cee0090fca7ef9122c6eb3423d96216efd4..55237c89b8a10cd80e931dfda7e6f9a64b1f2b97 100644 (file)
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -19,7 +19,7 @@ OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:buil
 
 CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
 
-PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/"
+PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
 
 FEED_URIS = "\
   snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \