[oe-commits] org.oe.dev merge of '16d5c273533926e5a6b915d652e1d39e0ec61c10'

[oe commit]

merge of '16d5c273533926e5a6b915d652e1d39e0ec61c10'
     and 'c4cca98d5a0327e7baca40483e3a196a8f60af95'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 22b5b019ef10c2e7b140d383e7bba4bd379b2214
ViewMTN: http://monotone.openembedded.org/revision/info/22b5b019ef10c2e7b140d383e7bba4bd379b2214
Files:
1
packages/xorg-app/xinit_1.0.8.bb
packages/xorg-app/xinput_1.3.0.bb
classes/seppuku.bbclass
Diffs:

#
# mt diff -r16d5c273533926e5a6b915d652e1d39e0ec61c10 -r22b5b019ef10c2e7b140d383e7bba4bd379b2214
#
#
#
# add_file "packages/xorg-app/xinit_1.0.8.bb"
#  content [11fa62b52d00712f372c7092ec265b4dae6c213a]
# 
# add_file "packages/xorg-app/xinput_1.3.0.bb"
#  content [2f2ffeed7df94f21bc4f03b8a9b316200b446ede]
#
============================================================
--- packages/xorg-app/xinit_1.0.8.bb	11fa62b52d00712f372c7092ec265b4dae6c213a
+++ packages/xorg-app/xinit_1.0.8.bb	11fa62b52d00712f372c7092ec265b4dae6c213a
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+
+FILES_${PN} += "${libdir}X11/xinit"
============================================================
--- packages/xorg-app/xinput_1.3.0.bb	2f2ffeed7df94f21bc4f03b8a9b316200b446ede
+++ packages/xorg-app/xinput_1.3.0.bb	2f2ffeed7df94f21bc4f03b8a9b316200b446ede
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"


#
# mt diff -rc4cca98d5a0327e7baca40483e3a196a8f60af95 -r22b5b019ef10c2e7b140d383e7bba4bd379b2214
#
#
#
# patch "classes/seppuku.bbclass"
#  from [b6963b5b1f0c18fa720d13ba7e295b78f27861ed]
#    to [02ec3fae44701d38816aa59eb3db7429e3f666bc]
#
============================================================
--- classes/seppuku.bbclass	b6963b5b1f0c18fa720d13ba7e295b78f27861ed
+++ classes/seppuku.bbclass	02ec3fae44701d38816aa59eb3db7429e3f666bc
@@ -334,7 +334,7 @@ python seppuku_eventhandler() {
                                                                "pv"      : bb.data.getVar("PV", data, True),
                                                                }  
             log_file = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', event.data, True), event.task))
-            text     = "The %s step failed at %s for machine %s" % (e.task, bb.data.getVar('DATETIME', data, True), bb.data.getVar( 'MACHINE', data, True ) )
+            text     = "The %s step in %s failed at %s for machine %s" % (e.task, bb.data.getVar("PN", data, True), bb.data.getVar('DATETIME', data, True), bb.data.getVar( 'MACHINE', data, True ) )
             if len(log_file) != 0:
                 print >> debug_file, "Adding log file %s" % log_file[0]
                 file = open(log_file[0], 'r')