From 8063e34bb175e058ea2de0d8fffc03011f68c3ee Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Thu, 21 Feb 2008 16:18:33 +0000
Subject: fix mirror handling for openmoko, oplinux and nylon.  Closes 3585. *
 patch from 3585 is now fully applied

---
 conf/distro/openmoko.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf/distro/openmoko.conf')

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index f6968cee00..55237c89b8 100644
--- 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 \
-- 
cgit v1.2.3


From 5bd5a39dff021fd8efc2e95d301589b6e68bce75 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 29 Feb 2008 12:27:25 +0000
Subject: openmoko: add DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat" * increase
 task-base PR to reflect the change into task-distro-base

---
 conf/distro/openmoko.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf/distro/openmoko.conf')

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 55237c89b8..deaba21cf5 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -14,6 +14,7 @@ DISTRO_NAME = "OpenMoko"
 DISTRO_VERSION = "P1-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
+DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat"
 
 OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
-- 
cgit v1.2.3


From 3649f62fb0080fecd8f55d520a7d58bcff15b95e Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 29 Feb 2008 12:29:50 +0000
Subject: openmoko.conf: add stuffs for jalimo * classpath, cacao-initial and
 swt3.4-gtk

---
 conf/distro/openmoko.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'conf/distro/openmoko.conf')

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index deaba21cf5..8fab5e5058 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -64,7 +64,11 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 
+# for jalimo
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+
 # deploy gta01 and gta02 in ${MACHINE_CLASS} directory
 DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
 DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-
-- 
cgit v1.2.3