diff options
| -rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 | ||||
| -rw-r--r-- | meta/packages/xorg-app/xeyes_1.0.1.bb | 4 |
6 files changed, 9 insertions, 7 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index ead76ca6ba..86229799f2 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py @@ -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) ) diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index c5d640da80..6a6d254d7a 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -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) ) diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index cc8bc92e1d..583a71c0ba 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -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 diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 1289a34b4c..f6cfe573e0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -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" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index c1e83ba7f6..005472b170 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -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" diff --git a/meta/packages/xorg-app/xeyes_1.0.1.bb b/meta/packages/xorg-app/xeyes_1.0.1.bb new file mode 100644 index 0000000000..07ce0724fa --- /dev/null +++ b/meta/packages/xorg-app/xeyes_1.0.1.bb @@ -0,0 +1,4 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11 libxau libxt libxext libxmu" |