From fb482f5c636a163c1eb910275e54c64e3aa03911 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 30 Apr 2006 10:12:09 +0000
Subject: conf/bitbake.conf:     Plain UPDATE, FETCH and RESUME-COMMAND to not
 have any value. They     are used by the BitBake fetchers.     e.g. with a
 broken update_data impl in BitBake cvs used the 'plain'     variable instead
 the override. This change should make things fail     faster and more obvious

---
 conf/bitbake.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 68fbc0a473..77923e8e7f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -315,12 +315,12 @@ 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 = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 SRCDATE = "${DATE}"
 
-- 
cgit v1.2.3


From c1b283fdbcd2e2e224b3c365d0a1937d0637991b Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 30 Apr 2006 12:29:07 +0000
Subject: conf/bitbake.conf:     Save a magic cookie in the OE version of
 bitbake.conf classes/sanity.bbclass:     Check the OE cookie for bitbake.conf

---
 conf/bitbake.conf | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 77923e8e7f..2043a500eb 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -403,3 +403,9 @@ require conf/sanity.conf
 ##################################################################
 
 PCMCIA_MANAGER ?= "pcmcia-cs"
+
+
+##################################################################
+# Magic Cookie for SANITY CHECK
+##################################################################
+OES_BITBAKE_CONF = "1"
-- 
cgit v1.2.3