diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/bitbake.conf | 6 | ||||
-rw-r--r-- | conf/sanity.conf | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index e3608c3ddc..bfc488a725 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -352,11 +352,11 @@ KERNELORG_MIRROR = "http://kernel.org/" # into your local.conf FETCHCOMMAND = "ERROR, this must be a BitBake bug" -FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}" +FETCHCOMMAND_wget = "/usr/bin/env wget --timeout=30 -t 5 --passive-ftp -P ${DL_DIR} ${URI}" FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}" FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" RESUMECOMMAND = "ERROR, this must be a BitBake bug" -RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" +RESUMECOMMAND_wget = "/usr/bin/env wget -c --timeout=30 -t 5 --passive-ftp -P ${DL_DIR} ${URI}" UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" @@ -443,7 +443,7 @@ IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" ################################################################## # Magic Cookie for SANITY CHECK ################################################################## -OES_BITBAKE_CONF = "1" +BITBAKETEST_BITBAKE_CONF = "1" ################################################################## # Task-base stuff diff --git a/conf/sanity.conf b/conf/sanity.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/sanity.conf |