summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake-dev/lib/bb/cooker.py2
-rw-r--r--bitbake/lib/bb/cooker.py4
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py2
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/packages/xorg-app/xeyes_1.0.1.bb4
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:
540 540
541 except IOError, e: 541 except IOError, e:
542 bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (afile, str(e))) 542 bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (afile, str(e)))
543 except IOError:
544 bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile )
545 except bb.parse.ParseError, details: 543 except bb.parse.ParseError, details:
546 bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) ) 544 bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) )
547 545
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:
404 404
405 bb.event.fire(bb.event.ConfigParsed(self.configuration.data)) 405 bb.event.fire(bb.event.ConfigParsed(self.configuration.data))
406 406
407 except IOError: 407 except IOError, e:
408 bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile ) 408 bb.msg.fatal(bb.msg.domain.Parsing, "IO Error: %s" % str(e) )
409 except bb.parse.ParseError, details: 409 except bb.parse.ParseError, details:
410 bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) ) 410 bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) )
411 411
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):
116 f = open(j, 'r') 116 f = open(j, 'r')
117 break 117 break
118 if f is None: 118 if f is None:
119 raise IOError("file not found") 119 raise IOError("file %s not found" % fn)
120 else: 120 else:
121 f = open(fn,'r') 121 f = open(fn,'r')
122 abs_fn = fn 122 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"
479FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} '${URI}'" 479FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
480FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" 480FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
481FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" 481FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
482CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} ${URI}" 482CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
483RESUMECOMMAND = "ERROR, this must be a BitBake bug" 483RESUMECOMMAND = "ERROR, this must be a BitBake bug"
484RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} '${URI}'" 484RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
485UPDATECOMMAND = "ERROR, this must be a BitBake bug" 485UPDATECOMMAND = "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"
5 5
6MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" 6MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
7 7
8IMAGE_FSTYPES ?= "tar.bz2 ext2" 8IMAGE_FSTYPES ?= "tar.bz2 ext3"
9 9
10ROOT_FLASH_SIZE = "280" 10ROOT_FLASH_SIZE = "280"
11IMAGE_ROOTFS_SIZE_ext2 ?= "280000" 11IMAGE_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 @@
1require xorg-app-common.inc
2PE = "1"
3
4DEPENDS += " virtual/libx11 libxau libxt libxext libxmu"