mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 09:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git@git.moblin.org/poky

Browse Source
This commit is contained in:
Joshua Lock
2008-11-06 00:33:24 +00:00
parent 3ae3b2ba8a b6b37f065c
commit fa7a4cd807
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake-dev/lib/bb/cooker.py
View File

@@ -540,8 +540,6 @@ class BBCooker:
except IOError, e:
bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (afile, str(e)))
except IOError:
bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile )
except bb.parse.ParseError, details:
bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) )

4
bitbake/lib/bb/cooker.py
View File

@@ -404,8 +404,8 @@ class BBCooker:
bb.event.fire(bb.event.ConfigParsed(self.configuration.data))
except IOError:
bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile )
except IOError, e:
bb.msg.fatal(bb.msg.domain.Parsing, "IO Error: %s" % str(e) )
except bb.parse.ParseError, details:
bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) )

2
bitbake/lib/bb/parse/parse_py/BBHandler.py
View File

@@ -116,7 +116,7 @@ def handle(fn, d, include = 0):
f = open(j, 'r')
break
if f is None:
raise IOError("file not found")
raise IOError("file %s not found" % fn)
else:
f = open(fn,'r')
abs_fn = fn

2
meta/conf/bitbake.conf
View File

@@ -479,7 +479,7 @@ 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}"
FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
RESUMECOMMAND = "ERROR, this must be a BitBake bug"
RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
UPDATECOMMAND = "ERROR, this must be a BitBake bug"

2
meta/conf/machine/include/qemu.inc
View File

@@ -5,7 +5,7 @@ GPE_EXTRA_INSTALL += "gaim sylpheed"
MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
IMAGE_FSTYPES ?= "tar.bz2 ext2"
IMAGE_FSTYPES ?= "tar.bz2 ext3"
ROOT_FLASH_SIZE = "280"
IMAGE_ROOTFS_SIZE_ext2 ?= "280000"

4
meta/packages/xorg-app/xeyes_1.0.1.bb Normal file
View File

@@ -0,0 +1,4 @@
require xorg-app-common.inc
PE = "1"
DEPENDS += " virtual/libx11 libxau libxt libxext libxmu"