From 8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 9 May 2006 16:10:18 +0000
Subject: Sync conf files with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@373 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/conf/bitbake.conf | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'openembedded/conf/bitbake.conf')

diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
index 3b642e58f..2043a500e 100644
--- a/openembedded/conf/bitbake.conf
+++ b/openembedded/conf/bitbake.conf
@@ -304,6 +304,8 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
+E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" 
+E_URI = "http://enlightenment.freedesktop.org/files"
 FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
 APACHE_MIRROR = "http://www.apache.org/dist"
@@ -313,13 +315,13 @@ APACHE_MIRROR = "http://www.apache.org/dist"
 #  export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge"
 #     into your local.conf
 
-FETCHCOMMAND = ""
+FETCHCOMMAND = "ERROR, this must be a BitBake bug"
 FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
 FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
-RESUMECOMMAND = ""
+RESUMECOMMAND = "ERROR, this must be a BitBake bug"
 RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
-UPDATECOMMAND = ""
-UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}"
+UPDATECOMMAND = "ERROR, this must be a BitBake bug"
+UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 SRCDATE = "${DATE}"
 
 SRC_URI = "file://${FILE}"
@@ -400,4 +402,10 @@ require conf/sanity.conf
 # Weak variables (usually to retain backwards compatibility)
 ##################################################################
 
-PCMCIA_MANAGER ?= "pcmcia-cs"
\ No newline at end of file
+PCMCIA_MANAGER ?= "pcmcia-cs"
+
+
+##################################################################
+# Magic Cookie for SANITY CHECK
+##################################################################
+OES_BITBAKE_CONF = "1"
-- 
cgit v1.2.3